diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-25 20:55:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-25 20:55:58 +0100 |
commit | 26c9e86bc0d4e46b0e1020b39b7ef81b431dec2b (patch) | |
tree | 54fc7d9d65332f499bd2e5dcee7da130ceaa764d /platform/javascript/detect.py | |
parent | d7aea6ff6c54466dba51b75de5942154fbffe75d (diff) | |
parent | 6f64d9366439c0df0628c41e98e315059fb5bf0f (diff) | |
download | redot-engine-26c9e86bc0d4e46b0e1020b39b7ef81b431dec2b.tar.gz |
Merge pull request #45456 from Faless/js/4.x_styles
[HTML5] Better editor HTML, small refactor.
Diffstat (limited to 'platform/javascript/detect.py')
-rw-r--r-- | platform/javascript/detect.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 0d57f8aad1..76683da947 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -1,7 +1,14 @@ import os import sys -from emscripten_helpers import run_closure_compiler, create_engine_file, add_js_libraries, add_js_pre, add_js_externs +from emscripten_helpers import ( + run_closure_compiler, + create_engine_file, + add_js_libraries, + add_js_pre, + add_js_externs, + get_build_version, +) from methods import get_compiler_version from SCons.Util import WhereIs @@ -51,11 +58,13 @@ def get_flags(): def configure(env): if not isinstance(env["initial_memory"], int): - print("Initial memory must be a valid integer") - sys.exit(255) + try: + env["initial_memory"] = int(env["initial_memory"]) + except: + print("Initial memory must be a valid integer") + sys.exit(255) ## Build type - if env["target"] == "release": # Use -Os to prioritize optimizing for reduced file size. This is # particularly valuable for the web platform because it directly @@ -139,6 +148,9 @@ def configure(env): env.AddMethod(add_js_pre, "AddJSPre") env.AddMethod(add_js_externs, "AddJSExterns") + # Add method for getting build version string. + env.AddMethod(get_build_version, "GetBuildVersion") + # Add method that joins/compiles our Engine files. env.AddMethod(create_engine_file, "CreateEngineFile") |