Changeset 724

Show
Ignore:
Timestamp:
2005-01-24 14:45:33 (4 years ago)
Author:
conrad
Message:

create a separate, consistent environment for building programs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • liboggz/branches/scons/SConstruct

    r723 r724  
    1717my_cppdefines['OGGZ_CONFIG_WRITE'] = '${enable_write}' 
    1818 
    19 env = Environment(options = opts, 
    20                   CPPPATH = '#/scons', 
    21                   CPPDEFINES = my_cppdefines) 
    22 Export('env') 
     19libenv = Environment(options = opts, 
     20                     CPPPATH = '#/scons', 
     21                     CPPDEFINES = my_cppdefines) 
     22Export('libenv') 
    2323 
    24 dict = env.Dictionary() 
     24progenv = libenv.Copy() 
     25progenv.Append(LIBS = ['oggz', 'ogg']) 
     26progenv.Append(LIBPATH = '../liboggz') 
     27Export('progenv') 
     28 
     29dict = libenv.Dictionary() 
    2530 
    2631enable_read = dict['enable_read'] 

  • liboggz/branches/scons/src/examples/SConscript

    r723 r724  
    1 Import('env') 
     1Import('progenv') 
    22Import('enable_read') 
    33Import('enable_write') 
    44 
    5 env.Append(LIBS = ['oggz', 'ogg']) 
    6 env.Append(LIBPATH = '../liboggz') 
    7  
    85if enable_read and enable_write: 
    9         env.Program('identity', 'identity.c') 
     6        progenv.Program('identity', 'identity.c') 
    107 
    118if enable_read: 
    12         env.Program('read-file', 'read-file.c') 
    13         env.Program('read-io', 'read-io.c') 
    14         env.Program('seek-stress', 'seek-stress.c') 
     9        progenv.Program('read-file', 'read-file.c') 
     10        progenv.Program('read-io', 'read-io.c') 
     11        progenv.Program('seek-stress', 'seek-stress.c') 
    1512 
    1613if enable_write: 
    17         env.Program('write-feed', 'write-feed.c') 
    18         env.Program('write-hungry', 'write-hungry.c') 
     14        progenv.Program('write-feed', 'write-feed.c') 
     15        progenv.Program('write-hungry', 'write-hungry.c') 

  • liboggz/branches/scons/src/liboggz/SConscript

    r723 r724  
    1 Import('env') 
    2 liboggz = env.SharedLibrary ('liboggz', Split(""" 
     1Import('libenv') 
     2liboggz = libenv.SharedLibrary ('liboggz', Split(""" 
    33        oggz.c oggz_io.c oggz_read.c oggz_write.c  
    44        oggz_auto.c oggz_stream.c 
    55        oggz_table.c oggz_vector.c 
    66        """)) 
    7 #Default(liboggz) 

  • liboggz/branches/scons/src/tests/SConscript

    r723 r724  
    1 Import('env') 
     1Import('progenv') 
    22Import('enable_read') 
    33Import('enable_write') 
    44 
    5 env.Append(LIBS = ['oggz', 'ogg']) 
    6 env.Append(LIBPATH = '../liboggz') 
    7  
    85if enable_write: 
    9         env.Program('write-bad-guard', 'write-bad-guard.c') 
    10         env.Program('write-unmarked-guard', 'write-unmarked-guard.c') 
    11         env.Program('write-recursive', 'write-recursive.c') 
    12         env.Program('write-bad-bytes', 'write-bad-bytes.c') 
    13         env.Program('write-bad-bos', 'write-bad-bos.c') 
    14         env.Program('write-dup-bos', 'write-dup-bos.c') 
    15         env.Program('write-bad-eos', 'write-bad-eos.c') 
    16         env.Program('write-bad-granulepos', 'write-bad-granulepos.c') 
    17         env.Program('write-bad-packetno', 'write-bad-packetno.c') 
     6        progenv.Program('write-bad-guard', 'write-bad-guard.c') 
     7        progenv.Program('write-unmarked-guard', 'write-unmarked-guard.c') 
     8        progenv.Program('write-recursive', 'write-recursive.c') 
     9        progenv.Program('write-bad-bytes', 'write-bad-bytes.c') 
     10        progenv.Program('write-bad-bos', 'write-bad-bos.c') 
     11        progenv.Program('write-dup-bos', 'write-dup-bos.c') 
     12        progenv.Program('write-bad-eos', 'write-bad-eos.c') 
     13        progenv.Program('write-bad-granulepos', 'write-bad-granulepos.c') 
     14        progenv.Program('write-bad-packetno', 'write-bad-packetno.c') 
    1815 
    1916if enable_read and enable_write: 
    20         env.Program('read-generated', 'read-generated.c') 
    21         env.Program('read-stop-ok', 'read-stop-ok.c') 
    22         env.Program('read-stop-err', 'read-stop-err.c') 
    23         env.Program('io-read', 'io-read.c') 
    24         env.Program('io-seek', 'io-seek.c') 
    25         env.Program('io-write', 'io-write.c') 
    26         env.Program('io-read-single', 'io-read-single.c') 
    27         env.Program('io-write-flush', 'io-write-flush.c') 
     17        progenv.Program('read-generated', 'read-generated.c') 
     18        progenv.Program('read-stop-ok', 'read-stop-ok.c') 
     19        progenv.Program('read-stop-err', 'read-stop-err.c') 
     20        progenv.Program('io-read', 'io-read.c') 
     21        progenv.Program('io-seek', 'io-seek.c') 
     22        progenv.Program('io-write', 'io-write.c') 
     23        progenv.Program('io-read-single', 'io-read-single.c') 
     24        progenv.Program('io-write-flush', 'io-write-flush.c') 

  • liboggz/branches/scons/src/tools/SConscript

    r723 r724  
    1 Import('env') 
     1Import('progenv') 
    22Import('enable_read') 
    33Import('enable_write') 
    44 
    5 env.Append(LIBS = ['oggz', 'ogg']) 
    6 env.Append(LIBPATH = '../liboggz') 
    7  
    85if enable_read: 
    9         env.Program('oggzinfo', 'oggzinfo.c') 
    10         env.Program('oggzed', 'oggzed.c') 
    11         env.Program('oggzdump', 'oggzdump.c') 
     6        progenv.Program('oggzinfo', 'oggzinfo.c') 
     7        progenv.Program('oggzed', 'oggzed.c') 
     8        progenv.Program('oggzdump', 'oggzdump.c') 
    129 
    1310if enable_read and enable_write: 
    14         env.Program('oggzmerge', 'oggzmerge.c') 
    15         env.Program('oggzrip', 'oggzrip.c') 
     11        progenv.Program('oggzmerge', 'oggzmerge.c') 
     12        progenv.Program('oggzrip', 'oggzrip.c')