diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2021-02-26 15:04:40 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2021-02-26 15:08:47 +0100 |
| commit | 4404eb57e447a5a177af86cfd7cf2607e682bf36 (patch) | |
| tree | 7b347f406b1504fa820078e92c3977ee14a4dea2 | |
| parent | d7e6c20c82df9179bc4e9b7706dc7a09ee554974 (diff) | |
[HTML5] Make editor HTML build tag scons4-proof.
We used to have it like `$GODOT_VERSION` which caused inconsistencies
between different scons versions when substituting it.
It's now `@GODOT_VERSION@`, which is safe on both scons3 and scons4.
| -rw-r--r-- | misc/dist/html/editor.html | 4 | ||||
| -rw-r--r-- | platform/javascript/SCsub | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/dist/html/editor.html b/misc/dist/html/editor.html index b0b906270b..535721f418 100644 --- a/misc/dist/html/editor.html +++ b/misc/dist/html/editor.html @@ -4,7 +4,7 @@ <meta charset='utf-8' /> <meta name='viewport' content='width=device-width, user-scalable=no' /> <link id='-gd-engine-icon' rel='icon' type='image/png' href='favicon.png' /> - <title>Godot Engine Web Editor ($GODOT_VERSION)</title> + <title>Godot Engine Web Editor (@GODOT_VERSION@)</title> <style> *:focus { /* More visible outline for better keyboard navigation. */ @@ -205,7 +205,7 @@ <br /> <img src="logo.svg" width="1024" height="414" style="width: auto; height: auto; max-width: 85%; max-height: 250px" /> <br /> - $GODOT_VERSION + @GODOT_VERSION@ <br /> <a href="releases/">Need an old version?</a> <br /> diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub index ab527ef419..e9ec531cc7 100644 --- a/platform/javascript/SCsub +++ b/platform/javascript/SCsub @@ -97,7 +97,7 @@ out_files = [ ] html_file = "#misc/dist/html/full-size.html" if env["tools"]: - subst_dict = {"\$GODOT_VERSION": env.GetBuildVersion()} + subst_dict = {"@GODOT_VERSION@": env.GetBuildVersion()} html_file = env.Substfile( target="#bin/godot${PROGSUFFIX}.html", source="#misc/dist/html/editor.html", SUBST_DICT=subst_dict ) |