Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2014-02-22 12:33:59 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2014-02-22 16:25:27 (GMT) |
| commit | 989b3711186d7fe9766dffa9334d70de78666db3 (patch) | |
| tree | ca282e67d6da17430f0119362fa907357c32e0bb /BuildTools/SCons/Tools | |
| parent | be45135a1b1051eab02003fe54ee7e87f5f1558e (diff) | |
| download | swift-989b3711186d7fe9766dffa9334d70de78666db3.zip swift-989b3711186d7fe9766dffa9334d70de78666db3.tar.bz2 | |
Make git and wix wrappers in build system more convenient for use by other projects
Change-Id: I173f42bfe2dde7d18be3d54976649aa1bac13dbf
Diffstat (limited to 'BuildTools/SCons/Tools')
| -rw-r--r-- | BuildTools/SCons/Tools/wix.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/wix.py b/BuildTools/SCons/Tools/wix.py index 69622f6..7b62508 100644 --- a/BuildTools/SCons/Tools/wix.py +++ b/BuildTools/SCons/Tools/wix.py @@ -20,7 +20,7 @@ def generate(env) : return [ "" + include for include in includes ] heat_builder = SCons.Builder.Builder( - action = '"$WIX_HEAT" dir Swift\\QtUI\\Swift -cg Files $WIX_HEAT_OPTIONS -o ${TARGET} -t Swift\\Packaging\\WiX\\include.xslt', + action = '"$WIX_HEAT" dir "$WIX_SOURCE_OBJECT_DIR" -cg Files $WIX_HEAT_OPTIONS -o ${TARGET} -t Swift\\Packaging\\WiX\\include.xslt', suffix = '.wxi') @@ -38,7 +38,7 @@ def generate(env) : light_builder = SCons.Builder.Builder( - action = '"$WIX_LIGHT" $WIX_LIGHT_OPTIONS -b Swift\\QtUI\\Swift ${SOURCES} -o ${TARGET}', + action = '"$WIX_LIGHT" $WIX_LIGHT_OPTIONS -b "$WIX_SOURCE_OBJECT_DIR" ${SOURCES} -o ${TARGET}', src_suffix = '.wixobj', src_builder = candle_builder) |