Changeset 1181 for trunk

Timestamp:

08/24/06 11:45:27 (18 years ago)

Author:

mar637

Message:

finishing touches to making scons makedist=xyz work

Location:

trunk

Files:

• SConstruct (modified) (3 diffs)
• bin/install (modified) (4 diffs)
• doc/README (modified) (3 diffs)

trunk/SConstruct

@@ -6 +6 @@
 #from installtree import InstallTree
 
-version = "2.1b"
+version = "2.1.0b"
 moduledir = distutils.sysconfig.get_python_lib()
 if  platform.architecture()[0] == '64bit':
@@ -98 +98 @@
 stagepys = env.SConscript("python/SConscript")
 stage0 = env.Install("stage", "bin/install")
-stage1 = env.Install("stage/bin", "bin/asap")
-env.Alias('stage', [stagebuild,stagedoc,stagepys, stage0, stage1])
+stage1 = env.Install("stage/bin", ["bin/asap", "bin/asap_update_data"])
+stage2 = env.Install("stage/data", "share/ipythonrc-asap")
+env.Alias('stage', [stagebuild,stagedoc,stagepys, stage0, stage1, stage2])
 # install locally
 asapmod = env.InstallTree(dest_dir = os.path.join(env["moduledir"], "asap"),
@@ -110 +111 @@
 if len(env["makedist"]):
     md =env.CreateDist("dist/asap-%s-%s" % (version, env["makedist"]),
-                   ["install", "README", "CHANGELOG", "asap"],
+                   ["install", "README", "CHANGELOG", "asap", "data",
+                    "bin"],
                    "stage")

trunk/bin/install

@@ -13 +13 @@
               [-h] this message
     """
+
+def get_libs(lddcommand='/usr/bin/ldd', lib='_asap.so'):
+    if not os.path.isfile(lddcommand):
+        raise IOError("ldd not available")
+    if not os.path.exists(lib):
+        raise IOError("File %s not found" %lib)
+    p = os.popen(lddcommand+" "+lib)
+    resolved = []
+    unresolved = []
+    for l in p.readlines():
+        lsp = l.split()
+        if lsp[2] == "not":
+            unresolved.append(lsp[0])
+        else:
+            resolved.append(lsp[2])
+    return resolved, unresolved
 
 try:
@@ -47 +63 @@
         moduledir = v
 
-print 'Looking for dependent modules...'
+print "Looking fo all required libraries..."
+try:
+    libs, missing = get_libs(lib="asap/_asap.so")
+    if len(missing):
+        print " The following libraries are missing:"
+        print missing
+        sys.exit(1)
+    else:
+        print "   All required libraries are present."
+except IOError,msg:
+    print msg+" Skipping test."
+
+print 'Looking for dependent python modules...'
 try:
     import matplotlib
@@ -75 +103 @@
     sys.exit(1)
 
-print "All required modules were found."
+print "   All required modules were found."
 moddir = os.path.join(moduledir, "asap")
 bindir =  os.path.join(execprefix, "bin")
@@ -84 +112 @@
     print "Installing asap module in %s" % moddir
     shutil.copytree("asap", moddir)
-    print "Installing asap startup script in %s" % bindir
+    print "Installing asap  scripts in %s" % bindir
     shutil.copy2("bin/asap", bindir)
+    shutil.copy2("bin/asap_update_data", bindir)
     shutil.copytree("data", os.path.join(moddir,"data"))
     print "Installation completed."

trunk/doc/README

@@ -1 @@
-This is a linux binary distribution of asap.
+This is a binary distribution of asap.
 
 To be able to run the following additional packages need to be installed.
 
-* gcc-3.3, g++-3.3
-* python2.3
-* boost_python (1.32)
+* gcc/g++
+* python
+* boost_python
+* cfitsio
 * lapack
 * blas
 * g2c
-* matplotlib (>0.73)
-* ipython 
+* matplotlib
+* numpy or numarray
+* ipython
 
 INSTALL
@@ -16 +18 @@
 
 To install simply run (as root or 'sudo')
-  ./bin/install.sh
-which will install asap into /usr/local
+
+./install
+
+which will install asap into the default location.
+To do a customised install run
+
+./install -h
+
+for help.
 
 
@@ -24 +33 @@
 
 simply type
- asap
-at the prompt
+
+asap
+
+at the prompt (if you use tcsh you might need to run 'rehash' first)