[Rivet-svn] r2434 - bootstrap

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu May  6 10:19:29 2010
New Revision: 2434

Log:
Adding --dev-mode as a (preferred) alias for --devmode. Sorry for the diff noise: emacs has also removed some trailing whitespace.

Modified:
   bootstrap/rivet-bootstrap

Modified: bootstrap/rivet-bootstrap
==============================================================================
--- bootstrap/rivet-bootstrap	Mon May  3 13:54:02 2010	(r2433)
+++ bootstrap/rivet-bootstrap	Thu May  6 10:19:29 2010	(r2434)
@@ -6,7 +6,7 @@
 __usage__ = """\
 %prog [options]
 
-%prog is a helper script which downloads and installs Rivet and the 
+%prog is a helper script which downloads and installs Rivet and the
 other packages needed to get the Rivet generator validation system up and
 running. It tries to be relatively intelligent about what it downloads so that,
 e.g. for users on systems with the LCG applications mounted in
@@ -19,7 +19,7 @@
  * Add new SLC5 LCG platform tag scheme
 """
 
-import os, sys 
+import os, sys
 import logging
 import shutil, commands
 
@@ -137,43 +137,45 @@
 DEFAULTPREFIX = os.path.join(os.getcwd(), "local")
 
 parser = OptionParser(usage=__usage__)
-parser.add_option("--prefix", metavar="INSTALLDIR", default=DEFAULTPREFIX, dest="PREFIX", 
+parser.add_option("--prefix", metavar="INSTALLDIR", default=DEFAULTPREFIX, dest="PREFIX",
                   help="Location to install packages to [%default]")
-parser.add_option("--force", action="store_true", default=False, dest="FORCE", 
+parser.add_option("--force", action="store_true", default=False, dest="FORCE",
                   help="Overwrite existing tarballs [%default]")
-parser.add_option("-j", default="2", dest="JMAKE", 
+parser.add_option("-j", default="2", dest="JMAKE",
                   help="Num of 'make' threads to run in parallel (the n in 'make -j<n>') [%default]")
-parser.add_option("--devmode", action="store_true", default=False, dest="DEV_MODE", 
+parser.add_option("--dev-mode", action="store_true", default=False, dest="DEV_MODE",
                   help="Use the SVN development head version of Rivet [%default]")
-parser.add_option("--lcgextdir", default="/afs/cern.ch/sw/lcg/external", dest="LCGDIR", 
+parser.add_option("--devmode", action="store_true", default=False, dest="DEV_MODE",
+                  help="Deprecated: alias for --dev-mode [%default]")
+parser.add_option("--lcgextdir", default="/afs/cern.ch/sw/lcg/external", dest="LCGDIR",
                   help="Standard location of LCG external packages [%default]")
 parser.add_option("--lcgtag", default=compute_lcg_tag(), dest="LCGTAG",
                   help="Force the LCG platform tag if it's not being computed correctly [%default]")
-parser.add_option("--ignore-lcgext", action="store_true", default=False, dest="IGNORE_LCG", 
+parser.add_option("--ignore-lcgext", action="store_true", default=False, dest="IGNORE_LCG",
                   help="Always bootstrap from sources, even if LCG versions are available [%default]")
-parser.add_option("--rivet-version", default="1.2.1", dest="RIVET_VERSION", 
+parser.add_option("--rivet-version", default="1.2.1", dest="RIVET_VERSION",
                   help="Explicitly specify version of Rivet to get and use [%default]")
-parser.add_option("--install-agile", action="store_true", default=False, dest="INSTALL_AGILE", 
+parser.add_option("--install-agile", action="store_true", default=False, dest="INSTALL_AGILE",
                   help="Install the AGILe interface system for Fortran generators [%default]")
-parser.add_option("--agile-version", default="1.1.4", dest="AGILE_VERSION", 
+parser.add_option("--agile-version", default="1.1.4", dest="AGILE_VERSION",
                   help="Explicitly specify version of AGILe to get and use [%default]")
-parser.add_option("--agile-url", default="http://www.hepforge.org/archive/agile/", 
+parser.add_option("--agile-url", default="http://www.hepforge.org/archive/agile/",
                   dest="AGILE_URL", help="Base URL for AGILe tarball downloads [%default]")
-parser.add_option("--hepmc-version", default="2.05.00", dest="HEPMC_VERSION", 
+parser.add_option("--hepmc-version", default="2.05.00", dest="HEPMC_VERSION",
                   help="Explicitly specify version of HepMC to get and use [%default]")
-parser.add_option("--hepmc-url", default="http://lcgapp.cern.ch/project/simu/HepMC/download/", 
+parser.add_option("--hepmc-url", default="http://lcgapp.cern.ch/project/simu/HepMC/download/",
                   dest="HEPMC_URL", help="Base URL for HepMC tarball downloads [%default]")
-parser.add_option("--fastjet-version", default="2.4.2", dest="FASTJET_VERSION", 
+parser.add_option("--fastjet-version", default="2.4.2", dest="FASTJET_VERSION",
                   help="Explicitly specify version of FastJet to get and use [%default]")
-parser.add_option("--fastjet-url", default="http://www.lpthe.jussieu.fr/~salam/repository/software/fastjet/", 
+parser.add_option("--fastjet-url", default="http://www.lpthe.jussieu.fr/~salam/repository/software/fastjet/",
                   dest="FASTJET_URL", help="Base URL for FastJet tarball downloads [%default]")
 parser.add_option("--with-gsl", metavar="DIR", default=None, dest="GSL_DIR",
                   help="Explicit path to find GSL [%default]")
-parser.add_option("--with-boost", metavar="DIR", default=None, dest="BOOST_DIR", 
+parser.add_option("--with-boost", metavar="DIR", default=None, dest="BOOST_DIR",
                   help="Explicit path to find Boost [%default]")
-parser.add_option("--install-boost", action="store_true", default=False, dest="INSTALL_BOOST", 
+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_40_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")
@@ -417,7 +419,7 @@
         boosturl = "http://downloads.sourceforge.net/boost/%s?use_mirror=mesh" % boosttarname
         get_unpack_tarball(boosturl)
         boostbuilddir = os.path.join(BUILDDIR, boostname)
-        ## Don't do a full install --- just copy the headers into place 
+        ## Don't do a full install --- just copy the headers into place
         ## (the build system changes between versions, and usually cocks up the dir structure)
         import shutil
         boostincdir = os.path.join(INCDIR, "boost")
@@ -592,7 +594,7 @@
     f.close()
 
     ## csh
-    CSHENV = "" 
+    CSHENV = ""
     for k, v in env.iteritems():
         CSHENV += "setenv %s %s\n" % (k,v)
     os.chdir(ROOT)