From 5008e85fa1755bedfbf4e379007c70181325c2e5 Mon Sep 17 00:00:00 2001
From: Mladen Turk <mturk@apache.org>
Date: Thu, 23 Sep 2021 22:58:46 +0200
Subject: [PATCH] Add cygwrun instead posix2wx

---
 CHANGES.md                |  2 +-
 tools/README.md           |  1 +
 tools/cmsc15_cygwrun.bat  | 48 +++++++++++++++++++++++++++++++++++++++
 tools/cmsc15_makedist.bat |  8 -------
 tools/cmsc15_versions.bat |  4 ++--
 5 files changed, 52 insertions(+), 11 deletions(-)
 create mode 100644 tools/cmsc15_cygwrun.bat

diff --git a/CHANGES.md b/CHANGES.md
index e512c03..6f67c85 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,7 +6,7 @@ For a full list of changes, see the [git commit log][log]
   [log]: https://github.com/mturk/cmsc/commits/
 
 
-## cmsc 15.0_36
+## cmsc 15.0_37
 
  * Update dependencies
  * Use cygwrun instead posix2wx
diff --git a/tools/README.md b/tools/README.md
index e410b4b..faca173 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -104,5 +104,6 @@ Typical distribution build will look like
  c:\> cmsc15_compile.bat
  c:\> cmsc15_perl5.bat
  c:\> cmsc15_nasm.bat
+ c:\> cmsc15_cygwrun.bat
  c:\> cmsc15_makedist.bat
 ```
diff --git a/tools/cmsc15_cygwrun.bat b/tools/cmsc15_cygwrun.bat
new file mode 100644
index 0000000..b31ab5f
--- /dev/null
+++ b/tools/cmsc15_cygwrun.bat
@@ -0,0 +1,48 @@
+@echo off
+setlocal
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem     http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+rem Download Cygwrun
+rem
+rem Prerequisites...
+set "PATH=%~dp0;%PATH%"
+pushd %~dp0
+set "VSToolsDir=%cd%"
+popd
+rem
+call cmsc15_versions.bat
+set "CygwrunName=cygwrun-%CygwrunVer%-win-x%CmscSys%"
+set "CygwrunArch=%CygwrunName%.zip"
+if not exist "%CygwrunArch%" (
+    curl %CurlOpts% -o %CygwrunArch% https://github.com/mturk/cygwrun/releases/download/v%CygwrunVer%/%CygwrunArch%
+)
+rem
+7za t %CygwrunArch% >NUL 2>&1 && ( goto Exp )
+echo.
+echo Failed to download %CygwrunArch%
+del /F /Q %CygwrunArch% 2>NUL
+exit /B 1
+rem
+:Exp
+rem
+echo Cygwrun: %CygwrunName% >>compile.log
+md ..\dist\tools 2>NUL
+pushd ..\dist\tools
+rem Uncopress
+7za x -bd %VSToolsDir%\%CygwrunArch%
+rem
+popd
+echo.
+echo Finished.
+:End
diff --git a/tools/cmsc15_makedist.bat b/tools/cmsc15_makedist.bat
index 9fb7012..46a6f75 100644
--- a/tools/cmsc15_makedist.bat
+++ b/tools/cmsc15_makedist.bat
@@ -30,15 +30,7 @@ echo Custom Microsoft Compiler Toolkit Compilation >dist\VERSIONS.txt
 echo. >>dist\VERSIONS.txt
 echo Version: %CmscVer% >>dist\VERSIONS.txt
 type %VSToolsDir%\compile.log >>dist\VERSIONS.txt
-md dist\tools 2>NUL
 rem
-rem Download possix2wx.exe
-rem
-set "DF=posix2wx.exe"
-del /F /Q %DF% 2>NUL
-curl %CurlOpts% -o dist\tools\%DF% https://github.com/mturk/posix2wx/releases/download/v%P2wxVer%/%DF%
-echo Utils  : %DF% %P2wxVer% >>%dist\VERSIONS.txt
-echo.
 for %%i in (setenv.bat README.md CHANGES.md LICENSE.txt) do copy /Y %%i dist\
 rem
 echo Creating Distibution ....
diff --git a/tools/cmsc15_versions.bat b/tools/cmsc15_versions.bat
index 6f0267a..b5de4b2 100644
--- a/tools/cmsc15_versions.bat
+++ b/tools/cmsc15_versions.bat
@@ -14,11 +14,11 @@ rem limitations under the License.
 rem
 rem Setup environment for Microsoft Compiler Toolkit
 rem
-set "CmscVer=15.0_36"
+set "CmscVer=15.0_37"
 set "CmscSys=64"
 set "CmscOsv=win7"
 set "NasmVer=2.15.05"
 set "PerlVer=5.32.1.1"
-set "P2wxVer=2.0.7"
+set "CygwrunVer=1.0.2"
 set "CurlOpts=-qkL --retry 5"
 set "WINVER=0x0601"