From ea62a47c5642f92e91376694316928df52037a99 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Fri, 28 May 2021 10:50:39 +0300 Subject: Add missing wasm target build for windows and macOS hosts Based on wasm maintainer these should work already Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor (cherry picked from commit bae9580da1c35b47fc46e465b5b24c84737d073c) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_wasm.yaml | 23 ++++++++++++ coin/provisioning/common/windows/emsdk.ps1 | 47 +++++++++++-------------- 2 files changed, 44 insertions(+), 26 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 147fb301..0915bac5 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -10,3 +10,26 @@ Configurations: 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-windows-10-x86_64-52' + Target os: 'WebAssembly' + Compiler: 'Mingw' + Target compiler: 'Clang' + Platform dependency: 'Windows10-Mingw8-x64-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW810}}\bin;{{.Env.Path}}', + 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', + 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_pkg_config=OFF'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'WebAssembly' + Compiler: 'Clang' + Target compiler: 'Clang' + Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', + 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index 8c870049..992f569d 100644 --- a/coin/provisioning/common/windows/emsdk.ps1 +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -50,7 +50,7 @@ $urlCache = "http://ci-files01-hki.intra.qt.io/input/emsdk" $urlEmscriptenCache="$urlCache/emscripten.$version.zip" $urlWasmBinariesExternal="$urlEmscripten/win/$versionTag/wasm-binaries.zip" -$urlWasmBinariesCache="$urlCache\windows\wasm-binaries.$version.zip" +$urlWasmBinariesCache="$urlCache/windows/wasm-binaries.$version.zip" $sha1WasmBinaries="a6f3f49df50fe7c8a0e61065b80fd885b8266bf3" $urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip" @@ -65,12 +65,8 @@ $urlOfficialProtableJre = "$urlEmscripten/deps/portable_jre_${versionJre}_64bit. $urlCacheProtableJre = "$urlCache/windows/portable_jre_${versionJre}_64bit.zip" $sha1ProtableJre = "6830524ec8b16742f956897abb6b6f5ef890a1c2" -$urlOfficialEmscripten = "https://github.com/kripken/emscripten/archive/$version.zip" -$urlCacheEmscripten = "$urlCache/windows/emscripten-$version.zip" -$sha1Emscripten = "4f50327e1605e787669eb8c5e37733914e32d592" - $installLocationEmsdk = "C:\\Utils\\emsdk" -$temp = "C:\Windows\Temp" +$temp = "C:\\Windows\\Temp" function Install { @@ -94,29 +90,28 @@ Install $urlWasmBinariesExternal $urlWasmBinariesCache $sha1WasmBinaries "$temp\ Install $urlOfficialNode $urlCacheNode $sha1Node "$temp\node-v$versionNode-win-x64.zip" "$installLocationEmsdk" Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\python-$versionWinPython-embed-amd64-patched.zip" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched" Install $urlOfficialProtableJre $urlCacheProtableJre $sha1ProtableJre "$temp\portable_jre_$versionJre_64bit.zip" "$installLocationEmsdk" -Install $urlOfficialEmscripten $urlCacheEmscripten $sha1Emscripten "$temp\emscripten-$version.zip" "$installLocationEmsdk" - -cd $installLocationEmsdk -"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 - -Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk" -Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\bin" -Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\" + +cd $installLocationEmsdk\emscripten-llvm-e$version\install\emscripten +"emsdk_path = '$installLocationEmsdk'"| Out-File '.emscripten' -Append -Encoding ascii +"LLVM_ROOT = emsdk_path + '/emscripten-llvm-e$version/install/bin'" | Out-File '.emscripten' -Append -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 +'' " | 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 + +Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten" +Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten\.emscripten" +Set-EnvironmentVariable "EMSDK_CACHE" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten\cache" Set-EnvironmentVariable "EMSDK_NODE" "$installLocationEmsdk\node$versionNode-win-x64\bin\node.exe" Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched\python.exe" Set-EnvironmentVariable "EMSDK_JAVA_HOME" "$installLocationEmsdk\java64" -Set-EnvironmentVariable "EMSCRIPTEN" "$installLocationEmsdk\emscripten-$version" -Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten" -Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version\install\bin;$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched;$installLocationEmsdk\java64\bin" +Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version\install\bin;$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched;$installLocationEmsdk\java64\bin;$PATH" + +Add-Path "$env:EMSDK_PATH" Write-Output "emsdk = $version" >> ~/versions.txt Write-Output "emsdk llvm = $version" >> ~/versions.txt -- cgit v1.2.3