|
59 | 59 | --> |
60 | 60 | <_BuildNativeCompilerArg Condition="'$(BuildNativeCompiler)' != ''"> $(BuildNativeCompiler)</_BuildNativeCompilerArg> |
61 | 61 | <_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessorCountArg)$(_PortableBuildArg)$(_CrossBuildArg)$(_BuildNativeCompilerArg)$(_KeepNativeSymbolsBuildArg)$(_CMakeArgs) $(Compiler)</_BuildNativeUnixArgs> |
62 | | - <_BuildNativePreSource Condition="'$(TargetsBrowser)' == 'true'">source "$(RepoRoot)src/mono/browser/emsdk/emsdk_env.sh" && </_BuildNativePreSource> |
| 62 | + <_BuildNativeBuildCommand>"$(MSBuildThisFileDirectory)build-native.sh" $(_BuildNativeUnixArgs)</_BuildNativeBuildCommand> |
| 63 | + <_BuildNativeBuildCommand Condition="'$(TargetsBrowser)' == 'true'">bash -c 'source "$(RepoRoot)src/mono/browser/emsdk/emsdk_env.sh" && $(_BuildNativeBuildCommand)'</_BuildNativeBuildCommand> |
63 | 64 | </PropertyGroup> |
64 | 65 |
|
65 | 66 | <ItemGroup> |
|
73 | 74 | <Copy SourceFiles="@(_IcuArtifacts)" DestinationFolder="$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(_BuildNativeOutConfig)'))" SkipUnchangedFiles="true" /> |
74 | 75 |
|
75 | 76 | <!-- Use IgnoreStandardErrorWarningFormat because Arcade sets WarnAsError and we want to avoid upgrading compiler warnings to error in release branches --> |
76 | | - <Message Text="$(_BuildNativePreSource)"$(MSBuildThisFileDirectory)build-native.sh" $(_BuildNativeUnixArgs)" Importance="High"/> |
77 | | - <Exec Command="$(_BuildNativePreSource)"$(MSBuildThisFileDirectory)build-native.sh" $(_BuildNativeUnixArgs)" EnvironmentVariables="$(_BuildNativeEnvironmentVariables)" IgnoreStandardErrorWarningFormat="true" /> |
| 77 | + <Message Text="$(_BuildNativeBuildCommand)" Importance="High"/> |
| 78 | + <Exec Command="$(_BuildNativeBuildCommand)" EnvironmentVariables="$(_BuildNativeEnvironmentVariables)" IgnoreStandardErrorWarningFormat="true" /> |
78 | 79 | </Target> |
79 | 80 |
|
80 | 81 | <!-- |
|
102 | 103 | <_MonoWasmMTCMakeArgs Condition="'$(WasmEnableThreads)' == 'true'">-DMONO_WASM_MT=1</_MonoWasmMTCMakeArgs> |
103 | 104 | <_MonoWasmMTCMakeArgs Condition="'$(CMakeArgs)' != ''"> $(_MonoWasmMTCMakeArgs)</_MonoWasmMTCMakeArgs> |
104 | 105 | <_BuildNativeArgs Condition="'$(CMakeArgs)' != '' or '$(_MonoWasmMTCMakeArgs)' != ''">$(_BuildNativeArgs) -cmakeargs "$(CMakeArgs)$(_MonoWasmMTCMakeArgs)"</_BuildNativeArgs> |
105 | | - <_BuildNativePreSource Condition="'$(TargetsBrowser)' == 'true'">call "$([MSBuild]::NormalizePath('$(RepoRoot)src/mono/browser/emsdk', 'emsdk_env.cmd'))" && </_BuildNativePreSource> |
| 106 | + <_BuildNativeBuildCommand>"$(MSBuildThisFileDirectory)build-native.cmd" $(_BuildNativeArgs)</_BuildNativeBuildCommand> |
| 107 | + <_BuildNativeBuildCommand Condition="'$(TargetsBrowser)' == 'true'">call "$([MSBuild]::NormalizePath('$(RepoRoot)src/mono/browser/emsdk', 'emsdk_env.cmd'))" && $(_BuildNativeBuildCommand)</_BuildNativeBuildCommand> |
106 | 108 | </PropertyGroup> |
107 | 109 | <!-- Run script that uses CMake to generate and build the native files. --> |
108 | 110 | <!-- Use IgnoreStandardErrorWarningFormat because Arcade sets WarnAsError and we want to avoid upgrading compiler warnings to errors in release branches --> |
109 | | - <Message Text="$(_BuildNativePreSource)"$(MSBuildThisFileDirectory)build-native.cmd" $(_BuildNativeArgs)" Importance="High"/> |
110 | | - <Exec Command="$(_BuildNativePreSource)"$(MSBuildThisFileDirectory)build-native.cmd" $(_BuildNativeArgs)" EnvironmentVariables="$(_BuildNativeEnvironmentVariables)" IgnoreStandardErrorWarningFormat="true" /> |
| 111 | + <Message Text="$(_BuildNativeBuildCommand)" Importance="High"/> |
| 112 | + <Exec Command="$(_BuildNativeBuildCommand)" EnvironmentVariables="$(_BuildNativeEnvironmentVariables)" IgnoreStandardErrorWarningFormat="true" /> |
111 | 113 | </Target> |
112 | 114 |
|
113 | 115 | <UsingTask TaskName="AndroidLibBuilderTask" |
|
0 commit comments