[Rivet-svn] r2437 - bootstrap

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu May  6 11:12:29 2010
New Revision: 2437

Log:
Boost version updates and consolidation -- LCG have now sorted their act out and have simultaneous SLC4 and SLC5 builds of the latest version

Modified:
   bootstrap/rivet-bootstrap

Modified: bootstrap/rivet-bootstrap
==============================================================================
--- bootstrap/rivet-bootstrap	Thu May  6 11:06:02 2010	(r2436)
+++ bootstrap/rivet-bootstrap	Thu May  6 11:12:29 2010	(r2437)
@@ -181,7 +181,7 @@
                   help="Explicit path to find Boost [%default]")
 parser.add_option("--install-boost", action="store_true", default=False, dest="INSTALL_BOOST",
                   help="Don't use a system copy of Boost (NB. it takes a long time to build) [%default]")
-parser.add_option("--boost-version", default="1_40_0", dest="BOOST_VERSION",
+parser.add_option("--boost-version", default="1_42_0", dest="BOOST_VERSION",
                   help="Explicitly specify version of Boost to get and use (if --install-boost is used) [%default]")
 parser.add_option("-V", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
                   default=logging.INFO, help="print debug (very verbose) messages")
@@ -433,7 +433,7 @@
     BOOSTFLAGS = None
     if opts.INSTALL_BOOST:
         logging.info("Installing a local copy of Boost")
-        boostname = "boost_%s" % opts.BOOST_VERSION
+        boostname = "boost_%s" % opts.BOOST_VERSION.replace(".", "_")
         boosttarname = boostname + ".tar.gz"
         boosturl = "http://downloads.sourceforge.net/boost/%s?use_mirror=mesh" % boosttarname
         get_unpack_tarball(boosturl)
@@ -470,9 +470,7 @@
             sys.exit(1)
         ## Boost
         if not opts.INSTALL_BOOST:
-            lcg_boost_version = "1.34.1"
-            if "slc5" in opts.LCGTAG:
-                lcg_boost_version = "1.39.0_python2.5"
+            lcg_boost_version = opts.BOOST_VERSION + "_python2.5"
             opts.BOOST_DIR = os.path.join(opts.LCGDIR, "Boost", lcg_boost_version, opts.LCGTAG)
         ## GSL
         if not opts.GSL_DIR: