Changeset 1464 for trunk

Timestamp:

01/14/09 12:32:14 (16 years ago)

Author:

Malte Marquarding

Message:

require scons>=1.1

File:

• trunk/SConstruct (modified) (3 diffs)

trunk/SConstruct

@@ -11 +11 @@
         moduledir = moduledir.replace("lib", "lib64")
 
-opts = Options("options.cfg")
-opts.AddOptions(
+
+EnsureSConsVersion(1,1,0)
+
+opts = Variables("options.cfg")
+opts.AddVariables(
                 ("FORTRAN", "The fortran compiler", None),
                 ("f2clib", "The fortran to c library", None),
-                PathOption("prefix",
+                PathVariable("prefix",
                 "The root installation path",
                            distutils.sysconfig.PREFIX),
-                PathOption("moduledir",
+                PathVariable("moduledir",
                             "The python module path (site-packages))",
                             moduledir),
-                PathOption("casacoreroot", "The location of casacore",
+                PathVariable("casacoreroot", "The location of casacore",
                                     "/usr/local"),
                 ("boostroot", "The root dir where boost is installed", None),
@@ -53 +56 @@
                 ("rpfitslibdir", "The rpfits library location", None),
 #               ("rpfitsincdir", "The rpfits include location", None),
-                EnumOption("mode", "The type of build.", "release",
+                EnumVariable("mode", "The type of build.", "release",
                            ["release","debug"], ignorecase=1),
                 ("makedist",
                  "Make a binary archive giving a suffix, e.g. sarge or fc5",
                  ""),
-                EnumOption("makedoc", "Build the userguide in specified format",
+                EnumVariable("makedoc", "Build the userguide in specified format",
                            "none",
                            ["none", "pdf", "html"], ignorecase=1),
-                BoolOption("apps", "Build cpp apps", False),
-                BoolOption("alma", "Enable alma specific functionality", False)
+                BoolVariable("apps", "Build cpp apps", False),
+                BoolVariable("alma", "Enable alma specific functionality", False)
                 )
 
@@ -74 +77 @@
 Help(opts.GenerateHelpText(env))
 env.SConsignFile()
-
-if env["PLATFORM"] == "darwin":
-    env.EnsureSConsVersion(0,96,95)
 
 casacoretooldir = os.path.join(env["casacoreroot"],"share",