Changeset 3544

Timestamp:

Sep 7, 2006, 1:36:10 PM (18 years ago)

Author:

jack

Message:

Make the SCons script build .pyo files in addition to .pyc files.

Files:

• SConstruct (modified) (4 diffs)
• build_options.py (modified) (1 diff)

SConstruct

@@ -5 +5 @@
 # Function to build a .pyc from a .py
 def build_pyc(target, source, env):
-    py_compile.compile(str(source[0]), str(target[0]), doraise=True)
+    python = sys.executable
+    command = "import py_compile; py_compile.compile('%s', doraise=True)"
+    if sys.platform == 'win32':
+        command %= str(source[0]).replace('\\', '\\\\')
+    else:
+        command %= str(source[0])
+    rv = os.system('%s -c "%s"' % (python, command))
+    if not rv == 0:
+        raise SyntaxError, "Could not compile %s" % str(source[0])
+    return None
+
+# Function to build a .pyo from a .py
+def build_pyo(target, source, env):
+    python = sys.executable
+    command = "import py_compile; py_compile.compile('%s', doraise=True)"
+    if sys.platform == 'win32':
+        command %= str(source[0]).replace('\\', '\\\\')
+    else:
+        command %= str(source[0])
+    options = '-' + 'O' * env['OPTIMISATION_LEVEL']
+    rv = os.system('%s %s -c "%s"' % (python, options, command))
+    if not rv == 0:
+        raise SyntaxError, "Could not compile %s" % str(source[0])
     return None
 
@@ -13 +35 @@
 opts.Add('MSVCFLAGS', 'Flags passed to the MSVC compiler')
 opts.Add('METIS_DIR', 'Location of the metis directory relative to the pymetis directory')
+opts.Add('OPTIMISATION_LEVEL', 'Optimisation level for the building of .pyo files. Must be 1 or 2')
 
 # Create the .pyc builder
@@ -18 +41 @@
                       suffix = '.pyc',
                       src_suffix = '.py')
+# Create the .pyo builder
+pyo_builder = Builder(action = build_pyo,
+                      suffix = '.pyo',
+                      src_suffix = '.py')
 
 env = Environment(options = opts)
-env.Append(BUILDERS={'Pyc' : pyc_builder})
+env.Append(BUILDERS={'Pyc' : pyc_builder,
+                     'Pyo' : pyo_builder})
 
 Help(opts.GenerateHelpText(env))
+
+if not (env['OPTIMISATION_LEVEL'] == 1 or env['OPTIMISATION_LEVEL'] == 2):
+    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
@@ -72 +103 @@
 for x in files:
     env.Pyc(x + 'c', x)
+    env.Pyo(x + 'o', x)
 
 SConscript(['anuga_core/source/anuga/SConscript'])

build_options.py

@@ -9 +9 @@
 # Location of the metis directory relative to the pymetis directory
 METIS_DIR = 'metis-4.0'
+
+# Optimisation level used when building the .pyo files
+OPTIMISATION_LEVEL = 1