Commit: d1b4b10e2ff4f1a69c9d3716e225f83a02295338 - Fs-scripts (git)

Commit MetaInfo

• Revision: d1b4b10e2ff4f1a69c9d3716e225f83a02295338 (tree)
• Time: 2022-08-21 15:54:15
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

workaround emsdk version on windows / add failed script

Change Summary

• modified: Compile/lib/CompilerVer.lua

Incremental Difference

--- a/Compile/lib/CompilerVer.lua
+++ b/Compile/lib/CompilerVer.lua
@@ -15,6 +15,8 @@ local runCmdScript = function(script)
 		local resFile = io.open(fileName2, "r")
 		ret = resFile:read()
 		resFile:close()
+	else
+		io.stderr:write("[CompilerVer.lua][runCmdScript] Following script fails to run:\n" .. script .. "\n")
 	end
 	
 	os.remove(fileName .. ".cmd")
@@ -45,6 +47,8 @@ local runShScript = function(script)
 		local resFile = io.open(fileName2, "r")
 		ret = resFile:read()
 		resFile:close()
+	else
+		io.stderr:write("[CompilerVer.lua][runShScript] Following script fails to run:\n" .. script .. "\n")
 	end
 	
 	os.remove(fileName)
@@ -116,6 +120,12 @@ compilerVer.emcc = function(isWin, path)
 	else
 		ret = runShScript(script)
 	end
+	
+	if not ret then
+		-- workaround: emsdk 1.39.8 don't set path of python
+		io.stderr:write("[CompilerVer.lua][compilerVer.emcc] workaround emsdk version\n")
+		ret = "1.39.8"
+	end
 
 	return parseVersionNum(ret)
 end