Merge pull request #744 from unoplatform/mergify/bp/release/stable/7.…

…0/pr-726 fix: Adjust response file for aot-instances (backport #726)
unoplatform · Jul 19, 2023 · f3aabe8 · f3aabe8
2 parents f335ab6 + 8fc75b4
commit f3aabe8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/.vsts-ci-linux.yml b/.vsts-ci-linux.yml
@@ -32,11 +32,6 @@ jobs:
  version: 7.0.100
  includePreviewVersions: true
 
- - task: NuGetToolInstaller@0
- inputs:
- versionSpec: 4.9.1
- checkLatest: false
-
  - bash: |
  cd $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap
  dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true

diff --git a/.vsts-ci-packages.yml b/.vsts-ci-packages.yml
@@ -21,11 +21,6 @@ jobs:
  - template: build/ci/gitversion.yml
  - template: build/ci/dotnet-install.yml
 
- - task: NuGetToolInstaller@0
- inputs:
- versionSpec: 4.9.1
- checkLatest: false
-
  - bash: |
  npm install -g conventional-changelog-cli@2.2.2
  conventional-changelog -p angular -u -r 1 -o "build/CHANGELOG.md"

diff --git a/src/Uno.Wasm.Packager/packager.cs b/src/Uno.Wasm.Packager/packager.cs
@@ -1313,6 +1313,10 @@ int Run (string[] args) {
  // environment.Add("MONO_THREADS_SUSPEND=coop");
  }
 
+ var response_prefix = is_windows
+ ? "`@"
+ : "@";
+
  var aot_cross_prefix = is_windows
  ? $"cmd /c set \"MONO_PATH=$mono_path\" &&" + string.Join(" ", environment.Select(e => $"set \"{e}\" &&"))
  : string.Join(" ", environment);
@@ -1321,11 +1325,14 @@ int Run (string[] args) {
  ninja.WriteLine ("rule aot");
  ninja.WriteLine ($" command = {aot_cross_prefix} $cross --debug {profiler_aot_args} {aot_compiler_options} --aot=$aot_args,$aot_base_args,depfile=$depfile,llvm-outfile=$outfile $src_file");
  ninja.WriteLine (" description = [AOT] $src_file -> $outfile");
+
  ninja.WriteLine ("rule aot-instances");
- ninja.WriteLine ($" command = {aot_cross_prefix} $cross --debug {profiler_aot_args} {aot_compiler_options} --aot=$aot_base_args,llvm-outfile=$outfile,dedup-include=$dedup_image $src_files");
+ ninja.WriteLine ($" command = {aot_cross_prefix} $cross --response=$builddir/aot-instances.rsp");
+ ninja.WriteLine ($" rspfile = $builddir/aot-instances.rsp");
+ ninja.WriteLine ($" rspfile_content = --debug {profiler_aot_args} {aot_compiler_options} --aot=$aot_base_args,llvm-outfile=$outfile,dedup-include=$dedup_image $src_files");
  ninja.WriteLine (" description = [AOT-INSTANCES] $outfile");
- ninja.WriteLine ("rule mkdir");
 
+ ninja.WriteLine ("rule mkdir");
  if (Environment.OSVersion.Platform != PlatformID.Win32NT)
  {
  ninja.WriteLine(" command = mkdir -p $out");
@@ -1377,10 +1384,6 @@ int Run (string[] args) {
  ? "powershell"
  : "";
 
- var response_prefix = is_windows
- ? "`@"
- : "@";
-
  ninja.WriteLine ("rule create-emsdk-env");
  ninja.WriteLine ($" command = {tools_shell_prefix} \"$emscripten_sdkdir/emsdk\" construct_env > $out");