Merge pull request #346 from kinke/build-mingw-w64-libs

Switch from MinGW to MinGW-w64

Author: wilzbach

azure-pipelines.yml

@@ -16,7 +16,7 @@ jobs:
       vmImage: 'vs2017-win2016'
     variables:
       VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
-      MINGW_VER: 5.0.2
+      MINGW_VER: 6.0.0
       D_VERSION: 2.077.1
     steps:
       - template: .azure-pipelines/build-mingw-libs.yml

windows/build_mingw.bat

@@ -8,39 +8,28 @@ powershell -Command "Invoke-WebRequest %DMD_URL% -OutFile dmd2.7z" || exit /B 1
 7z x dmd2.7z || exit /B 1
 set PATH=%ROOT%\dmd2\windows\bin;%PATH%
 
-set MINGW_BASEURL=https://netix.dl.sourceforge.net/project/mingw/MinGW/Base/
-set W32API_URL=%MINGW_BASEURL%/w32api/w32api-%MINGW_VER%/w32api-%MINGW_VER%-mingw32-src.tar.xz
-set MINGWRT_URL=%MINGW_BASEURL%/mingwrt/mingwrt-%MINGW_VER%/mingwrt-%MINGW_VER%-mingw32-src.tar.xz
+set MINGW_URL=https://netix.dl.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v%MINGW_VER%.tar.bz2
 set USER_AGENT=[Microsoft.PowerShell.Commands.PSUserAgent]::FireFox
 
-powershell -Command "Invoke-WebRequest %W32API_URL% -OutFile w32api.src.tar.xz -UserAgent %User_Agent%"  || exit /B 1
-powershell -Command "Invoke-WebRequest %MINGWRT_URL% -OutFile mingwrt.src.tar.xz -UserAgent %User_Agent%"  || exit /B 1
+powershell -Command "Invoke-WebRequest %MINGW_URL% -OutFile mingw-w64.tar.bz2 -UserAgent %User_Agent%"  || exit /B 1
 
 :: e.g. from git installation
 dos2unix "%ROOT%\windows\build_mingw.sha256sums"
 sha256sum -c "%ROOT%\windows\build_mingw.sha256sums" || exit /B 1
 
-7z x w32api.src.tar.xz || exit /B 1
-7z x w32api.src.tar || exit /B 1
+7z x mingw-w64.tar.bz2 || exit /B 1
+7z x mingw-w64.tar || exit /B 1
 
-7z x mingwrt.src.tar.xz || exit /B 1
-7z x mingwrt.src.tar || exit /B 1
-
-move w32api-%MINGW_VER% w32api
-move mingwrt-%MINGW_VER% mingwrt
-
-cd windows\mingw
-set w32api_lib=../../w32api/lib
-set msvcrt_def_in=../../mingwrt/msvcrt-xref/msvcrt.def.in
+move mingw-w64-v%MINGW_VER% mingw-w64
 
 call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
 rem CWD might be changed by vcvars64.bat
 cd %ROOT%\windows\mingw
-dmd -run buildsdk.d x64 %w32api_lib% dmd2\windows\lib64\mingw %msvcrt_def_in% || exit /B 1
+dmd -run buildsdk.d x64 %ROOT%\mingw-w64 dmd2\windows\lib64\mingw || exit /B 1
 
 call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86
 cd %ROOT%\windows\mingw
-dmd -run buildsdk.d x86 %w32api_lib% dmd2\windows\lib32mscoff\mingw %msvcrt_def_in% || exit /B 1
+dmd -run buildsdk.d x86 %ROOT%\mingw-w64 dmd2\windows\lib32mscoff\mingw || exit /B 1
 
 mkdir "%ROOT%\artifacts"
 7z a %ROOT%\artifacts\mingw-libs-%MINGW_VER%.zip dmd2\windows

windows/build_mingw.sha256sums

@@ -1,2 +1 @@
-b80b0c9d0158f9125e482b50fe00b70dde11d7a015ee687ca455fe2ea2ec8733 w32api.src.tar.xz
-77233333f5440287840d134804bcecf3144ec3efc7fd7f7c6dce318e4e7146ee mingwrt.src.tar.xz
+805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0 mingw-w64.tar.bz2