summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-02-18 22:05:26 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-02-29 17:22:03 (GMT)
commitff65a1b2fd5789162cc8ee391754153a580ed732 (patch)
tree67d61a768f5262ec468500579789591cae0a6390
parent7eec2000d72f8fa597398704121d0b73a84ca284 (diff)
downloadswift-ff65a1b2fd5789162cc8ee391754153a580ed732.zip
swift-ff65a1b2fd5789162cc8ee391754153a580ed732.tar.bz2
Fix scons2ninja tooling
scons2ninja was broken since our last update to SCons in 3rdParty. This commit fixes it. This also includes a workaround to AppBundle.py working around an SCons encoding bug. Test-Information: Successfully run ./BuildTools/scons2ninja.py followed by ninja. Change-Id: I2f9dbbb33dc559ca339bb26ba11b885b39135011
-rw-r--r--.scons2ninja.conf2
-rw-r--r--BuildTools/SCons/Tools/AppBundle.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/.scons2ninja.conf b/.scons2ninja.conf
index 0ad2ef4..3893874 100644
--- a/.scons2ninja.conf
+++ b/.scons2ninja.conf
@@ -1,6 +1,6 @@
import glob, re, os.path
-scons_cmd = "python 3rdParty/SCons/scons.py"
+scons_cmd = "python 3rdParty/SCons/scons-2.4.0/script/scons"
scons_dependencies += glob.glob("BuildTools/SCons/**/*.py") + glob.glob("BuildTools/SCons/SCons*") + ["config.py"]
def ninja_post(ninja) :
diff --git a/BuildTools/SCons/Tools/AppBundle.py b/BuildTools/SCons/Tools/AppBundle.py
index f1072f5..1db7ff8 100644
--- a/BuildTools/SCons/Tools/AppBundle.py
+++ b/BuildTools/SCons/Tools/AppBundle.py
@@ -20,7 +20,7 @@ def generate(env) :
"CFBundleVersion" : version,
"CFBundleIconFile" : bundle,
"NSPrincipalClass" : "NSApplication",
- "NSHumanReadableCopyright" : unichr(0xA9) + " 2010 Swift Development Team.\nAll Rights Reserved."
+ "NSHumanReadableCopyright" : "(c) 2010 Swift Development Team.\nAll Rights Reserved."
}
infoDict.update(info)