Changeset 2505 for trunk

Timestamp:

05/14/12 12:14:30 (13 years ago)

Author:

Malte Marquarding

Message:

removed casaoptions and add extraroot option

File:

• trunk/SConstruct (modified) (3 diffs)

trunk/SConstruct

@@ -26 +26 @@
 opts = Variables("options.cache")
 opts.AddVariables(
+                ("extraroot", "Addition tree to look for packages", None),
                 ("FORTRAN", "The fortran compiler", None),
                 ("f2clib", "The fortran to c library", None),
@@ -85 +86 @@
 
 env = Environment( toolpath = ['./scons'],
-                   tools = ["default", "utils",
-                            "casaoptions", "casa"],
+                   tools = ["default", "utils", "casa"],
                    ENV = { 'PATH' : os.environ[ 'PATH' ],
                           'HOME' : os.environ[ 'HOME' ] },
@@ -96 +96 @@
 
     conf = Configure(env)
-
+    conf.env.AddCustomPackage('extra')
     conf.env.AppendUnique(LIBPATH=os.path.join(conf.env["casacoreroot"], 
                                                "lib"))