Changeset 1195

Timestamp:

08/29/06 09:47:08 (18 years ago)

Author:

mar637

Message:

added module test action. fixed makedist target including install script.

Location:

trunk

Files:

• SConstruct (modified) (4 diffs)
• bin/install (modified) (2 diffs)

trunk/SConstruct

@@ -26 +26 @@
                            ["release","debug"], ignorecase=1),
                 ("makedist",
-                 "Make a binary distribution giving a suffix, e.g. sarge or fc5",
+                 "Make a binary archive giving a suffix, e.g. sarge or fc5",
                  "")
                 )
@@ -93 +93 @@
 # build library
 so = env.SConscript("src/SConscript", build_dir="build", duplicate=0)
+# test module import, to see if there are unresolved symbols
+def test_module(target,source,env):
+    pth = str(target[0])
+    mod = os.path.splitext(pth)[0]
+    sys.path.insert(2, os.path.split(mod)[0])
+    __import__(os.path.split(mod)[1])
+    print "ok"
+    return 0
+def test_str(target, source, env):
+    return "Testing module..."
+
+taction = Action(test_module, test_str)
+env.AddPostAction(so, taction)
 
 # install targets
@@ -108 +121 @@
     rootdir = "/nfs/aips++/data"
 elif os.path.exists("data"):
-    rootdir = "data"
+    rootdir = "./data"
 if rootdir is not None:
     ofiles, ifiles = env.WalkDirTree(outdir, rootdir, sources)
@@ -119 +132 @@
     env.Command('Staging distribution for archive in %s' % env["stagedir"],
                 '', env.MessageAction)
-    env.QInstall("$stagedir/asap", [so,  env.SGlob("python/*.py")] )
+    st0 = env.QInstall("$stagedir/asap", [so,  env.SGlob("python/*.py")] )
     env.QInstall("$stagedir/bin", ["bin/asap", "bin/asap_update_data"])
-    env.QInstall("$stagedir/install", ["bin/install"])
-    env.QInstall("$stagedir/data", "share/ipythonrc-asap")
-    if os.path.exists("/nfs/aips++/data"):
-        rootdir = "/nfs/aips++/data"
-        sources = ['ephemerides','geodetic']
+    env.QInstall("$stagedir", ["bin/install"])
+    env.QInstall("$stagedir/asap/data", "share/ipythonrc-asap")
+    if rootdir is not None:
+        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["stagedir"])
     env.AddPostAction(arch, Delete("$stagedir"))
-    
+
+if env.GetOption("clean"):
+    Execute(Delete(".sconf_temp"))

trunk/bin/install

@@ -14 +14 @@
     """
 
-def get_libs(lddcommand='/usr/bin/ldd', lib='_asap.so'):
+def get_libs(lib='_asap.so'):
+    lddcommand = "/usr/bin/ldd"
+    lddopts = ""
+    if (sys.platform == "darwin"):
+        lddcommand = "otool"
+        lddopts = "-L"
     if not os.path.isfile(lddcommand):
-        raise IOError("ldd not available")
+        raise IOError("ldd/otool is not available")
     if not os.path.exists(lib):
         raise IOError("File %s not found" %lib)
-    p = os.popen(lddcommand+" "+lib)
+    p = os.popen(lddcommand+" "+lddopts+" "+lib)
     resolved = []
     unresolved = []
@@ -115 +120 @@
     shutil.copy2("bin/asap", bindir)
     shutil.copy2("bin/asap_update_data", bindir)
-    shutil.copytree("data", os.path.join(moddir,"data"))
+    if not os.path.exists("asap/data/ephemerides"):
+        print "Warning - no data directory present"
+        print "Please run asap_update_data after the installation is completed."
     print "Installation completed."
 except OSError, oe: