Changeset 3545

Timestamp:

Sep 7, 2006, 2:52:51 PM (18 years ago)

Author:

jack

Message:

Added basic install support of the python .py/.pyc/.pyo files.

Files:

• SConstruct (modified) (5 diffs)
• anuga_core/source/anuga/mesh_engine/SConscript (modified) (1 diff)
• build_options.py (modified) (1 diff)

SConstruct

@@ -30 +30 @@
     return None
 
+# Create the builders
+pyc_builder = Builder(action = build_pyc,
+                      suffix = '.pyc',
+                      src_suffix = '.py')
+pyo_builder = Builder(action = build_pyo,
+                      suffix = '.pyo',
+                      src_suffix = '.py')
+
 # Read in build options
 opts = Options('build_options.py')
@@ -37 +45 @@
 opts.Add('OPTIMISATION_LEVEL', 'Optimisation level for the building of .pyo files. Must be 1 or 2')
 
-# Create the .pyc builder
-pyc_builder = Builder(action = build_pyc,
-                      suffix = '.pyc',
-                      src_suffix = '.py')
-# Create the .pyo builder
-pyo_builder = Builder(action = build_pyo,
-                      suffix = '.pyo',
-                      src_suffix = '.py')
+# Windows' site packages are in a different location to those on Linux
+if sys.platform == 'win32':
+    opts.Add(PathOption('PREFIX',
+                        'Location to install compiled sources',
+                        os.path.join(sys.exec_prefix, 'lib', 'site-packages')))
+else:
+    opts.Add(PathOption('PREFIX',
+                        'Location to install compiled sources'.
+                        os.path.join(sys.exec_prefix, 'lib', 'python' + sys.version[:3], 'site-packages')))
+
+opts.Add(BoolOption('INSTALL_PYTHON_SOURCE',
+                    'Install the .py files as well as the .pyc/.pyo files',
+                    0))
 
 env = Environment(options = opts)
@@ -55 +68 @@
     raise ValueError, "OPTIMISATION_LEVEL must be between 1 and 2 inclusive"
 
-# Find the path for Python.h and then share it to other SConscripts later on
 # Where to find the Python.h
 if sys.platform == 'win32':
@@ -69 +81 @@
     env.Append(LIBS=[python_libname])
 else:
-    python_include = os.path.join(os.path.join(sys.exec_prefix, 'include'),
-                                  'python' + sys.version[:3])
+    python_include = os.path.join(sys.exec_prefix, 'include', 'python' + sys.version[:3])
     
 # Check existence of Python.h
@@ -98 +109 @@
 dirs = ['anuga_core']
 while(dirs != []):
-    dirs += filter(os.path.isdir, map(lambda x : dirs[0] + os.sep + x, os.listdir(dirs[0])))
-    files += filter(lambda x : x[-3:] == '.py', map(lambda x : dirs[0] + os.sep + x, os.listdir(dirs[0])))
+    dirs += filter(os.path.isdir, map(lambda x : os.path.join(dirs[0], x), os.listdir(dirs[0])))
+    files += filter(lambda x : x[-3:] == '.py', map(lambda x : os.path.join(dirs[0], x), os.listdir(dirs[0])))
     dirs = dirs[1:]
 for x in files:
     env.Pyc(x + 'c', x)
     env.Pyo(x + 'o', x)
+    instdir = os.path.join(env['PREFIX'], os.path.split(x)[0])
+    env.Install(instdir, x + 'c')
+    env.Install(instdir, x + 'o')
+    if env['INSTALL_PYTHON_SOURCE']:
+        env.Install(instdir, x)
 
+env.Alias('install', '${PREFIX}')
+    
 SConscript(['anuga_core/source/anuga/SConscript'])

anuga_core/source/anuga/mesh_engine/SConscript

@@ -5 +5 @@
 env2.SharedLibrary('triang', ['triangle.c', 'triang.c'])
 env2.SharedLibrary('triangle', ['triangle.c'])
-
-
-

build_options.py

@@ -12 +12 @@
 # Optimisation level used when building the .pyo files
 OPTIMISATION_LEVEL = 1
+
+# Where to install the compiled files. Defaults vary based on OS.
+# Uncommenting this and leaving it as the empty string will cause the
+# build to fail.
+PREFIX = 'c:\\pyanuga_temp'
+
+# Install .py files as well as the binaries? Yes/No option
+INSTALL_PYTHON_SOURCE = 'Yes'