godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make build scripts Python3 compatible

Browse Source 
- The Windows, UWP, Android (on Windows) and Linux builds are
  tested with Scons 3.0 alpha using Python 3.
- OSX and iOS should hopefully work but are not tested since
  I don't have a Mac.
- Builds using SCons 2.5 and Python 2 should not be impacted.
This commit is contained in:
Matthias Hoelzl
2017-08-26 18:53:49 +02:00
parent a919a013f5
commit b6e1e47e3a
17 changed files with 123 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/android/SCsub
View File

@@ -1,6 +1,7 @@
#!/usr/bin/env python
import shutil
from compat import open_utf8
Import('env')
@@ -40,8 +41,8 @@ prog = None
abspath = env.Dir(".").abspath
gradle_basein = open(abspath + "/build.gradle.template", "rb")
gradle_baseout = open(abspath + "/java/build.gradle", "wb")
gradle_basein = open_utf8(abspath + "/build.gradle.template", "r")
gradle_baseout = open_utf8(abspath + "/java/build.gradle", "w")
gradle_text = gradle_basein.read()
@@ -124,8 +125,8 @@ gradle_baseout.write(gradle_text)
gradle_baseout.close()
pp_basein = open(abspath + "/AndroidManifest.xml.template", "rb")
pp_baseout = open(abspath + "/java/AndroidManifest.xml", "wb")
pp_basein = open_utf8(abspath + "/AndroidManifest.xml.template", "r")
pp_baseout = open_utf8(abspath + "/java/AndroidManifest.xml", "w")
manifest = pp_basein.read()
manifest = manifest.replace("$$ADD_APPLICATION_CHUNKS$$", env.android_manifest_chunk)
manifest = manifest.replace("$$ADD_PERMISSION_CHUNKS$$", env.android_permission_chunk)
@@ -146,7 +147,7 @@ elif env['android_arch'] == 'arm64v8':
elif env['android_arch'] == 'x86':
lib_arch_dir = 'x86'
else:
print 'WARN: Architecture not suitable for embedding into APK; keeping .so at \\bin'
print('WARN: Architecture not suitable for embedding into APK; keeping .so at \\bin')
if lib_arch_dir != '':
if env['target'] == 'release':