Changeset 2179

Timestamp:

05/24/11 12:03:43 (14 years ago)

Author:

Malte Marquarding

Message:

derive moduledir from prefix by default. Also added some more debian packaging details

Location:

trunk

Files:

• SConstruct (modified) (7 diffs)
• packaging/debian/control (modified) (1 diff)

trunk/SConstruct

@@ -22 +22 @@
     return ""
 
-moduledir = distutils.sysconfig.get_python_lib()
-
-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")
+def get_moduledir(prefix="/usr/local"):
+    moduledir = distutils.sysconfig.get_python_lib(1,0, prefix)
+    if sys.platform.startswith('linux') \
+            and platform.architecture()[0] == '64bit' \
+            and platform.dist()[0].lower() not in ['debian', 'ubuntu']:
+        # hack to install into /usr/lib64 if scons is in the 32bit /usr/lib/
+        if moduledir.startswith("/usr"):
+           moduledir = moduledir.replace("lib", "lib64")
+    return moduledir
 
 EnsureSConsVersion(1,0,0)
@@ -38 +41 @@
                 "The root installation path",
                            distutils.sysconfig.PREFIX),
-                PathVariable("moduledir",
-                            "The python module path (site-packages))",
-                            moduledir),
+                ("moduledir",
+                 "The python module path (site-packages))",
+                 None),
                 PathVariable("casacoreroot", "The location of casacore",
                              "/usr/local"),
@@ -186 +189 @@
     if conf.env["alma"]:
         conf.env.Append(CPPFLAGS=['-DUSE_ALMA'])
+    if not conf.env.get("moduledir"):
+        mdir = get_moduledir(conf.env.get("prefix"))
+        if env["PLATFORM"] == "darwin":
+            mdir = distutils.sysconfig.get_python_lib(1,0)            
+        conf.env["moduledir"] =  mdir
     env = conf.Finish()
 
-env["version"] = "3.1.0"
+env["version"] = "3.1.x"
 
 if env['mode'] == 'release':
@@ -195 +203 @@
     env.Append(CCFLAGS=["-O2"])
 else:
-    env.Append(CCFLAGS=["-g", "-Wall"])
+    env.Append(CCFLAGS=["-g", "-W", "-Wall"])
 
 # Export for SConscript files
@@ -203 +211 @@
 env.SConscript("external-alma/SConscript")
 # build library
-so = env.SConscript("src/SConscript", build_dir="build", duplicate=0)
+so = env.SConscript("src/SConscript", variant_dir="build", duplicate=0)
 # test module import, to see if there are unresolved symbols
 def test_module(target,source,env):
@@ -243 +251 @@
 # make binary distribution
 if len(env["makedist"]):
-    env["stagedir"] = "asap-%s-%s" % (env["version"], env["makedist"])
+    env["stagedir"] = "asap-%s" % (env["version"])
     env.Command('Staging distribution for archive in %s' % env["stagedir"],
                 '', env.MessageAction)
-    st0 = env.QInstall("$stagedir/asap", [so,  env.SGlob("python/*.py")] )
+    env.QInstall("$stagedir/asap", [so,  env.SGlob("python/*.py")] )
     env.QInstall("$stagedir/bin", ["bin/asap", "bin/asap_update_data"])
     env.QInstall("$stagedir", ["packaging/setup.py"])
+    env.QInstall("$stagedir/debian", env.SGlob("packaging/debian/*") )
     env.QInstall("$stagedir/asap/data", "share/ipythonrc-asap")
     env.QInstall("$stagedir/asap/data", "share/ipy_user_conf.py")
@@ -261 +270 @@
         env.Command("No data tables available. Use 'asap_update_data' after install",
                     '', env.MessageAction)
-    arch = env.Archiver(os.path.join("dist",env["stagedir"]),
+    arch = env.Archiver(os.path.join("dist",
+                                     env["stagedir"]+"_"+env["makedist"]),
                         env["stagedir"])
-    env.AddPostAction(arch, Delete("$stagedir"))
+#    env.AddPostAction(arch, Delete("$stagedir"))
 
 if env["apps"]:

trunk/packaging/debian/control

@@ -10 +10 @@
 Package: asap
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-matplotlib (>= 0.99.1), libboost-python1.34.1, ipython (>= 0.8), python-numpy (>= 1.3),
-libatlas3gf-base, libblas3gf, liblapack3gf, libgfortran3, libstdc++6
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-matplotlib (>= 0.99.1), libboost-python1.34.1, ipython (>= 0.8), python-numpy (>= 1.3),libatlas3gf-base, libblas3gf, liblapack3gf, libgfortran3, libstdc++6
 Description: The ATNF Spectral-line Analysis Package
  Blah blah