diff options
author | garyo <devnull@localhost> | 2012-11-18 03:31:36 (GMT) |
---|---|---|
committer | garyo <devnull@localhost> | 2012-11-18 03:31:36 (GMT) |
commit | 8472b14ce10db2aec806dbabaf713fd8a6fb0750 (patch) | |
tree | 9b1282d409876c16391867e568a8cb0e6da597fb /src/engine/SCons/Tool/wix.py | |
parent | 6bd928b26483c0833be69360eac422f779f0957c (diff) | |
download | SCons-8472b14ce10db2aec806dbabaf713fd8a6fb0750.zip SCons-8472b14ce10db2aec806dbabaf713fd8a6fb0750.tar.gz SCons-8472b14ce10db2aec806dbabaf713fd8a6fb0750.tar.bz2 |
Added Wix test and made a few Wix constants into construction vars.
Diffstat (limited to 'src/engine/SCons/Tool/wix.py')
-rw-r--r-- | src/engine/SCons/Tool/wix.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/wix.py b/src/engine/SCons/Tool/wix.py index eb8d15d..c898949 100644 --- a/src/engine/SCons/Tool/wix.py +++ b/src/engine/SCons/Tool/wix.py @@ -47,15 +47,17 @@ def generate(env): env['WIXLIGHTFLAGS'].append( '-nologo' ) env['WIXLIGHTCOM'] = "$WIXLIGHT $WIXLIGHTFLAGS -out ${TARGET} ${SOURCES}" + env['WIXSRCSUF'] = '.wxs' + env['WIXOBJSUF'] = '.wixobj' object_builder = SCons.Builder.Builder( action = '$WIXCANDLECOM', - suffix = '.wixobj', - src_suffix = '.wxs') + suffix = '$WIXOBJSUF', + src_suffix = '$WIXSRCSUF') linker_builder = SCons.Builder.Builder( action = '$WIXLIGHTCOM', - src_suffix = '.wixobj', + src_suffix = '$WIXOBJSUF', src_builder = object_builder) env['BUILDERS']['WiX'] = linker_builder |