Changeset 3546

Timestamp:

Sep 7, 2006, 3:21:16 PM (18 years ago)

Author:

jack

Message:

The install target should now be complete.

Files:

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

SConstruct

@@ -52 +52 @@
 else:
     opts.Add(PathOption('PREFIX',
-                        'Location to install compiled sources'.
+                        'Location to install compiled sources',
                         os.path.join(sys.exec_prefix, 'lib', 'python' + sys.version[:3], 'site-packages')))
 
@@ -106 +106 @@
 files = []
 #dirs = filter(os.path.isdir, os.listdir('.'))
-#Only build the anuga_core directory for now
-dirs = ['anuga_core']
+#Only build the anuga_core/source/anuga directory for now
+dirs = [os.path.join('anuga_core', 'source', 'anuga')]
 while(dirs != []):
     dirs += filter(os.path.isdir, map(lambda x : os.path.join(dirs[0], x), os.listdir(dirs[0])))
@@ -115 +115 @@
     env.Pyc(x + 'c', x)
     env.Pyo(x + 'o', x)
-    instdir = os.path.join(env['PREFIX'], os.path.split(x)[0])
+    # We have to cut the first character off the result of os.path.dirname(x).replace(os.path.join('anuga_core, 'source'), '')
+    # or else we will start taking paths relative to the root directory.
+    instdir = os.path.join(env['PREFIX'], os.path.dirname(x).replace(os.path.join('anuga_core', 'source'), '')[1:])
     env.Install(instdir, x + 'c')
     env.Install(instdir, x + 'o')

anuga_core/source/anuga/mesh_engine/SConscript

@@ +1 @@
+import os
 Import('env')
 env2 = env.Copy()
 env2.Append(CPPDEFINES=[('TRILIBRARY', 1), ('NO_TIMER', 1)])
 
-env2.SharedLibrary('triang', ['triangle.c', 'triang.c'])
-env2.SharedLibrary('triangle', ['triangle.c'])
+instdir = os.path.join(env['PREFIX'], 'anuga', 'mesh_engine')
+env.Install(instdir, env2.SharedLibrary('triang', ['triangle.c', 'triang.c']))
+env.Install(instdir, env2.SharedLibrary('triangle', ['triangle.c']))

anuga_core/source/anuga/pyvolution/SConscript

@@ +1 @@
+import os
 Import('env')
 env2 = env.Copy()
 env2.Append(CPPPATH=['#anuga_core/source/anuga/utilities'])
 
-env2.SharedLibrary('quantity_ext', ['quantity_ext.c'])
-env2.SharedLibrary('shallow_water_ext', ['shallow_water_ext.c'])
-env2.SharedLibrary('shallow_water_kinetic', ['shallow_water_kinetic_ext.c'])
+instdir = os.path.join(env['PREFIX'], 'anuga', 'pyvolution')
+env.Install(instdir, env2.SharedLibrary('quantity_ext', ['quantity_ext.c']))
+env.Install(instdir, env2.SharedLibrary('shallow_water_ext', ['shallow_water_ext.c']))
+env.Install(instdir, env2.SharedLibrary('shallow_water_kinetic', ['shallow_water_kinetic_ext.c']))

anuga_core/source/anuga/utilities/SConscript

@@ +1 @@
+import os
 Import('env')
-env.SharedLibrary('polygon_ext', ['polygon_ext.c'])
-env.SharedLibrary('util_ext', ['util_ext.c'])
-env.SharedLibrary('sparse_ext', ['sparse_ext.c'])
+instdir = os.path.join(env['PREFIX'], 'anuga', 'utilities')
+env.Install(instdir, env.SharedLibrary('polygon_ext', ['polygon_ext.c']))
+env.Install(instdir, env.SharedLibrary('util_ext', ['util_ext.c']))
+env.Install(instdir, env.SharedLibrary('sparse_ext', ['sparse_ext.c']))

build_options.py

@@ -16 +16 @@
 # Uncommenting this and leaving it as the empty string will cause the
 # build to fail.
-PREFIX = 'c:\\pyanuga_temp'
+#PREFIX = ''
 
 # Install .py files as well as the binaries? Yes/No option