Changeset 3875

Timestamp:

Oct 26, 2006, 1:29:17 PM (17 years ago)

Author:

jack

Message:

Moved the SConstruct and build_options.py into the source/anuga directory.
It still builds like normal and will still install an anuga subdir under PREFIX.

Location:

anuga_core/source/anuga

Files:

• SConstruct (moved) (moved from anuga_core/SConstruct) (2 diffs)
• build_options.py (moved) (moved from anuga_core/build_options.py) (1 diff)

anuga_core/source/anuga/SConstruct

@@ -107 +107 @@
 env['SHLIBPREFIX'] = ""
 
-anuga_root = os.path.join('source', 'anuga')
+anuga_root = '.'
 install_root = os.path.join(env['PREFIX'], 'anuga')
 
 # Build .pyc and .pyo files of every .py in here and below.
 files = []
-#dirs = filter(os.path.isdir, os.listdir('.'))
-#Only build the source/anuga directory for now
-dirs = [anuga_root]
+dirs = filter(os.path.isdir, os.listdir('.'))
 while(dirs != []):
     dirs += filter(os.path.isdir, map(lambda x : os.path.join(dirs[0], x), os.listdir(dirs[0])))
@@ -122 +120 @@
     env.Pyc(x + 'c', x)
     env.Pyo(x + 'o', x)
-    # We have to cut the first character off the result of os.path.dirname(x).replace('anuga_core, '')
-    # or else we will start taking paths relative to the root directory.
-    instdir = os.path.join(env['PREFIX'], os.path.dirname(x).replace('source', '')[1:])
-    env.Install(instdir, x + 'c')
-    env.Install(instdir, x + 'o')
+    env.Install(os.path.join(install_root, os.path.dirname(x)), x + 'c')
+    env.Install(os.path.join(install_root, os.path.dirname(x)), x + 'o')
     if env['INSTALL_PYTHON_SOURCE']:
-        env.Install(instdir, x)
+        env.Install(os.path.join(install_root, os.path.dirname(x)), x)
 
 # Define the install target

anuga_core/source/anuga/build_options.py

@@ -6 +6 @@
 # Flags to pass to MSVC Compiler
 MSVCFLAGS = '/Wall'
-
-# Location of the metis directory relative to the pymetis directory
-METIS_DIR = 'metis-4.0'
 
 # Optimisation level used when building the .pyo files