Changeset 1184

Timestamp:

08/25/06 16:34:59 (18 years ago)

Author:

mar637

Message:

complete rework of install target, added data install, and also building a distribution archive

Location:

trunk

Files:

• SConstruct (modified) (4 diffs)
• scons/archiver.py (added)
• scons/quietinstall.py (added)
• scons/utils.py (modified) (2 diffs)

trunk/SConstruct

@@ -3 +3 @@
 import distutils.sysconfig
 import platform
+import SCons
 # scons plug-ins
 #from installtree import InstallTree
 
-version = "2.1.0b"
 moduledir = distutils.sysconfig.get_python_lib()
 if  platform.architecture()[0] == '64bit':
@@ -31 +31 @@
 
 env = Environment( toolpath = ['./scons'],
-                   tools = ["default", "installtree", "casa",
-                            "utils"],
+                   tools = ["default", "casa", "archiver", "utils",
+                            "quietinstall"],
                    ENV = { 'PATH' : os.environ[ 'PATH' ],
                           'HOME' : os.environ[ 'HOME' ] },
@@ -76 +76 @@
     env = conf.Finish()
 
-env["stage_dir"] = Dir("#/stage/asap")
+env["version"] = "2.1.0b"
 
 # general CPPFLAGS
@@ -85 +85 @@
     env.Append(CPPFLAGS=['-fPIC', '-D__x86_64__', '-DAIPS_64B'])
 
-if env["PLATFORM"] == "darwin":
-    env['SHLINKFLAGS'] = '$LINKFLAGS -bundle'
-    #env['SHLIBSUFFIX'] = '.dylib'
-
 if env['mode'] == 'release':
     env.Append(LINKFLAGS=['-Wl,-O1'])
+
+# Export for SConscript files
 Export("env")
 
+# build library
 so = env.SConscript("src/SConscript", build_dir="build", duplicate=0)
-stagebuild = env.Install(env["stage_dir"], so )
-stagedoc = env.Install("stage", ["doc/README", "doc/CHANGELOG"] )
-stagepys = env.SConscript("python/SConscript")
-stage0 = env.Install("stage", "bin/install")
-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"),
-                          src_dir  = "stage",
-                          includes = ['asap','data'],
-                          excludes = [])
-asapbin = env.Install(os.path.join(env["prefix"], "bin"), "bin/asap")
-env.Alias('install', [asapmod, asapbin])
+
+# 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/data", "share/ipythonrc-asap")
+env.Alias('install', [somod, pymods, bins, shares])
+
+# 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)
+    
 # make binary distribution
 if len(env["makedist"]):
-    md =env.CreateDist("dist/asap-%s-%s" % (version, env["makedist"]),
-                   ["install", "README", "CHANGELOG", "asap", "data",
-                    "bin"],
-                   "stage")
+    env["stagedir"] = "asap-%s-%s" % (env["version"], env["makedist"])
+    env.Command('Staging distribution for archive in %s' % env["stagedir"],
+                '', env.MessageAction)
+    env.QInstall("$stagedir/asap", [so,  pymods] )
+    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']
+        outdir =  os.path.join(env["stagedir"],'asap','data')
+        ofiles, ifiles = env.WalkDirTree(outdir, rootdir, sources)
+        env.QInstallAs(ofiles, ifiles)
+    arch = env.Archiver(os.path.join("dist",env["stagedir"]),
+                        env["stagedir"])
+    env.AddPostAction(arch, Delete("$stagedir"))
+    

trunk/scons/utils.py

@@ -15 +15 @@
     env.AddCustomPath = AddCustomPath
 
-    def CreateDist(target, sources, descend="stage"):
-        import tarfile
-        base_name = str(target).split('.tar')[0]
-        (target_dir, dir_name) = os.path.split(base_name)
-        # create the target directory if it does not exist
-        if target_dir and not os.path.exists(target_dir):
-            os.makedirs(target_dir)
-        tar_format = "bz2"
-        tar = tarfile.open(str(target)+".tar.bz2", "w:%s" % (tar_format,))
-        if os.path.exists(descend): os.chdir(descend)
-        taritems = []
-        excludedirs = [".svn"]
-        for item in sources:
-            if os.path.isdir(item):
-                for root, dirs, files in os.walk(str(item)):
-                    if not root in excludedirs:
-                        for name in files:
-                            if not name.startswith("."):
-                                taritems.append(os.path.join(root, name))
-            else:
-                taritems.append(item)
-        for item in taritems:
-            print "Adding to archive: %s/%s" % (dir_name, item)
-            tar.add(item,'%s/%s' % (dir_name, item))
-        tar.close()
+    def WalkDirTree(targetroot, sourceroot, sources):
+        ifiles = []
+        ofiles = []
+        for s in sources:
+            if os.path.isdir(os.path.join(sourceroot ,s)):
+                for d,ld,f in os.walk(os.path.join(sourceroot ,s)):
+                    for fl in f:
+                        ifile = os.path.join(d, fl)
+                        ifiles.append(ifile)
+                        ofile = ifile.replace(sourceroot, targetroot)
+                        ofiles.append(ofile)
+        return ofiles, ifiles
+    env.WalkDirTree = WalkDirTree
 
-    env.CreateDist = CreateDist
+    def null_action(target, source, env): return 0
+
+    def message(target, source, env):
+        return "%s" % target[0]
+    env.MessageAction = env.Action(null_action, message)
 
 def exists(env):
@@ -47 +39 @@
         import os
         import glob
-        import tarfile
     except ImportError:
         return False