Changeset 2485 for trunk

Timestamp:

05/07/12 15:33:49 (13 years ago)

Author:

Malte Marquarding

Message:

Remove install target and casacore scons dependency

Location:

trunk

Files:

• SConstruct (modified) (7 diffs)
• apps/SConscript (modified) (1 diff)

trunk/SConstruct

@@ -103 +103 @@
 env = Environment( toolpath = ['./scons'],
                    tools = ["default", "archiver", "utils",
-                            "quietinstall"],
+                            "quietinstall", "casaoptions", "casa"],
                    ENV = { 'PATH' : os.environ[ 'PATH' ],
                           'HOME' : os.environ[ 'HOME' ] },
@@ -110 +110 @@
 Help(opts.GenerateHelpText(env))
 env.SConsignFile()
-
-casacoretooldir = os.path.join(env["casacoreroot"],"share",
-                                   "casacore")
-if not os.path.exists(casacoretooldir):
-    print "Could not find casacore scons tools"
-    Exit(1)
-
-# load casacore specific build flags
-env.Tool('casaoptions', [casacoretooldir])
-opts.Update(env)
-env.Tool('casa', [casacoretooldir])
 
 if not env.GetOption('clean'):
@@ -149 +138 @@
         Exit(1)
 
-    conf.env.AddCustomPackage('pyrap')
-    if conf.CheckLib(conf.env["pyraplib"], language='c++', autoadd=0): 
+#    conf.env.AddCustomPackage('pyrap')
+    if False and conf.CheckLib(conf.env["pyraplib"], language='c++', autoadd=0): 
         conf.env.Append(CPPFLAGS=['-DHAVE_LIBPYRAP'])
-        conf.env.PrependUnique(LIBS=env['pyraplib'])
+#        conf.env.PrependUnique(LIBS=env['pyraplib'])
     else:
         conf.env.AppendUnique(CPPPATH=[conf.env["numpyincdir"]])
@@ -188 +177 @@
     if not conf.CheckLib('stdc++', language='c++'): Exit(1)
     if conf.env["alma"]:
-        conf.env.Append(CPPFLAGS=['-DUSE_ALMA'])
+        conf.env.Append(CPPFLAGS=['-DUSE_CASAPY'])
     if not conf.env.get("moduledir"):
         mdir = get_moduledir(conf.env.get("prefix"))
@@ -196 +185 @@
     env = conf.Finish()
 
-env["version"] = "4.0.x"
+env["version"] = "4.1.x"
 
 if env['mode'] == 'release':
@@ -226 +215 @@
 env.AddPostAction(so, taction)
 
-# install targets
-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
-outdir =  os.path.join(env["moduledir"],'asap','data')
-sources = ['ephemerides','geodetic']
-if os.path.exists("/nfs/aips++/data"):
-    rootdir = "/nfs/aips++/data"
-elif os.path.exists("data"):
-    rootdir = "./data"
-if rootdir is not None:
-    ofiles, ifiles = env.WalkDirTree(outdir, rootdir, sources)
-    data =  env.InstallAs(ofiles, ifiles)
-    env.Alias('install', data)
+setup_py = None
+env.Alias('install', setup_py)
 
 # make binary distribution
@@ -260 +229 @@
     env.QInstall("$stagedir/asap/data", "share/ipythonrc-asap")
     env.QInstall("$stagedir/asap/data", "share/ipy_user_conf.py")
-    if rootdir is not None:
-        # This creates a directory Using data table... - disabled
-        #env.Command("Using data tables in %s" % rootdir,
-        #           '', env.MessageAction)
-        outdir =  os.path.join(env["stagedir"],'asap','data')
-        ofiles, ifiles = env.WalkDirTree(outdir, rootdir, sources)
-        env.QInstallAs(ofiles, ifiles)
-    else:
-        env.Command("No data tables available. Use 'asap_update_data' after install",
-                    '', env.MessageAction)
-#    arch = env.Archiver(os.path.join("dist",
-#                                    env["stagedir"]+"_"+env["makedist"]),
-#                        env["stagedir"])
-#    env.AddPostAction(arch, Delete("$stagedir"))
 
 if env["apps"]:

trunk/apps/SConscript

@@ -21 +21 @@
         myenv.QInstall("#/$stagedir/bin", prog)
 
-myenv.Alias('install', installs)