From 61bd9e6a28a95f91a34e832f45e7a43f612610a7 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@solana.com>
Date: Thu, 19 Mar 2020 15:58:34 -0700
Subject: [PATCH] Fix windows binary build on v1.0 (#8968)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 ci/publish-tarball.sh        | 11 +-----
 scripts/cargo-install-all.sh | 74 +++++++++++++++++++++---------------
 2 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh
index a4ebdbdc6e..fa39c940e0 100755
--- a/ci/publish-tarball.sh
+++ b/ci/publish-tarball.sh
@@ -45,7 +45,7 @@ linux)
   TARGET=x86_64-unknown-linux-gnu
   ;;
 windows)
-  TARGET=x86_64-pc-windows-msvc
+  TARGET=x86_64-pc-windows-gnu
   ;;
 *)
   echo CI_OS_NAME unset
@@ -73,15 +73,6 @@ echo --- Creating release tarball
   source ci/rust-version.sh stable
   scripts/cargo-install-all.sh +"$rust_stable" --use-move solana-release
 
-  # Reduce the Windows archive size until
-  # https://github.com/appveyor/ci/issues/2997 is fixed
-  if [[ -n $APPVEYOR ]]; then
-    rm -f \
-      solana-release/bin/solana-validator.exe \
-      solana-release/bin/solana-bench-exchange.exe \
-
-  fi
-
   tar cvf solana-release-$TARGET.tar solana-release
   bzip2 solana-release-$TARGET.tar
   cp solana-release/bin/solana-install-init solana-install-init-$TARGET
diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index 4c3fdcae80..0e35cbae2d 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -55,43 +55,55 @@ cargo=cargo
 echo "Install location: $installDir ($buildVariant)"
 
 cd "$(dirname "$0")"/..
-./fetch-perf-libs.sh
 
 SECONDS=0
 
-(
-  set -x
-  # shellcheck disable=SC2086 # Don't want to double quote $rust_version
-  $cargo $maybeRustVersion build $maybeReleaseFlag
-
-  if $useMove; then
-    moveLoaderDir=programs/move_loader
+if [[ $CI_OS_NAME = windows ]]; then
+  # Limit windows to end-user command-line tools.  Full validator support is not
+  # yet available on windows
+  BINS=(
+    solana
+    solana-install
+    solana-install-init
+    solana-keygen
+  )
+else
+  ./fetch-perf-libs.sh
+  (
+    set -x
     # shellcheck disable=SC2086 # Don't want to double quote $rust_version
-    $cargo $maybeRustVersion build $maybeReleaseFlag --manifest-path "$moveLoaderDir/Cargo.toml"
-    cp -fv $moveLoaderDir/target/$buildVariant/libsolana_move_loader_program.* "$installDir/bin/deps"
-  fi
-)
+    $cargo $maybeRustVersion build $maybeReleaseFlag
 
-BINS=(
-  solana
-  solana-bench-exchange
-  solana-bench-tps
-  solana-faucet
-  solana-gossip
-  solana-install
-  solana-install-init
-  solana-keygen
-  solana-ledger-tool
-  solana-log-analyzer
-  solana-net-shaper
-  solana-sys-tuner
-  solana-validator
-  solana-watchtower
-)
+    if $useMove; then
+      moveLoaderDir=programs/move_loader
+      # shellcheck disable=SC2086 # Don't want to double quote $rust_version
+      $cargo $maybeRustVersion build $maybeReleaseFlag --manifest-path "$moveLoaderDir/Cargo.toml"
+      cp -fv $moveLoaderDir/target/$buildVariant/libsolana_move_loader_program.* "$installDir/bin/deps"
+    fi
+  )
 
-#XXX: Ensure `solana-genesis` is built LAST!
-# See https://github.com/solana-labs/solana/issues/5826
-BINS+=(solana-genesis)
+
+  BINS=(
+    solana
+    solana-bench-exchange
+    solana-bench-tps
+    solana-faucet
+    solana-gossip
+    solana-install
+    solana-install-init
+    solana-keygen
+    solana-ledger-tool
+    solana-log-analyzer
+    solana-net-shaper
+    solana-sys-tuner
+    solana-validator
+    solana-watchtower
+  )
+
+  #XXX: Ensure `solana-genesis` is built LAST!
+  # See https://github.com/solana-labs/solana/issues/5826
+  BINS+=(solana-genesis)
+fi
 
 binArgs=()
 for bin in "${BINS[@]}"; do