Changeset 3546


Ignore:
Timestamp:
Sep 7, 2006, 3:21:16 PM (18 years ago)
Author:
jack
Message:

The install target should now be complete.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • SConstruct

    r3545 r3546  
    5252else:
    5353    opts.Add(PathOption('PREFIX',
    54                         'Location to install compiled sources'.
     54                        'Location to install compiled sources',
    5555                        os.path.join(sys.exec_prefix, 'lib', 'python' + sys.version[:3], 'site-packages')))
    5656
     
    106106files = []
    107107#dirs = filter(os.path.isdir, os.listdir('.'))
    108 #Only build the anuga_core directory for now
    109 dirs = ['anuga_core']
     108#Only build the anuga_core/source/anuga directory for now
     109dirs = [os.path.join('anuga_core', 'source', 'anuga')]
    110110while(dirs != []):
    111111    dirs += filter(os.path.isdir, map(lambda x : os.path.join(dirs[0], x), os.listdir(dirs[0])))
     
    115115    env.Pyc(x + 'c', x)
    116116    env.Pyo(x + 'o', x)
    117     instdir = os.path.join(env['PREFIX'], os.path.split(x)[0])
     117    # We have to cut the first character off the result of os.path.dirname(x).replace(os.path.join('anuga_core, 'source'), '')
     118    # or else we will start taking paths relative to the root directory.
     119    instdir = os.path.join(env['PREFIX'], os.path.dirname(x).replace(os.path.join('anuga_core', 'source'), '')[1:])
    118120    env.Install(instdir, x + 'c')
    119121    env.Install(instdir, x + 'o')
  • anuga_core/source/anuga/mesh_engine/SConscript

    r3545 r3546  
     1import os
    12Import('env')
    23env2 = env.Copy()
    34env2.Append(CPPDEFINES=[('TRILIBRARY', 1), ('NO_TIMER', 1)])
    45
    5 env2.SharedLibrary('triang', ['triangle.c', 'triang.c'])
    6 env2.SharedLibrary('triangle', ['triangle.c'])
     6instdir = os.path.join(env['PREFIX'], 'anuga', 'mesh_engine')
     7env.Install(instdir, env2.SharedLibrary('triang', ['triangle.c', 'triang.c']))
     8env.Install(instdir, env2.SharedLibrary('triangle', ['triangle.c']))
  • anuga_core/source/anuga/pyvolution/SConscript

    r3523 r3546  
     1import os
    12Import('env')
    23env2 = env.Copy()
    34env2.Append(CPPPATH=['#anuga_core/source/anuga/utilities'])
    45
    5 env2.SharedLibrary('quantity_ext', ['quantity_ext.c'])
    6 env2.SharedLibrary('shallow_water_ext', ['shallow_water_ext.c'])
    7 env2.SharedLibrary('shallow_water_kinetic', ['shallow_water_kinetic_ext.c'])
     6instdir = os.path.join(env['PREFIX'], 'anuga', 'pyvolution')
     7env.Install(instdir, env2.SharedLibrary('quantity_ext', ['quantity_ext.c']))
     8env.Install(instdir, env2.SharedLibrary('shallow_water_ext', ['shallow_water_ext.c']))
     9env.Install(instdir, env2.SharedLibrary('shallow_water_kinetic', ['shallow_water_kinetic_ext.c']))
  • anuga_core/source/anuga/utilities/SConscript

    r3282 r3546  
     1import os
    12Import('env')
    2 env.SharedLibrary('polygon_ext', ['polygon_ext.c'])
    3 env.SharedLibrary('util_ext', ['util_ext.c'])
    4 env.SharedLibrary('sparse_ext', ['sparse_ext.c'])
     3instdir = os.path.join(env['PREFIX'], 'anuga', 'utilities')
     4env.Install(instdir, env.SharedLibrary('polygon_ext', ['polygon_ext.c']))
     5env.Install(instdir, env.SharedLibrary('util_ext', ['util_ext.c']))
     6env.Install(instdir, env.SharedLibrary('sparse_ext', ['sparse_ext.c']))
  • build_options.py

    r3545 r3546  
    1616# Uncommenting this and leaving it as the empty string will cause the
    1717# build to fail.
    18 PREFIX = 'c:\\pyanuga_temp'
     18#PREFIX = ''
    1919
    2020# Install .py files as well as the binaries? Yes/No option
Note: See TracChangeset for help on using the changeset viewer.