diff --git a/android/build-all.py b/android/build-all.py index cc331197..d45ce6bb 100644 --- a/android/build-all.py +++ b/android/build-all.py @@ -71,7 +71,7 @@ print("Building all examples...") for example in EXAMPLES: print(COLOR_GREEN + "Building %s (%d/%d)" % (example, CURR_INDEX, len(EXAMPLES)) + COLOR_END) - if subprocess.call("python build.py %s %s" % (example, BUILD_ARGUMENTS)) != 0: + if subprocess.call(("python build.py %s %s" % (example, BUILD_ARGUMENTS)).split(' ')) != 0: print("Error during build process for %s" % example) sys.exit(-1) CURR_INDEX += 1 diff --git a/android/build.py b/android/build.py index 2d1f2be0..115c8d88 100644 --- a/android/build.py +++ b/android/build.py @@ -29,7 +29,7 @@ if not os.path.isfile(os.path.join(PROJECT_FOLDER, "build.xml")): ANDROID_CMD = "android" if os.name == 'nt': ANDROID_CMD += ".bat" - if subprocess.call("%s update project -p ./%s -t %s" % (ANDROID_CMD, PROJECT_FOLDER, SDK_VERSION)) != 0: + if subprocess.call(("%s update project -p ./%s -t %s" % (ANDROID_CMD, PROJECT_FOLDER, SDK_VERSION)).split(' ')) != 0: print("Error: Project update failed!") sys.exit(-1) @@ -43,7 +43,7 @@ SHADER_DIR = EXAMPLE_JSON["directories"]["shaders"] # Additional ADDITIONAL_DIRS = [] ADDITIONAL_FILES = [] -if "additional" in EXAMPLE_JSON["assets"]: +if "assets" in EXAMPLE_JSON and "additional" in EXAMPLE_JSON["assets"]: ADDITIONAL = EXAMPLE_JSON["assets"]["additional"] if "directories" in ADDITIONAL: ADDITIONAL_DIRS = ADDITIONAL["directories"] diff --git a/android/install-all.py b/android/install-all.py index f4cfa06f..16c3b1e6 100644 --- a/android/install-all.py +++ b/android/install-all.py @@ -8,7 +8,6 @@ if answer: for arg in sys.argv[1:]: if arg == "-validation": BUILD_ARGUMENTS += "-validation" - if subprocess.call("python build-all.py -deploy %s" % BUILD_ARGUMENTS) != 0: + if subprocess.call(("python build-all.py -deploy %s" % BUILD_ARGUMENTS).split(' ')) != 0: print("Error: Not all examples may have been installed!") sys.exit(-1) - \ No newline at end of file