Changeset 1740

Timestamp:

05/06/10 10:19:43 (14 years ago)

Author:

Malte Marquarding

Message:

Tidy up of install targets and comman-line options

File:

• trunk/SConstruct (modified) (9 diffs)

trunk/SConstruct

@@ -6 +6 @@
 
 moduledir = distutils.sysconfig.get_python_lib()
-if  platform.architecture()[0] == '64bit':
+
+if sys.platform.startswith('linux') and platform.architecture()[0] == '64bit':
     # hack to install into /usr/lib64 if scons is in the 32bit /usr/lib/
     if moduledir.startswith("/usr/lib/"):
         moduledir = moduledir.replace("lib", "lib64")
-
 
 EnsureSConsVersion(1,1,0)
@@ -25 +25 @@
                             moduledir),
                 PathVariable("casacoreroot", "The location of casacore",
-                                    "/usr/local"),
+                             "/usr/local"),
                 ("boostroot", "The root dir where boost is installed", None),
                 ("boostlib", "The name of the boost python library", 
@@ -48 +48 @@
                 ("cfitsiolib", "The cfitsio library name", "cfitsio"),
                 ("cfitsioincdir", "The cfitsio include location", None),
+                ("wcslib", "The wcs library name", "wcs"),
                 ("wcsroot", 
                  "The root directory where wcs is installed", None),
@@ -55 +56 @@
                  "The root directory where rpfits is installed", None),
                 ("rpfitslibdir", "The rpfits library location", None),
-#               ("rpfitsincdir", "The rpfits include location", None),
                 ("pyraproot", "The root directory where libpyrap is installed",
                  None),
@@ -74 +74 @@
                            "none",
                            ["none", "pdf", "html"], ignorecase=1),
-                BoolVariable("apps", "Build cpp apps", False),
+                BoolVariable("apps", "Build cpp apps", True),
                 BoolVariable("alma", "Enable alma specific functionality", 
                              False),
@@ -141 +141 @@
         Exit(1)
     conf.env.AddCustomPackage('wcs')
-    if not conf.CheckLibWithHeader('wcs', 'wcslib/wcs.h', language='c'):
+    if not conf.CheckLibWithHeader(conf.env["wcslib"], 
+                                   'wcslib/wcs.h', language='c'):
         Exit(1)
     conf.env.AddCustomPackage('rpfits')
@@ -148 +149 @@
 
     # test for blas/lapack
+    lapackname = conf.env.get("lapacklib", "lapack")
     conf.env.AddCustomPackage("lapack")
-    if not conf.CheckLib(conf.env["lapacklib"]): Exit(1)
+    if not conf.CheckLib(lapackname): Exit(1)
     blasname = conf.env.get("blaslib", "blas")
     conf.env.AddCustomPackage("blas")
-    if not conf.CheckLib(conf.env["blaslib"]): Exit(1)
+    if not conf.CheckLib(blasname): Exit(1)
     conf.env.CheckFortran(conf)
     if not conf.CheckLib('stdc++', language='c++'): Exit(1)
@@ -159 +161 @@
     env = conf.Finish()
 
-env["version"] = "2.x"
+env["version"] = "3.x"
 
 if env['mode'] == 'release':
@@ -190 +192 @@
 
 # install targets
-somod = env.Install("$moduledir/asap", so )
-pymods = env.Install("$moduledir/asap", env.SGlob("python/*.py"))
-bins = env.Install("$prefix/bin", ["bin/asap", "bin/asap_update_data"])
-shares = [env.Install("$moduledir/asap/data", "share/ipythonrc-asap")]
-shares.append(env.Install("$moduledir/asap/data", "share/ipy_user_conf.py"))
-env.Alias('install', [somod, pymods, bins]+shares)
+installs = []
+installs.append(env.Install("$moduledir/asap", so))
+installs.append(env.Install("$moduledir/asap", env.SGlob("python/*.py")))
+installs.append(env.Install("$prefix/bin", 
+                            ["bin/asap", "bin/asap_update_data"]))
+installs.append(env.Install("$moduledir/asap/data", "share/ipythonrc-asap"))
+installs.append(env.Install("$moduledir/asap/data", "share/ipy_user_conf.py"))
+env.Alias('install', installs)
 
 # install aips++ data repos
-rootdir=None
+rootdir = None
 outdir =  os.path.join(env["moduledir"],'asap','data')
 sources = ['ephemerides','geodetic']