use azure CI boost

mesonbuild · Apr 4, 2020 · c1e08f1 · c1e08f1
1 parent 1474667
commit c1e08f1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/build_win32.sh b/build_win32.sh
@@ -83,8 +83,8 @@ main() {
   download_add msmpisdk.msi    https://download.microsoft.com/download/D/B/B/DBB64BA1-7B51-43DB-8BF1-D1FB45EACF7A/msmpisdk.msi
   download_add MSMpiSetup.exe  https://download.microsoft.com/download/D/B/B/DBB64BA1-7B51-43DB-8BF1-D1FB45EACF7A/MSMpiSetup.exe
   download_add LLVM.exe        https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe
-  download_add boost32.exe     https://sourceforge.net/projects/boost/files/boost-binaries/$boost_version/boost_$b_name-msvc-$boost_abi_tag-32.exe
-  download_add boost64.exe     https://sourceforge.net/projects/boost/files/boost-binaries/$boost_version/boost_$b_name-msvc-$boost_abi_tag-64.exe
+  #download_add boost32.exe     https://sourceforge.net/projects/boost/files/boost-binaries/$boost_version/boost_$b_name-msvc-$boost_abi_tag-32.exe
+  #download_add boost64.exe     https://sourceforge.net/projects/boost/files/boost-binaries/$boost_version/boost_$b_name-msvc-$boost_abi_tag-64.exe
 
   add win32/pkg-config.exe
   add win32/setdllcharacteristics.exe
@@ -97,7 +97,7 @@ main() {
   msg "Creating $OUT"
   old_pwd="$PWD"
   pushd $ARCHIVE_DIR  &> /dev/null
-  zip -9rq "$old_pwd/$OUT" * || die "Failed to create $OUT"
+  zip -rq "$old_pwd/$OUT" * || die "Failed to create $OUT"
   popd &> /dev/null
   msg "DONE"
 }

diff --git a/win32/install.ps1 b/win32/install.ps1
@@ -25,11 +25,13 @@ foreach ($p in "MSMPI_INC", "MSMPI_LIB32", "MSMPI_LIB64") {
 }
 
 if ($Boost) {
-  if ($Arch -eq "x64") { $BoostBitness = "64" } else { $BoostBitness = "32" }
-  echo " - Installing $BoostBitness bit boost"
-  Start-Process $ScriptDir\boost$BoostBitness.exe -ArgumentList "/dir=$env:AGENT_WORKFOLDER\boost_@BOOST_FILENAME@ /silent" -Wait
-  $env:BOOST_ROOT = "$env:AGENT_WORKFOLDER\boost_@BOOST_FILENAME@"
-  $env:Path       = "$env:Path;$env:BOOST_ROOT\lib$BoostBitness-msvc-@BOOST_ABI_TAG@"
+  echo " - Using preinstalled boost version: $env:BOOST_ROOT"
+
+  # if ($Arch -eq "x64") { $BoostBitness = "64" } else { $BoostBitness = "32" }
+  # echo " - Installing $BoostBitness bit boost"
+  # Start-Process $ScriptDir\boost$BoostBitness.exe -ArgumentList "/dir=$env:AGENT_WORKFOLDER\boost_@BOOST_FILENAME@ /silent" -Wait
+  # $env:BOOST_ROOT = "$env:AGENT_WORKFOLDER\boost_@BOOST_FILENAME@"
+  # $env:Path       = "$env:Path;$env:BOOST_ROOT\lib$BoostBitness-msvc-@BOOST_ABI_TAG@"
 }
 
 if ($DMD) {