[[ Emscripten ]] Re-name the emscripten standalone engine to include the version

livecodefraser · livecodefraser · commit f2538779f7f0 · 2015-08-24T13:23:21.000+01:00
diff --git a/common.gypi b/common.gypi
@@ -10,6 +10,7 @@
 		'config/perl.gypi',
 		'config/target_os.gypi',
 		'config/thirdparty.gypi',
+		'config/version.gypi',
 		'config/yacc.gypi',
 	],
 }
diff --git a/config/version.gypi b/config/version.gypi
@@ -0,0 +1,13 @@
+{
+	'variables':
+	{
+		'version_major': "<!(perl -n -e '/^BUILD_MAJOR_VERSION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
+		'version_minor': "<!(perl -n -e '/^BUILD_MINOR_VERSION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
+		'version_point': "<!(perl -n -e '/^BUILD_POINT_VERSION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
+		'version_build': "<!(perl -n -e '/^BUILD_REVISION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
+	
+		'version_string': "<!(perl -n -e '/^BUILD_SHORT_VERSION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
+
+		'git_revision': '<!(git rev-parse HEAD)',
+	},
+}
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -771,6 +771,11 @@
 							'standalone',
 						],
 
+						'variables':
+						{
+							'version_suffix': '<(version_string)',
+						},
+
 						'actions':
 						[
 							{
@@ -793,16 +798,16 @@
 
 								'outputs':
 								[
-									'<(PRODUCT_DIR)/standalone-community.js',
-									'<(PRODUCT_DIR)/standalone-community.html',
-									'<(PRODUCT_DIR)/standalone-community.html.mem',
+									'<(PRODUCT_DIR)/standalone-community-<(version_suffix).js',
+									'<(PRODUCT_DIR)/standalone-community-<(version_suffix).html',
+									'<(PRODUCT_DIR)/standalone-community-<(version_suffix).html.mem',
 								],
 
 								'action':
 								[
 									'./emscripten-javascriptify.sh',
 									'<(PRODUCT_DIR)/standalone-community.bc',
-									'<(PRODUCT_DIR)/standalone-community.html',
+									'<(PRODUCT_DIR)/standalone-community-<(version_suffix).html',
 									'src/em-exported.json',
 									'src/em-whitelist.json',
 									'src/em-preamble.js',
diff --git a/ide-support/revsaveasemscriptenstandalone.livecodescript b/ide-support/revsaveasemscriptenstandalone.livecodescript
@@ -183,10 +183,10 @@ private function getEngineFiles
    local tFiles
    
    -- Engine JavaScript
-   put mapPath("standalone-" & revLicenseType() & ".js") into tFiles[1]
+   put mapPath("standalone-" & revLicenseType() & "-" & the version & ".js") into tFiles[1]
    
    -- Memory initialisation file
-   put mapPath("standalone-" & revLicenseType() & ".html.mem") into tFiles[2]
+   put mapPath("standalone-" & revLicenseType() & "-" & the version & ".html.mem") into tFiles[2]
    
    return tFiles
 end getEngineFiles

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`'config/perl.gypi',`
`11`	`11`	`'config/target_os.gypi',`
`12`	`12`	`'config/thirdparty.gypi',`
	`13`	`+ 'config/version.gypi',`
`13`	`14`	`'config/yacc.gypi',`
`14`	`15`	`],`
`15`	`16`	`}`