diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index 89d418ea..e224c429 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -81,10 +81,11 @@ sudo chmod -R a+rwx "$targetFolder" echo "Writing $targetFolder/.emscripten" cat <"$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 diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index f8ba524a..dc560594 100644 --- a/coin/provisioning/common/windows/emsdk.ps1 +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -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