From eef880214becc22d5710562c8dbb568e2c4ad24f Mon Sep 17 00:00:00 2001
From: Bart House <bart@barthouse.com>
Date: Sat, 26 Oct 2019 20:09:14 -0700
Subject: [PATCH] Modified travis builds to deploy the x86 windows build to
 github if tagged.

Moved the travis visual studio build bash script to live outside of
the travis YML file.  Updated the script to use powershell to generate
ZIP file form the binary results.

Deploy Windows build ZIP file to github releases if build has commit
has been tagged.  Build will be marked pre-release.
---
 .travis.yml                  | 50 +++++++++++-------------------------
 win/win32/vs2017/travisci.sh | 33 ++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 35 deletions(-)
 create mode 100644 win/win32/vs2017/travisci.sh

diff --git a/.travis.yml b/.travis.yml
index 67d05077d..b8750491b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,40 +73,7 @@ matrix:
       env: DESCR=windows-visualstudio
       language: shell
       script:
-#       - find /c/Program\ Files\ \(x86\) -iname 'rc.exe' -print
-#       - export
-        - export VSVER=2017
-        - export MSVER=14.16.27023
-        - export SDKVER=10.0.17763.0
-        - export FRAMEVER=4.0.30319
-        - export NETFXVER=4.6.1
-        - export WKITVER=10.0.17134.0
-#       - export TOOLSVER=Community
-        - export TOOLSVER=BuildTools
-        - export PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/Common7/IDE/VC/VCPackages:$PATH
-        - export PATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/$WKITVER/x64:$PATH
-        - export PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/bin/HostX64/x64:$PATH
-        - export PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/bin/HostX64/x86:$PATH
-        - export PATH=$PATH:/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/Common7/IDE/CommonExtensions/Microsoft/TestWindow
-        - export PATH=$PATH:/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/MSBuild/Current/bin/Roslyn
-        - export INCLUDE=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/$TOOLSVER/VC/Tools/MSVC/$MSVER/include
-        - export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/Include/$WKITVER/ucrt
-        - export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/ucrt
-        - export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/shared
-        - export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/um
-        - export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/winrt
-        - export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/cppwinrt
-        - export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/ATLMFC/lib/x86
-        - export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB
-        - export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
-        - export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
-#       - export
-        - git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
-        - export ADD_CURSES=Y
-        - export PDCURSES_TOP=../../pdcurses
-        - cd src
-        - cp ../sys/winnt/Makefile.msc ./Makefile
-        - nmake install
+        - ./win/win32/vs2017/travisci.sh
     - os: windows
 #     install: choco install mingw
       env: DESCR=windows-mingw
@@ -128,4 +95,17 @@ sudo: false
 notifications:
   email:
     recipients:
-      - devteam@nethack.org
+      - bart@barthouse.com
+#
+deploy:
+  provider: releases
+  api_key:
+    secure: "U0Dt2CXrcG8Yi4taUCT/6AnM+0IJtdCv6IVG/2rGooUY3pZjNWE9XDM6X9ZeAmbI79aN6FPTppjUf3KbB/upYeJt+8mrjnxEk/ZTO1xXDDW8iL/DiqnczoFsMGmPsTM+Fkeak8bu0SifI7Qkx9i1N+zOyl2VdlaxGjchPfl/OJw2jcQs7rOGRfr23/rapZKTcFq+BFlxMiIHa0dXbCJ9vagdlyAeclOCtPjw1VoH/Cb/+0/Xlx2MFPncw4/1P+bO/fPantHyehh3/WCDVCnI4M7ftONpsTVRrQ+Hml89teUH9/1xXUOpbCeVghWr1rumLcQzMqLKNj2lP/gm9co2/DKpxiUPUzBfO/9Jvl1CNoEwPYQBRNb38kggDvAT4vKX38Oi5sZvumFEO4L0y7o4cW6SA4/CYIykfxOdkrryt8ltfWwopdy3I/DothYw31vJ9GsZOCAShFRAy3hJxYUbHhT+7SDUBadVSEkb4UqxQ+7zntAVT+Lp4DXLAfvsWxZGrQoP/IrWAgNOLRKILubpzh+YpadMH3Ygha2JRAeJAEZ3DnXf3vOOAucWnk4mNXDbW35GTDTAJDWMvddZCfsrUI/uHxgaRjFs9fLX1X5tqhGnsr27sKLWyX+zrIPVV0TPl3AzYPAf6Bc8Okeu+JEGQERvvgSasCuYcmhgYznBVJI="
+  file: 
+    - "NetHack.zip"
+  skip_cleanup: true
+  on:
+    tags: true
+  prerelease: true
+  name: "Pre-release build of NetHack 3.6.3"
+  body: "This is auto generated pre-release build of NetHack 3.6.3 and as such has not been tested."
diff --git a/win/win32/vs2017/travisci.sh b/win/win32/vs2017/travisci.sh
new file mode 100644
index 000000000..6b21a45d4
--- /dev/null
+++ b/win/win32/vs2017/travisci.sh
@@ -0,0 +1,33 @@
+export VSVER=2017
+export MSVER=14.16.27023
+export SDKVER=10.0.17763.0
+export FRAMEVER=4.0.30319
+export NETFXVER=4.6.1
+export WKITVER=10.0.17134.0
+#export TOOLSVER=Enterprise
+export TOOLSVER=BuildTools
+export PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/Common7/IDE/VC/VCPackages:$PATH
+export PATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/$WKITVER/x64:$PATH
+export PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/bin/HostX64/x64:$PATH
+export PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/bin/HostX64/x86:$PATH
+export PATH=$PATH:/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/Common7/IDE/CommonExtensions/Microsoft/TestWindow
+export PATH=$PATH:/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/MSBuild/Current/bin/Roslyn
+export INCLUDE=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/$TOOLSVER/VC/Tools/MSVC/$MSVER/include
+export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/Include/$WKITVER/ucrt
+export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/ucrt
+export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/shared
+export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/um
+export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/winrt
+export INCLUDE=$INCLUDE:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/include/$WKITVER/cppwinrt
+export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/ATLMFC/lib/x86
+export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB
+export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
+export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
+git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
+export ADD_CURSES=Y
+export PDCURSES_TOP=../../pdcurses
+cd src
+cp ../sys/winnt/Makefile.msc ./Makefile
+nmake install
+cd ..
+powershell -Command "Compress-Archive -U -LiteralPath binary -DestinationPath NetHack.zip"
-- 
2.40.0