diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-02-26 17:10:17 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-05-19 19:14:15 +0200 |
| commit | 43f3795125b3d1e72d0be6a30118954db9c35296 (patch) | |
| tree | c1f72cdbadd465c7ccc5a77c05ea1bd240d71940 /coin | |
| parent | a79dc991e049314df6059b2ea3c22a5c950290e0 (diff) | |
wasm: Add WebAssembly platform to Coin
Change-Id: Ia377ad7ff8a675e80ead78eaf47848cc0f235247
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 2 | ||||
| -rw-r--r-- | coin/platform_configs/cmake_platforms_wasm.yaml | 11 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/emsdk.sh | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/emsdk.ps1 | 1 |
4 files changed, 14 insertions, 2 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 3f5d4c27..dff00ce7 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -4,6 +4,7 @@ Include: [ cmake_platforms_target_android_host_linux.yaml, cmake_platforms_target_android_host_macos.yaml, cmake_platforms_target_android_host_windows.yaml, + cmake_platforms_wasm.yaml, macos.yaml ] Configurations: @@ -46,6 +47,7 @@ Configurations: Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - + Id: 'OpenSUSE-15.2-host' Template: 'qtci-linux-openSUSE-15.2-x86_64-50' Compiler: 'GCC' Features: ['Sccache'] diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml new file mode 100644 index 00000000..43edacb0 --- /dev/null +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -0,0 +1,11 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-openSUSE-15.2-x86_64-50' + Target os: 'WebAssembly' + Compiler: 'GCC' + Platform dependency: 'OpenSUSE-15.2-host' + Features: ['Packaging', 'DisableTests'] + Environment variables: [ + 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten'] diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index e224c429..f75dfa70 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -91,7 +91,7 @@ EOM SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" -SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" SetEnvVar "EMSDK" "$targetFolder" +SetEnvVar "EMSDK_NODE" "$targetFolder/$pathNodeExecutable" echo "Emsdk = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index dc560594..8c870049 100644 --- a/coin/provisioning/common/windows/emsdk.ps1 +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -109,7 +109,6 @@ cd $installLocationEmsdk "JS_ENGINES = [NODE_JS]" | Out-File '.emscripten' -Append -Encoding ASCII Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk" -Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\.emscripten" Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\bin" Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\" Set-EnvironmentVariable "EMSDK_NODE" "$installLocationEmsdk\node$versionNode-win-x64\bin\node.exe" |