Create new version

.gitattributes

@@ -2,3 +2,4 @@
 *.patch eol=crlf
 *.txt eol=crlf
 *.bat eol=crlf
+*.def eol=crlf

CHANGES.md

@@ -6,6 +6,13 @@ For a full list of changes, see the [git commit log][log]
   [log]: https://github.com/mturk/cmsc/commits/
 
 
+## cmsc 15.0_48
+
+ * Rebase cygwrun to 1.2.2
+ * Rebase nasm to 2.16.01
+ * Rebase perl to 5.38.2.2
+ * No need for EXTRA_LIBS any more
+
 ## cmsc 15.0_47
 
  * Update cygwrun dependency

setenv.bat

@@ -26,7 +26,7 @@ if not exist "%CmscRootDir%\msvc\bin\build.exe" (
     exit /B 1
 )
 set "WINVER=0x0601"
-set "CMSC_VERSION=15047"
+set "CMSC_VERSION=15048"
 rem
 rem Default target is 64-bit Windows
 rem
@@ -38,10 +38,9 @@ rem
 if ".%BUILD_CPU%" == "." ( set "BUILD_CPU=x64" )
 rem
 echo Seting build environment for win-%BUILD_CPU%/%WINVER%
-set "CMSC_PATH=%CmscRootDir%\msvc\bin\%BUILD_CPU%;%CmscRootDir%\msvc\bin;%CmscRootDir%\tools;%CmscRootDir%\nasm;%CmscRootDir%\perl\perl\bin"
+set "CMSC_PATH=%CmscRootDir%\tools;%CmscRootDir%\msvc\bin\%BUILD_CPU%;%CmscRootDir%\msvc\bin;%CmscRootDir%\nasm;%CmscRootDir%\perl\perl\bin"
 set "PATH=%CMSC_PATH%;%PATH%"
 set "LIB=%CmscRootDir%\msvc\lib\%BUILD_CPU%"
 set "INCLUDE=%CmscRootDir%\msvc\include\crt;%CmscRootDir%\msvc\include;%CmscRootDir%\msvc\include\mfc;%CmscRootDir%\msvc\include\atl"
-set "EXTRA_LIBS=msvcrt_compat.lib msvcrt_compat.obj"
 echo Cmsc %CMSC_VERSION% : Environment initialized for: '%BUILD_CPU%'
 echo.

tools/README.md

@@ -2,8 +2,8 @@
 
 
 ```
-curl.exe        7.86.0    https://curl.se/windows/dl-7.86.0_1/curl-7.86.0_1-win64-mingw.zip
-7za.exe         22.01     https://www.7-zip.org/a/7z2201-extra.7z
+curl.exe        8.6.0     https://curl.se/windows/dl-8.6.0_2/curl-8.6.0_2-win64-mingw.zip
+7za.exe         23.01     https://www.7-zip.org/a/7z2301-extra.7z
 patch.exe       2.5.9     http://gnuwin32.sourceforge.net
 ```
 

tools/cmsc15_compile.bat

@@ -100,7 +100,12 @@ rem Copy Binaries
 %XCOPYD% /S "%WINDDK%\bin\x86\x86" bin\x86\ >NUL
 %XCOPYD% /S "%WINDDK%\bin\x86\amd64" bin\x64\ >NUL
 %FCOPYF% "%WINDDK%\tools\Other\i386\msdis160.dll" bin\msdis160.dll >NUL
-for %%i in (mt guidgen rebase) do copy /Y "%WINSDK%\bin\%%i.exe" bin\ >NUL
+rem
+for %%i in (mt guidgen rebase) do (
+    %FCOPYF% "%WINSDK%\bin\%%i.exe" bin\%%i.exe >NUL
+    %FCOPYF% "%WINSDK%\bin\x64\%%i.exe" bin\x64\%%i.exe >NUL
+)
+rem
 move /Y bin\ml.exe bin\x86\ml.exe >NUL
 rem Copy missing lib and dumpbin from VS2009
 rem %FCOPYF% "%MSVS09%\bin\pgodb90.dll" bin\pgodb90.dll >NUL

tools/cmsc15_makedist.bat

@@ -32,6 +32,7 @@ echo Version: %CmscVer% >>dist\VERSIONS.txt
 type %VSToolsDir%\compile.log >>dist\VERSIONS.txt
 rem
 for %%i in (setenv.bat README.md CHANGES.md LICENSE.txt) do copy /Y %%i dist\
+copy /Y tools\7za.exe dist\tools\
 rem
 echo Creating Distibution ....
 rem

tools/cmsc15_perl5.bat

@@ -27,7 +27,7 @@ set "PerlArch=%PerlName%.zip"
 if not exist "%PerlArch%" (
     echo.
     echo Downloading %PerlArch% ... this can take a while.
-    curl %CurlOpts% -o %PerlArch% http://strawberryperl.com/download/%PerlVer%/%PerlArch%
+    curl %CurlOpts% -o %PerlArch% https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/%PerlBld%/%PerlArch%
 )
 rem
 7za t %PerlArch% >NUL 2>&1 && ( goto Exp )

tools/cmsc15_versions.bat

@@ -14,11 +14,12 @@ rem limitations under the License.
 rem
 rem Setup environment for Microsoft Compiler Toolkit
 rem
-set "CmscVer=15.0_47"
+set "CmscVer=15.0_48"
 set "CmscSys=64"
 set "CmscOsv=win7"
-set "NasmVer=2.15.05"
-set "PerlVer=5.32.1.1"
-set "CygwrunVer=1.1.7"
+set "NasmVer=2.16.01"
+set "PerlVer=5.38.2.2"
+set "PerlBld=SP_53822_64bit"
+set "CygwrunVer=1.2.2"
 set "CurlOpts=-qkL --retry 5 --no-progress-meter"
 set "WINVER=0x0601"

tools/msvcrt_compat.bat

@@ -39,6 +39,9 @@ lib.exe /NOLOGO /NODEFAULTLIB /DEF:%THUNK%.def /MACHINE:X86 /NAME:msvcrt.dll /OU
 rem
 del /Q %OUTD%\%THUNK%.exp
 copy /Y %OUTD%\msvcrt_win2003.obj %OUTD%\%THUNK%.obj
+move /Y %OUTD%\msvcrt.lib %OUTD%\msvcrt_original.lib
+lib.exe /NOLOGO /OUT:%OUTD%\msvcrt.lib %OUTD%\msvcrt_original.lib %OUTD%\%THUNK%.lib %OUTD%\%THUNK%.obj >NUL
+
 rem
 rem Setup x64 target
 rem
@@ -55,6 +58,9 @@ lib.exe /NOLOGO /NODEFAULTLIB /DEF:%THUNK%.def /MACHINE:X64 /NAME:msvcrt.dll /OU
 %CLCC% crt\setargv.c /Fo%OUTD%\setargv.obj
 %CLCC% crt\wsetargv.c /Fo%OUTD%\wsetargv.obj
 rem
+rem Create new mvcrt.lib
 del /Q %OUTD%\%THUNK%.exp
 copy /Y %OUTD%\msvcrt_win2003.obj %OUTD%\%THUNK%.obj
+move /Y %OUTD%\msvcrt.lib %OUTD%\msvcrt_original.lib
+lib.exe /NOLOGO /OUT:%OUTD%\msvcrt.lib %OUTD%\msvcrt_original.lib %OUTD%\%THUNK%.lib %OUTD%\%THUNK%.obj >NUL
 rem

tools/msvcrt_compat.def

@@ -1,10 +1,11 @@
-EXPORTS
-    __wgetmainargs=msvcrt.__wgetmainargs
-    __getmainargs=msvcrt.__getmainargs
-    __getpid=msvcrt.__getpid
-    _getpid=msvcrt._getpid
-    _environ=msvcrt._environ
-    _wenviron=msvcrt._wenviron
-    snprintf=msvcrt.snprintf
-    vsnprintf=msvcrt.vsnprintf
-    _ftelli64=msvcrt._ftelli64
+EXPORTS
+    __wgetmainargs=msvcrt.__wgetmainargs
+    __getmainargs=msvcrt.__getmainargs
+    __getpid=msvcrt.__getpid
+    _getpid=msvcrt._getpid
+    _environ=msvcrt._environ
+    _wenviron=msvcrt._wenviron
+    snprintf=msvcrt.snprintf
+    vsnprintf=msvcrt.vsnprintf
+    _vsnprintf=msvcrt._vsnprintf
+    _ftelli64=msvcrt._ftelli64