diff options
author | Remko Tronçon <git@el-tramo.be> | 2013-09-02 18:46:42 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2013-09-02 18:46:42 (GMT) |
commit | 6f6df1064446bc3a0a71925c68488b03b6888176 (patch) | |
tree | bd9654b04030e6b5ca67c93e6c675c96abe831fc /BuildTools | |
parent | 4f1274bcdd2af1a38b7de0b3ef4c18d6cd83c4a3 (diff) | |
download | swift-6f6df1064446bc3a0a71925c68488b03b6888176.zip swift-6f6df1064446bc3a0a71925c68488b03b6888176.tar.bz2 |
scons2ninja: Added support for dist=1.
Change-Id: I2c07f916b4a4a14707a182c027d5eda3a736649b
Diffstat (limited to 'BuildTools')
-rwxr-xr-x | BuildTools/scons2ninja.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/BuildTools/scons2ninja.py b/BuildTools/scons2ninja.py index 98b3518..4a7631a 100755 --- a/BuildTools/scons2ninja.py +++ b/BuildTools/scons2ninja.py @@ -221,6 +221,9 @@ ninja_post = [] scons_cmd = "scons" scons_dependencies = ['SConstruct'] + rglob('SConscript') +def ninja_custom_command(ninja, line) : + return False + CONFIGURATION_FILE = '.scons2ninja.conf' execfile(CONFIGURATION_FILE) @@ -320,6 +323,10 @@ ninja.rule('ibtool', command = '$ibtool $ibtoolflags --compile $out $in', description = 'IBTOOL $out') +ninja.rule('dsymutil', + command = '$dsymutil $dsymutilflags -o $out $in', + description = 'DSYMUTIL $out') + ninja.rule('generator', command = "python " + SCRIPT + " ${scons_args}", depfile = ".scons2ninja.deps", @@ -559,7 +566,12 @@ for line in build_lines : files, flags = extract_non_flags(flags) ninja.build(out, 'ibtool', files, ibtoolflags = flags) - else : + elif tool == 'dsymutil': + out, flags = extract_binary_flag("-o", flags) + files, flags = extract_non_flags(flags) + ninja.build(out, 'dsymutil', files, dsymutilflags = flags) + + elif not ninja_custom_command(ninja, line) : raise Exception("Unknown tool: '" + line + "'") |