lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

provisioning: Make generated .emscripten look more natural

Browse Source 
The WASM CMake port of Qt reads .emscripten and parses its content to
locate the emscripten root. We must bring our generated .emscripten
closer to what emsdk generates to prevent the parser from choking.

Change-Id: I5d17fb7679627ab3a7145f539f5a911fd227a6ac
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
This commit is contained in:
Joerg Bornemann
2021-03-24 11:17:53 +01:00
parent 3e2ba4d7bf
commit cdc79cdfb9
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coin/provisioning/common/unix/emsdk.sh
View File

@@ -81,10 +81,11 @@ sudo chmod -R a+rwx "$targetFolder"
echo "Writing $targetFolder/.emscripten"
cat <<EOM >"$targetFolder/.emscripten"
EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
LLVM_ROOT='$targetFolder/install/bin'
BINARYEN_ROOT='$targetFolder/install'
NODE_JS='$targetFolder/$pathNodeExecutable'
emsdk_path = '$targetFolder'
EMSCRIPTEN_ROOT = emsdk_path + '/emscripten-$version'
LLVM_ROOT = emsdk_path + '/install/bin'
BINARYEN_ROOT = emsdk_path + '/install'
NODE_JS = emsdk_path + '/$pathNodeExecutable'
TEMP_DIR = '/tmp'
EOM

13
coin/provisioning/common/windows/emsdk.ps1
View File

@@ -97,12 +97,13 @@ Install $urlOfficialProtableJre $urlCacheProtableJre $sha1ProtableJre "$temp\por
Install $urlOfficialEmscripten $urlCacheEmscripten $sha1Emscripten "$temp\emscripten-$version.zip" "$installLocationEmsdk"
cd $installLocationEmsdk
"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\bin'" | Out-File '.emscripten' -Encoding ASCII
"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install'" | Out-File '.emscripten' -Append -Encoding ASCII
"PYTHON='$installLocationEmsdk\\python-$versionWinPython-embed-amd64-patched\\python.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
"EMSCRIPTEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\emscripten'" | Out-File '.emscripten' -Append -Encoding ASCII
"JAVA='$installLocationEmsdk\\Java64'" | Out-File '.emscripten' -Append -Encoding ASCII
"emsdk_path = '$installLocationEmsdk'" | Out-File '.emscripten' -Encoding ASCII
"LLVM_ROOT = emsdk_path + '\\emscripten-llvm-e$version\\install\\bin'" | Out-File '.emscripten' -Encoding ASCII
"BINARYEN_ROOT = emsdk_path + '\\emscripten-llvm-e$version\\install'" | Out-File '.emscripten' -Append -Encoding ASCII
"PYTHON = emsdk_path + '\\python-$versionWinPython-embed-amd64-patched\\python.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
"NODE_JS = emsdk_path + '\\node-v$versionNode-win-x64\\bin\\node.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
"EMSCRIPTEN_ROOT = emsdk_path + '\\emscripten-llvm-e$version\\install\\emscripten'" | Out-File '.emscripten' -Append -Encoding ASCII
"JAVA = emsdk_path + '\\Java64'" | Out-File '.emscripten' -Append -Encoding ASCII
"TEMP_DIR = '/tmp'" | Out-File '.emscripten' -Append -Encoding ASCII
"COMPILER_ENGINE = NODE_JS" | Out-File '.emscripten' -Append -Encoding ASCII
"JS_ENGINES = [NODE_JS]" | Out-File '.emscripten' -Append -Encoding ASCII