From ff65a1b2fd5789162cc8ee391754153a580ed732 Mon Sep 17 00:00:00 2001 From: Tobias Markmann <tm@ayena.de> Date: Thu, 18 Feb 2016 23:05:26 +0100 Subject: 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 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) -- cgit v0.10.2-6-g49f6