asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[HTML5] Make editor HTML build tag scons4-proof.

Browse source 
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.

(cherry picked from commit 4404eb57e4)
This commit is contained in:
Fabio Alessandrelli 2021-02-26 15:04:40 +01:00 committed by Rémi Verschelde
parent 6f77f1bb3e
commit e3664e971b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
misc/dist/html/editor.html vendored
View file

@ -4,7 +4,7 @@
<meta charset='utf-8' /> <meta charset='utf-8' />
<meta name='viewport' content='width=device-width, user-scalable=no' /> <meta name='viewport' content='width=device-width, user-scalable=no' />
<link id='-gd-engine-icon' rel='icon' type='image/png' href='favicon.png' /> <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> <style>
*:focus { *:focus {
/* More visible outline for better keyboard navigation. */ /* More visible outline for better keyboard navigation. */
@ -205,7 +205,7 @@
<br /> <br />
<img src="logo.svg" width="1024" height="414" style="width: auto; height: auto; max-width: 85%; max-height: 250px" /> <img src="logo.svg" width="1024" height="414" style="width: auto; height: auto; max-width: 85%; max-height: 250px" />
<br /> <br />
$GODOT_VERSION @GODOT_VERSION@
<br /> <br />
<a href="releases/">Need an old version?</a> <a href="releases/">Need an old version?</a>
<br /> <br />

2
platform/javascript/SCsub
View file

@ -96,7 +96,7 @@ out_files = [
] ]
html_file = "#misc/dist/html/full-size.html" html_file = "#misc/dist/html/full-size.html"
if env["tools"]: if env["tools"]:
subst_dict = {"\$GODOT_VERSION": env.GetBuildVersion()} subst_dict = {"@GODOT_VERSION@": env.GetBuildVersion()}
html_file = env.Substfile( html_file = env.Substfile(
target="#bin/godot${PROGSUFFIX}.html", source="#misc/dist/html/editor.html", SUBST_DICT=subst_dict target="#bin/godot${PROGSUFFIX}.html", source="#misc/dist/html/editor.html", SUBST_DICT=subst_dict
) )