From 61dbe556a5c43044a65df745966236ba4ef11e18 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 11 Jul 2024 10:19:38 +0200 Subject: [PATCH 1/3] rename it back to WASI_SDK_PATH --- eng/native/gen-buildsys.cmd | 12 +++++----- eng/native/gen-buildsys.sh | 2 +- eng/testing/tests.wasi.targets | 4 ++-- src/libraries/sendtohelix-wasi.targets | 10 ++++---- src/libraries/sendtohelixhelp.proj | 2 +- src/mono/Directory.Build.props | 8 +++---- src/mono/mono.proj | 24 +++++++++---------- src/mono/wasi/Makefile | 8 +++---- src/mono/wasi/README.md | 4 ++-- .../wasi/Wasi.Build.Tests/BuildTestBase.cs | 4 ++-- .../wasi/Wasi.Build.Tests/SdkMissingTests.cs | 2 +- src/mono/wasi/build/WasiApp.targets | 6 ++--- src/mono/wasi/build/WasiSdk.Defaults.props | 10 ++++---- src/mono/wasi/wasi.proj | 18 +++++++------- .../Common/EnvironmentVariables.cs | 2 +- src/mono/wasm/build/WasmApp.LocalBuild.props | 4 ++-- .../wasm/data/aot-tests/Directory.Build.props | 2 +- src/native/libs/build-native.sh | 12 +++++----- 18 files changed, 67 insertions(+), 67 deletions(-) diff --git a/eng/native/gen-buildsys.cmd b/eng/native/gen-buildsys.cmd index 2f1ef10a51e405..6f243bd053afb1 100644 --- a/eng/native/gen-buildsys.cmd +++ b/eng/native/gen-buildsys.cmd @@ -61,19 +61,19 @@ if /i "%__Arch%" == "wasm" ( ) if /i "%__Os%" == "wasi" ( set "__repoRoot=!__repoRoot:\=/!" - if "%WASI_SDK22_PATH%" == "" ( + if "%WASI_SDK_PATH%" == "" ( if not exist "%__repoRoot%\src\mono\wasi\wasi-sdk" ( - echo Error: Should set WASI_SDK22_PATH environment variable pointing to WASI SDK root. + echo Error: Should set WASI_SDK_PATH environment variable pointing to WASI SDK root. exit /B 1 ) - set "WASI_SDK22_PATH=%__repoRoot%\src\mono\wasi\wasi-sdk" + set "WASI_SDK_PATH=%__repoRoot%\src\mono\wasi\wasi-sdk" ) :: replace backslash with forward slash and append last slash - set "WASI_SDK22_PATH=!WASI_SDK22_PATH:\=/!" - if not "!WASI_SDK22_PATH:~-1!" == "/" set "WASI_SDK22_PATH=!WASI_SDK22_PATH!/" + set "WASI_SDK_PATH=!WASI_SDK_PATH:\=/!" + if not "!WASI_SDK_PATH:~-1!" == "/" set "WASI_SDK_PATH=!WASI_SDK_PATH!/" set __CmakeGenerator=Ninja - set __ExtraCmakeParams=%__ExtraCmakeParams% -DCLR_CMAKE_TARGET_OS=wasi -DCLR_CMAKE_TARGET_ARCH=wasm "-DWASI_SDK_PREFIX=!WASI_SDK22_PATH!" "-DCMAKE_TOOLCHAIN_FILE=!WASI_SDK22_PATH!share/cmake/wasi-sdk.cmake" "-DCMAKE_SYSROOT=!WASI_SDK22_PATH!share/wasi-sysroot" + set __ExtraCmakeParams=%__ExtraCmakeParams% -DCLR_CMAKE_TARGET_OS=wasi -DCLR_CMAKE_TARGET_ARCH=wasm "-DWASI_SDK_PREFIX=!WASI_SDK_PATH!" "-DCMAKE_TOOLCHAIN_FILE=!WASI_SDK_PATH!share/cmake/wasi-sdk.cmake" "-DCMAKE_SYSROOT=!WASI_SDK_PATH!share/wasi-sysroot" ) ) else ( set __ExtraCmakeParams=%__ExtraCmakeParams% "-DCMAKE_SYSTEM_VERSION=10.0" diff --git a/eng/native/gen-buildsys.sh b/eng/native/gen-buildsys.sh index c4d79110b8c82c..91690a64837d49 100755 --- a/eng/native/gen-buildsys.sh +++ b/eng/native/gen-buildsys.sh @@ -98,7 +98,7 @@ if [[ "$host_arch" == "wasm" ]]; then if [[ "$target_os" == "browser" ]]; then cmake_command="emcmake $cmake_command" elif [[ "$target_os" == "wasi" ]]; then - cmake_extra_defines="$cmake_extra_defines -DCLR_CMAKE_TARGET_OS=wasi -DCLR_CMAKE_TARGET_ARCH=wasm -DWASI_SDK_PREFIX=$WASI_SDK22_PATH -DCMAKE_TOOLCHAIN_FILE=${WASI_SDK22_PATH}share/cmake/wasi-sdk.cmake" "-DCMAKE_SYSROOT=${WASI_SDK22_PATH}share/wasi-sysroot" + cmake_extra_defines="$cmake_extra_defines -DCLR_CMAKE_TARGET_OS=wasi -DCLR_CMAKE_TARGET_ARCH=wasm -DWASI_SDK_PREFIX=$WASI_SDK_PATH -DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_PATH}share/cmake/wasi-sdk.cmake" "-DCMAKE_SYSROOT=${WASI_SDK_PATH}share/wasi-sysroot" else echo "target_os was not specified" exit 1 diff --git a/eng/testing/tests.wasi.targets b/eng/testing/tests.wasi.targets index 4aa0b76692deee..803a89fd6caa31 100644 --- a/eng/testing/tests.wasi.targets +++ b/eng/testing/tests.wasi.targets @@ -13,8 +13,8 @@ >true - $([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasi', 'wasi-sdk')) - $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK22_PATH)').Replace('\', '/')) + $([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasi', 'wasi-sdk')) + $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) <_BundleAOTTestWasmAppForHelixDependsOn>$(_BundleAOTTestWasmAppForHelixDependsOn);PrepareForWasiBuildApp;_PrepareForAOTOnHelix diff --git a/src/libraries/sendtohelix-wasi.targets b/src/libraries/sendtohelix-wasi.targets index dff72dccfe9497..b4e27a3876f24e 100644 --- a/src/libraries/sendtohelix-wasi.targets +++ b/src/libraries/sendtohelix-wasi.targets @@ -46,8 +46,8 @@ false false - $([MSBuild]::NormalizeDirectory($(RepoRoot), 'src', 'mono', 'wasi', 'wasi-sdk')) - $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK22_PATH)').Replace('\', '/')) + $([MSBuild]::NormalizeDirectory($(RepoRoot), 'src', 'mono', 'wasi', 'wasi-sdk')) + $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasi', 'build')) $(HelixDependenciesStagingPath)$(WorkItemPrefix)wasi-sdk $(HelixDependenciesStagingPath)$(WorkItemPrefix)wasmtime @@ -64,7 +64,7 @@ - + @@ -93,8 +93,8 @@ - - + + diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 4d44b54312bcb5..3608f1cae63d0d 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -355,7 +355,7 @@ diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props index 5181dd77d674ec..4627d3f212b018 100644 --- a/src/mono/Directory.Build.props +++ b/src/mono/Directory.Build.props @@ -32,11 +32,11 @@ $(ProvisionEmscriptenDir.Replace('\', '/')) - + - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi', 'wasi-sdk')) - $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK22_PATH)').Replace('\', '/')) - true + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi', 'wasi-sdk')) + $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) + true diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 6166d92f8f4878..4726f3578ff010 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -125,7 +125,7 @@ - + @@ -302,7 +302,7 @@ JS_ENGINES = [NODE_JS] - + @@ -317,8 +317,8 @@ JS_ENGINES = [NODE_JS] https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion)/wasi-sdk-$(WasiSdkVersion).0.m-mingw.tar.gz - - + @@ -329,12 +329,12 @@ JS_ENGINES = [NODE_JS] [bug](https://github.com/bytecodealliance/wasm-component-ld/issues/22) which has been fixed in a v0.5.3 of that utility, so we upgrade it here. --> - - @@ -346,7 +346,7 @@ JS_ENGINES = [NODE_JS] - + @@ -356,7 +356,7 @@ JS_ENGINES = [NODE_JS] %(_ActualVersionLines.Identity) %(_ExpectedVersionLines.Identity) - @@ -738,14 +738,14 @@ JS_ENGINES = [NODE_JS] $([MSBuild]::EnsureTrailingSlash('$(EMSDK_PATH)').Replace('\', '/')) - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi', 'wasi-sdk')) - $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK22_PATH)').Replace('\', '/')) + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi', 'wasi-sdk')) + $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) <_EmsdkEnvScriptPath>$([MSBuild]::NormalizePath('$(EMSDK_PATH)', 'emsdk_env$(ScriptExt)')) <_MonoCMakeConfigureCommand>cmake @(_MonoCMakeArgs, ' ') $(MonoCMakeExtraArgs) "$(MonoProjectRoot.TrimEnd('\/'))" <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(TargetsWasi)' != 'true' and '$(_MonoSkipInitCompiler)' != 'true' and '$(HostOS)' != 'windows'">sh -c 'build_arch="$(_CompilerTargetArch)" compiler="$(MonoCCompiler)" . "$(RepositoryEngineeringCommonDir)native/init-compiler.sh" && @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand)' <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(TargetsWasi)' != 'true' and '$(_MonoSkipInitCompiler)' == 'true' and '$(HostOS)' != 'windows'">$(_MonoCCOption) $(_MonoCXXOption) @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand) - <_MonoCMakeConfigureCommand Condition="'$(TargetsWasi)' == 'true'">$(_MonoCMakeConfigureCommand) -DWASI_SDK_PREFIX=$(WASI_SDK22_PATH) -DCMAKE_SYSROOT=$(WASI_SDK22_PATH)share/wasi-sysroot -DCMAKE_TOOLCHAIN_FILE=$(WASI_SDK22_PATH)share/cmake/wasi-sdk.cmake -DCMAKE_CXX_FLAGS="--sysroot=$(WASI_SDK22_PATH)share/wasi-sysroot" + <_MonoCMakeConfigureCommand Condition="'$(TargetsWasi)' == 'true'">$(_MonoCMakeConfigureCommand) -DWASI_SDK_PREFIX=$(WASI_SDK_PATH) -DCMAKE_SYSROOT=$(WASI_SDK_PATH)share/wasi-sysroot -DCMAKE_TOOLCHAIN_FILE=$(WASI_SDK_PATH)share/cmake/wasi-sdk.cmake -DCMAKE_CXX_FLAGS="--sysroot=$(WASI_SDK_PATH)share/wasi-sysroot" <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' != 'true' and '$(TargetsWasi)' != 'true' and '$(HostOS)' == 'windows'">call "$(RepositoryEngineeringDir)native\init-vs-env.cmd" $(_CompilerTargetArch) && cd /D "$(MonoObjDir)" && @(_MonoBuildEnv, ' ') $(_MonoCMakeConfigureCommand) <_MonoCMakeConfigureCommand Condition="'$(TargetsBrowser)' == 'true' and '$(HostOS)' != 'windows'">bash -c 'source $(_EmsdkEnvScriptPath) 2>&1 && emcmake $(_MonoCMakeConfigureCommand)' @@ -941,7 +941,7 @@ JS_ENGINES = [NODE_JS] - + diff --git a/src/mono/wasi/build/WasiSdk.Defaults.props b/src/mono/wasi/build/WasiSdk.Defaults.props index 4958eae7c8fdb6..ccb122bc5a737f 100644 --- a/src/mono/wasi/build/WasiSdk.Defaults.props +++ b/src/mono/wasi/build/WasiSdk.Defaults.props @@ -1,12 +1,12 @@ - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', 'wasi-sdk')) - $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK22_PATH)').Replace('\', '/')) - $([MSBuild]::NormalizeDirectory($(WASI_SDK22_PATH), 'share', 'wasi-sysroot')) - $(WASI_SDK22_PATH)bin/clang + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', 'wasi-sdk')) + $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) + $([MSBuild]::NormalizeDirectory($(WASI_SDK_PATH), 'share', 'wasi-sysroot')) + $(WASI_SDK_PATH)bin/clang $(WasiClang).exe - $([MSBuild]::NormalizeDirectory($(WASI_SDK22_PATH), 'bin')) + $([MSBuild]::NormalizeDirectory($(WASI_SDK_PATH), 'bin')) diff --git a/src/mono/wasi/wasi.proj b/src/mono/wasi/wasi.proj index 7b50cd016833a3..bf4156c88e9920 100644 --- a/src/mono/wasi/wasi.proj +++ b/src/mono/wasi/wasi.proj @@ -19,18 +19,18 @@ <_WasiCompileRspPath>$(NativeBinDir)src\wasi-compile.rsp <_WasiLinkRspPath>$(NativeBinDir)src\wasi-link.rsp false - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi-sdk')) - $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK22_PATH)').Replace('\', '/')) - $(WASI_SDK22_PATH)bin/clang + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi-sdk')) + $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) + $(WASI_SDK_PATH)bin/clang $(WasiClang).exe - $(WASI_SDK22_PATH)bin/llvm-ar + $(WASI_SDK_PATH)bin/llvm-ar $(WasiLLVMAr).exe - + @@ -215,10 +215,10 @@ cmake $(MSBuildThisFileDirectory)runtime cmake -G Ninja $(MSBuildThisFileDirectory)runtime - $(CMakeBuildRuntimeConfigureCmd) --no-warn-unused-cli -DCMAKE_TOOLCHAIN_FILE="$([MSBuild]::NormalizePath('$(WASI_SDK22_PATH)', 'share/cmake/wasi-sdk.cmake'))" - $(CMakeBuildRuntimeConfigureCmd) -DWASI_SDK_PREFIX=$(WASI_SDK22_PATH) - $(CMakeBuildRuntimeConfigureCmd) -DCMAKE_SYSROOT=$(WASI_SDK22_PATH)share/wasi-sysroot - $(CMakeBuildRuntimeConfigureCmd) -DCMAKE_CXX_FLAGS="--sysroot=$(WASI_SDK22_PATH)share/wasi-sysroot" + $(CMakeBuildRuntimeConfigureCmd) --no-warn-unused-cli -DCMAKE_TOOLCHAIN_FILE="$([MSBuild]::NormalizePath('$(WASI_SDK_PATH)', 'share/cmake/wasi-sdk.cmake'))" + $(CMakeBuildRuntimeConfigureCmd) -DWASI_SDK_PREFIX=$(WASI_SDK_PATH) + $(CMakeBuildRuntimeConfigureCmd) -DCMAKE_SYSROOT=$(WASI_SDK_PATH)share/wasi-sysroot + $(CMakeBuildRuntimeConfigureCmd) -DCMAKE_CXX_FLAGS="--sysroot=$(WASI_SDK_PATH)share/wasi-sysroot" $(CMakeBuildRuntimeConfigureCmd) -DCONFIGURATION_WASICC_FLAGS="$(CMakeConfigurationWasiFlags)" $(CMakeBuildRuntimeConfigureCmd) -DCONFIGURATION_LINK_FLAGS="$(CMakeConfigurationLinkFlags)" diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/EnvironmentVariables.cs b/src/mono/wasm/Wasm.Build.Tests/Common/EnvironmentVariables.cs index 25d96339c8cb25..e2cf9b3dbf8b43 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/EnvironmentVariables.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/EnvironmentVariables.cs @@ -23,7 +23,7 @@ internal static class EnvironmentVariables internal static readonly bool ShowBuildOutput = IsRunningOnCI || Environment.GetEnvironmentVariable("SHOW_BUILD_OUTPUT") is not null; internal static readonly bool UseWebcil = Environment.GetEnvironmentVariable("USE_WEBCIL_FOR_TESTS") is "true"; internal static readonly string? SdkDirName = Environment.GetEnvironmentVariable("SDK_DIR_NAME"); - internal static readonly string? WasiSdkPath = Environment.GetEnvironmentVariable("WASI_SDK22_PATH"); + internal static readonly string? WasiSdkPath = Environment.GetEnvironmentVariable("WASI_SDK_PATH"); internal static readonly bool WorkloadsTestPreviousVersions = Environment.GetEnvironmentVariable("WORKLOADS_TEST_PREVIOUS_VERSIONS") is "true"; } } diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props index bfdbdce919f65e..e5b9f0e67b2c42 100644 --- a/src/mono/wasm/build/WasmApp.LocalBuild.props +++ b/src/mono/wasm/build/WasmApp.LocalBuild.props @@ -30,8 +30,8 @@ $(RuntimeSrcDir)\artifacts\bin\ $(RuntimeSrcDir)\src\mono\browser\emsdk\ - $([MSBuild]::NormalizeDirectory($(RuntimeSrcDir), 'src', 'mono', 'wasi', 'wasi-sdk')) - $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK22_PATH)').Replace('\', '/')) + $([MSBuild]::NormalizeDirectory($(RuntimeSrcDir), 'src', 'mono', 'wasi', 'wasi-sdk')) + $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $([MSBuild]::NormalizeDirectory($(ArtifactsBinDir), 'microsoft.netcore.app.runtime.$(RuntimeIdentifier)', $(RuntimeConfig))) diff --git a/src/mono/wasm/data/aot-tests/Directory.Build.props b/src/mono/wasm/data/aot-tests/Directory.Build.props index 4f6672b647b7df..c52f8028de5b12 100644 --- a/src/mono/wasm/data/aot-tests/Directory.Build.props +++ b/src/mono/wasm/data/aot-tests/Directory.Build.props @@ -10,7 +10,7 @@ <_WasmTargetsDir>$(WasmBuildSupportDir)\wasm\ <_WasmSharedDir>$(WasmBuildSupportDir)\wasm-shared\ $(WasmBuildSupportDir)\emsdk\ - $(WasmBuildSupportDir)\wasi-sdk\ + $(WasmBuildSupportDir)\wasi-sdk\ diff --git a/src/native/libs/build-native.sh b/src/native/libs/build-native.sh index bda22dc50d63fb..6e7deeb99b3dbc 100755 --- a/src/native/libs/build-native.sh +++ b/src/native/libs/build-native.sh @@ -65,18 +65,18 @@ if [[ "$__TargetOS" == browser ]]; then source "$EMSDK_PATH"/emsdk_env.sh export CLR_CC=$(which emcc) elif [[ "$__TargetOS" == wasi ]]; then - if [[ -z "$WASI_SDK22_PATH" ]]; then + if [[ -z "$WASI_SDK_PATH" ]]; then if [[ -d "$__RepoRootDir"/src/mono/wasi/wasi-sdk ]]; then - export WASI_SDK22_PATH="$__RepoRootDir"/src/mono/wasi/wasi-sdk + export WASI_SDK_PATH="$__RepoRootDir"/src/mono/wasi/wasi-sdk else - echo "Error: You need to set the WASI_SDK22_PATH environment variable pointing to the WASI SDK root." + echo "Error: You need to set the WASI_SDK_PATH environment variable pointing to the WASI SDK root." exit 1 fi fi - export WASI_SDK22_PATH="${WASI_SDK22_PATH%/}/" - export CLR_CC="$WASI_SDK22_PATH"bin/clang + export WASI_SDK_PATH="${WASI_SDK_PATH%/}/" + export CLR_CC="$WASI_SDK_PATH"bin/clang export TARGET_BUILD_ARCH=wasm - __CMakeArgs="-DCLR_CMAKE_TARGET_OS=wasi -DCLR_CMAKE_TARGET_ARCH=wasm -DWASI_SDK_PREFIX=$WASI_SDK22_PATH -DCMAKE_TOOLCHAIN_FILE=${WASI_SDK22_PATH}share/cmake/wasi-sdk.cmake $__CMakeArgs" + __CMakeArgs="-DCLR_CMAKE_TARGET_OS=wasi -DCLR_CMAKE_TARGET_ARCH=wasm -DWASI_SDK_PREFIX=$WASI_SDK_PATH -DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_PATH}share/cmake/wasi-sdk.cmake $__CMakeArgs" elif [[ "$__TargetOS" == ios || "$__TargetOS" == iossimulator ]]; then # nothing to do here true From 018a223b3260c162dd78285b62079d13b70d438a Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 11 Jul 2024 13:43:11 +0200 Subject: [PATCH 2/3] better detection of old version --- eng/testing/tests.wasi.targets | 2 +- src/libraries/sendtohelix-wasi.targets | 2 +- src/mono/Directory.Build.props | 4 ++-- src/mono/mono.proj | 2 -- src/mono/wasi/build/WasiApp.targets | 2 +- src/mono/wasi/build/WasiSdk.Defaults.props | 2 +- src/mono/wasi/wasi.proj | 4 ++-- src/mono/wasm/build/WasmApp.LocalBuild.props | 2 +- src/mono/wasm/data/aot-tests/Directory.Build.props | 2 +- 9 files changed, 10 insertions(+), 12 deletions(-) diff --git a/eng/testing/tests.wasi.targets b/eng/testing/tests.wasi.targets index 803a89fd6caa31..b31bd7dfaa2992 100644 --- a/eng/testing/tests.wasi.targets +++ b/eng/testing/tests.wasi.targets @@ -13,7 +13,7 @@ >true - $([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasi', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasi', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) <_BundleAOTTestWasmAppForHelixDependsOn>$(_BundleAOTTestWasmAppForHelixDependsOn);PrepareForWasiBuildApp;_PrepareForAOTOnHelix diff --git a/src/libraries/sendtohelix-wasi.targets b/src/libraries/sendtohelix-wasi.targets index b4e27a3876f24e..158b09562da7b3 100644 --- a/src/libraries/sendtohelix-wasi.targets +++ b/src/libraries/sendtohelix-wasi.targets @@ -46,7 +46,7 @@ false false - $([MSBuild]::NormalizeDirectory($(RepoRoot), 'src', 'mono', 'wasi', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(RepoRoot), 'src', 'mono', 'wasi', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasi', 'build')) $(HelixDependenciesStagingPath)$(WorkItemPrefix)wasi-sdk diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props index 4627d3f212b018..5d08d5d579b9af 100644 --- a/src/mono/Directory.Build.props +++ b/src/mono/Directory.Build.props @@ -34,9 +34,9 @@ - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) - true + true diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 4726f3578ff010..93abd7cf5bee08 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -738,8 +738,6 @@ JS_ENGINES = [NODE_JS] $([MSBuild]::EnsureTrailingSlash('$(EMSDK_PATH)').Replace('\', '/')) - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi', 'wasi-sdk')) - $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) <_EmsdkEnvScriptPath>$([MSBuild]::NormalizePath('$(EMSDK_PATH)', 'emsdk_env$(ScriptExt)')) <_MonoCMakeConfigureCommand>cmake @(_MonoCMakeArgs, ' ') $(MonoCMakeExtraArgs) "$(MonoProjectRoot.TrimEnd('\/'))" diff --git a/src/mono/wasi/build/WasiApp.targets b/src/mono/wasi/build/WasiApp.targets index c886a9ad2da259..35869e10c95d85 100644 --- a/src/mono/wasi/build/WasiApp.targets +++ b/src/mono/wasi/build/WasiApp.targets @@ -101,7 +101,7 @@ - <_ToolchainMissingErrorMessage Condition="'$(WASI_SDK_PATH)' == ''">Could not find wasi-sdk. Install wasi-sdk and set %24(WASI_SDK_PATH) . It can be obtained from https://github.com/WebAssembly/wasi-sdk/releases + <_ToolchainMissingErrorMessage Condition="'$(WASI_SDK_PATH)' == '' or !Exists($(WASI_SDK_PATH)/VERSION)">Could not find wasi-sdk. Install wasi-sdk and set %24(WASI_SDK_PATH) . It can be obtained from https://github.com/WebAssembly/wasi-sdk/releases <_ToolchainMissingErrorMessage Condition="'$(_ToolchainMissingErrorMessage)' == '' and '$(_ToolchainMissingPaths)' != ''">Using WASI_SDK_PATH=$(WASI_SDK_PATH), cannot find $(_ToolchainMissingPaths) . <_IsToolchainMissing Condition="'$(_ToolchainMissingErrorMessage)' != ''">true diff --git a/src/mono/wasi/build/WasiSdk.Defaults.props b/src/mono/wasi/build/WasiSdk.Defaults.props index ccb122bc5a737f..bff20eec0a27a6 100644 --- a/src/mono/wasi/build/WasiSdk.Defaults.props +++ b/src/mono/wasi/build/WasiSdk.Defaults.props @@ -1,6 +1,6 @@ - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $([MSBuild]::NormalizeDirectory($(WASI_SDK_PATH), 'share', 'wasi-sysroot')) $(WASI_SDK_PATH)bin/clang diff --git a/src/mono/wasi/wasi.proj b/src/mono/wasi/wasi.proj index bf4156c88e9920..65595ef1ffe890 100644 --- a/src/mono/wasi/wasi.proj +++ b/src/mono/wasi/wasi.proj @@ -19,7 +19,7 @@ <_WasiCompileRspPath>$(NativeBinDir)src\wasi-compile.rsp <_WasiLinkRspPath>$(NativeBinDir)src\wasi-link.rsp false - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $(WASI_SDK_PATH)bin/clang $(WasiClang).exe @@ -30,7 +30,7 @@ - + diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props index e5b9f0e67b2c42..7014b00ad5825b 100644 --- a/src/mono/wasm/build/WasmApp.LocalBuild.props +++ b/src/mono/wasm/build/WasmApp.LocalBuild.props @@ -30,7 +30,7 @@ $(RuntimeSrcDir)\artifacts\bin\ $(RuntimeSrcDir)\src\mono\browser\emsdk\ - $([MSBuild]::NormalizeDirectory($(RuntimeSrcDir), 'src', 'mono', 'wasi', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(RuntimeSrcDir), 'src', 'mono', 'wasi', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $([MSBuild]::NormalizeDirectory($(ArtifactsBinDir), 'microsoft.netcore.app.runtime.$(RuntimeIdentifier)', $(RuntimeConfig))) diff --git a/src/mono/wasm/data/aot-tests/Directory.Build.props b/src/mono/wasm/data/aot-tests/Directory.Build.props index c52f8028de5b12..47c48f3b7e4a23 100644 --- a/src/mono/wasm/data/aot-tests/Directory.Build.props +++ b/src/mono/wasm/data/aot-tests/Directory.Build.props @@ -10,7 +10,7 @@ <_WasmTargetsDir>$(WasmBuildSupportDir)\wasm\ <_WasmSharedDir>$(WasmBuildSupportDir)\wasm-shared\ $(WasmBuildSupportDir)\emsdk\ - $(WasmBuildSupportDir)\wasi-sdk\ + $(WasmBuildSupportDir)/wasi-sdk/ From 4ea7e1dab3e2d8e381fcdf745c27025374f5fcdd Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 11 Jul 2024 14:40:27 +0200 Subject: [PATCH 3/3] fix --- eng/testing/tests.wasi.targets | 2 +- src/libraries/sendtohelix-wasi.targets | 2 +- src/mono/Directory.Build.props | 4 ++-- src/mono/wasi/build/WasiApp.targets | 2 +- src/mono/wasi/build/WasiSdk.Defaults.props | 2 +- src/mono/wasi/wasi.proj | 4 ++-- src/mono/wasm/build/WasmApp.LocalBuild.props | 2 +- src/mono/wasm/data/aot-tests/Directory.Build.props | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/testing/tests.wasi.targets b/eng/testing/tests.wasi.targets index b31bd7dfaa2992..17fc47b5087fbe 100644 --- a/eng/testing/tests.wasi.targets +++ b/eng/testing/tests.wasi.targets @@ -13,7 +13,7 @@ >true - $([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasi', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasi', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) <_BundleAOTTestWasmAppForHelixDependsOn>$(_BundleAOTTestWasmAppForHelixDependsOn);PrepareForWasiBuildApp;_PrepareForAOTOnHelix diff --git a/src/libraries/sendtohelix-wasi.targets b/src/libraries/sendtohelix-wasi.targets index 158b09562da7b3..5382266664af81 100644 --- a/src/libraries/sendtohelix-wasi.targets +++ b/src/libraries/sendtohelix-wasi.targets @@ -46,7 +46,7 @@ false false - $([MSBuild]::NormalizeDirectory($(RepoRoot), 'src', 'mono', 'wasi', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(RepoRoot), 'src', 'mono', 'wasi', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasi', 'build')) $(HelixDependenciesStagingPath)$(WorkItemPrefix)wasi-sdk diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props index 5d08d5d579b9af..64b6d0288a6795 100644 --- a/src/mono/Directory.Build.props +++ b/src/mono/Directory.Build.props @@ -34,9 +34,9 @@ - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) - true + true diff --git a/src/mono/wasi/build/WasiApp.targets b/src/mono/wasi/build/WasiApp.targets index 35869e10c95d85..b0e3e047eac201 100644 --- a/src/mono/wasi/build/WasiApp.targets +++ b/src/mono/wasi/build/WasiApp.targets @@ -101,7 +101,7 @@ - <_ToolchainMissingErrorMessage Condition="'$(WASI_SDK_PATH)' == '' or !Exists($(WASI_SDK_PATH)/VERSION)">Could not find wasi-sdk. Install wasi-sdk and set %24(WASI_SDK_PATH) . It can be obtained from https://github.com/WebAssembly/wasi-sdk/releases + <_ToolchainMissingErrorMessage Condition="'$(WASI_SDK_PATH)' == '' or !Exists('$(WASI_SDK_PATH)/VERSION')">Could not find wasi-sdk. Install wasi-sdk and set %24(WASI_SDK_PATH) . It can be obtained from https://github.com/WebAssembly/wasi-sdk/releases <_ToolchainMissingErrorMessage Condition="'$(_ToolchainMissingErrorMessage)' == '' and '$(_ToolchainMissingPaths)' != ''">Using WASI_SDK_PATH=$(WASI_SDK_PATH), cannot find $(_ToolchainMissingPaths) . <_IsToolchainMissing Condition="'$(_ToolchainMissingErrorMessage)' != ''">true diff --git a/src/mono/wasi/build/WasiSdk.Defaults.props b/src/mono/wasi/build/WasiSdk.Defaults.props index bff20eec0a27a6..217cf5726cdcf4 100644 --- a/src/mono/wasi/build/WasiSdk.Defaults.props +++ b/src/mono/wasi/build/WasiSdk.Defaults.props @@ -1,6 +1,6 @@ - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $([MSBuild]::NormalizeDirectory($(WASI_SDK_PATH), 'share', 'wasi-sysroot')) $(WASI_SDK_PATH)bin/clang diff --git a/src/mono/wasi/wasi.proj b/src/mono/wasi/wasi.proj index 65595ef1ffe890..7038b1a4136df5 100644 --- a/src/mono/wasi/wasi.proj +++ b/src/mono/wasi/wasi.proj @@ -19,7 +19,7 @@ <_WasiCompileRspPath>$(NativeBinDir)src\wasi-compile.rsp <_WasiLinkRspPath>$(NativeBinDir)src\wasi-link.rsp false - $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $(WASI_SDK_PATH)bin/clang $(WasiClang).exe @@ -30,7 +30,7 @@ - + diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props index 7014b00ad5825b..dc9b562089a3a9 100644 --- a/src/mono/wasm/build/WasmApp.LocalBuild.props +++ b/src/mono/wasm/build/WasmApp.LocalBuild.props @@ -30,7 +30,7 @@ $(RuntimeSrcDir)\artifacts\bin\ $(RuntimeSrcDir)\src\mono\browser\emsdk\ - $([MSBuild]::NormalizeDirectory($(RuntimeSrcDir), 'src', 'mono', 'wasi', 'wasi-sdk')) + $([MSBuild]::NormalizeDirectory($(RuntimeSrcDir), 'src', 'mono', 'wasi', 'wasi-sdk')) $([MSBuild]::EnsureTrailingSlash('$(WASI_SDK_PATH)').Replace('\', '/')) $([MSBuild]::NormalizeDirectory($(ArtifactsBinDir), 'microsoft.netcore.app.runtime.$(RuntimeIdentifier)', $(RuntimeConfig))) diff --git a/src/mono/wasm/data/aot-tests/Directory.Build.props b/src/mono/wasm/data/aot-tests/Directory.Build.props index 47c48f3b7e4a23..22b1a645d0895a 100644 --- a/src/mono/wasm/data/aot-tests/Directory.Build.props +++ b/src/mono/wasm/data/aot-tests/Directory.Build.props @@ -10,7 +10,7 @@ <_WasmTargetsDir>$(WasmBuildSupportDir)\wasm\ <_WasmSharedDir>$(WasmBuildSupportDir)\wasm-shared\ $(WasmBuildSupportDir)\emsdk\ - $(WasmBuildSupportDir)/wasi-sdk/ + $(WasmBuildSupportDir)/wasi-sdk/