diff options
| author | Steven Knight <knight@baldmt.com> | 2002-10-01 18:16:15 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-10-01 18:16:15 (GMT) |
| commit | dffe09bd431aeeb996ad14763154abe5c412b93e (patch) | |
| tree | e2d9c5d145c1af4978dbabc5998210308684145b /src | |
| parent | 752502105f63c91ee1f87cc35b83634c6bc42c3b (diff) | |
| download | SCons-dffe09bd431aeeb996ad14763154abe5c412b93e.zip SCons-dffe09bd431aeeb996ad14763154abe5c412b93e.tar.gz SCons-dffe09bd431aeeb996ad14763154abe5c412b93e.tar.bz2 | |
Add SHOBJPREFIX AND SHOBJSUFFIX.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Defaults.py | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/cygwin.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/os2.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/posix.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/win32.py | 2 |
6 files changed, 14 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3ad1fc7..0d50628 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -45,6 +45,9 @@ RELEASE 0.09 - ...," "done reading SConscript files," "Building targets," and "done building targets." + - Add separate $SHOBJPREFIX and $SHOBJSUFFIX construction variables + (by default, the same as $OBJPREFIX and $OBJSUFFIX). + From Jeff Petkau: - Fix interpretation of '#/../foo' on Win32 systems. diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index 136b3e0..d70be0d 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -140,8 +140,8 @@ def StaticObject(): def SharedObject(): """A function for generating the shared object Builder.""" return SCons.Builder.Builder(action = {}, - prefix = '$OBJPREFIX', - suffix = '$OBJSUFFIX', + prefix = '$SHOBJPREFIX', + suffix = '$SHOBJSUFFIX', src_builder = ['CFile', 'CXXFile']) ProgScan = SCons.Scanner.Prog.ProgScan() @@ -157,7 +157,7 @@ SharedLibrary = SCons.Builder.Builder(action=[ SharedCheck, "$SHLINKCOM" ], prefix = '$SHLIBPREFIX', suffix = '$SHLIBSUFFIX', scanner = ProgScan, - src_suffix = '$OBJSUFFIX', + src_suffix = '$SHOBJSUFFIX', src_builder = 'SharedObject') def DVI(): diff --git a/src/engine/SCons/Platform/cygwin.py b/src/engine/SCons/Platform/cygwin.py index c01c022..47b64d6 100644 --- a/src/engine/SCons/Platform/cygwin.py +++ b/src/engine/SCons/Platform/cygwin.py @@ -40,6 +40,8 @@ def generate(env): env['ENV']['PATH'] = '/usr/local/bin:/bin:/usr/bin' env['OBJPREFIX'] = '' env['OBJSUFFIX'] = '.o' + env['SHOBJPREFIX'] = '$OBJPREFIX' + env['SHOBJSUFFIX'] = '$OBJSUFFIX' env['PROGPREFIX'] = '' env['PROGSUFFIX'] = '.exe' env['LIBPREFIX'] = 'lib' diff --git a/src/engine/SCons/Platform/os2.py b/src/engine/SCons/Platform/os2.py index d56150c..c389521 100644 --- a/src/engine/SCons/Platform/os2.py +++ b/src/engine/SCons/Platform/os2.py @@ -39,6 +39,8 @@ def generate(env): env['ENV'] = {} env['OBJPREFIX'] = '' env['OBJSUFFIX'] = '.obj' + env['SHOBJPREFIX'] = '$OBJPREFIX' + env['SHOBJSUFFIX'] = '$OBJSUFFIX' env['PROGPREFIX'] = '' env['PROGSUFFIX'] = '.exe' env['LIBPREFIX'] = '' diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py index ab3fb7f..551265c 100644 --- a/src/engine/SCons/Platform/posix.py +++ b/src/engine/SCons/Platform/posix.py @@ -40,6 +40,8 @@ def generate(env): env['ENV']['PATH'] = '/usr/local/bin:/bin:/usr/bin' env['OBJPREFIX'] = '' env['OBJSUFFIX'] = '.o' + env['SHOBJPREFIX'] = '$OBJPREFIX' + env['SHOBJSUFFIX'] = '$OBJSUFFIX' env['PROGPREFIX'] = '' env['PROGSUFFIX'] = '' env['LIBPREFIX'] = 'lib' diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py index ea6a23b..5ad9ff1 100644 --- a/src/engine/SCons/Platform/win32.py +++ b/src/engine/SCons/Platform/win32.py @@ -40,6 +40,8 @@ def generate(env): env['ENV']['PATHEXT'] = '.COM;.EXE;.BAT;.CMD' env['OBJPREFIX'] = '' env['OBJSUFFIX'] = '.obj' + env['SHOBJPREFIX'] = '$OBJPREFIX' + env['SHOBJSUFFIX'] = '$OBJSUFFIX' env['PROGPREFIX'] = '' env['PROGSUFFIX'] = '.exe' env['LIBPREFIX'] = '' |