Testing 5.8.0rc. Some issues with ICU when configuring Qt.

.gitignore

@@ -0,0 +1,2 @@
+sources/*
+build/*

Qt5-MSVC-Static.config

@@ -0,0 +1,2 @@
+// Add predefined macros for your project here. For example:
+// #define THE_ANSWER 42

Qt5-MSVC-Static.creator

@@ -0,0 +1 @@
+[General]

Qt5-MSVC-Static.files

@@ -0,0 +1,19 @@
+LICENSE
+README.md
+VS2015 x86 Native Tools Command Prompt.lnk
+qt.bat
+tools/build_icu.bat
+tools/build_openssl.bat
+tools/build_qt.bat
+tools/build_qt_extras.bat
+tools/gnuwin32/bin/data/glr.c
+tools/gnuwin32/bin/data/glr.cc
+tools/gnuwin32/bin/data/lalr1.cc
+tools/gnuwin32/bin/data/location.cc
+tools/gnuwin32/bin/data/stack.hh
+tools/gnuwin32/bin/data/variant.hh
+tools/gnuwin32/bin/data/yacc.c
+tools/msvc-desktop.conf
+tools/options.bat
+tools/setup_icu.sh
+tools/setup_qt.bat

Qt5-MSVC-Static.includes

@@ -0,0 +1,2 @@
+tools/gnuwin32/bin/data
+tools

README.md

@@ -5,15 +5,14 @@ Set of tools to build Qt5 static libs on Windows.
 **Dependencies**
 
  - MSVC 2015 with WDK 8.1 (Community works fine)
- - Qt 5.5.0+ sources (untested with previous versions, might work from 5.4.0)
- - Python 2.7 (https://www.python.org/downloads/windows/)
- - Perl (http://strawberryperl.com/)
- - Ruby (http://rubyinstaller.org/downloads/)
- - MSYS Git (https://msysgit.github.io)
- - OpenSSL 1.0.2d
- - ICU 55.1
+ - Qt 5.7.1+ sources (untested with previous versions, might work from 5.0)
+ - Python 2.7 (https://www.python.org/downloads/windows/) (for Qt)
+ - Perl (http://strawberryperl.com/) (for OpenSSL)
+ - MSYS2
+ - OpenSSL 1.1.0+
+ - ICU 58.1+
 
-Make sure *Python*, *Perl* and *Git (MSYS)* are all in the *PATH*.
+Make sure *Python*, *Perl* are all in the *PATH*.
 
 You can check the official documentation here: 
 http://doc.qt.io/qt-5/windows-requirements.html
@@ -23,10 +22,10 @@ http://doc.qt.io/qt-5/windows-building.html
 
 First we need to download and extract the dependencies and Qt.
 Qt: 
- - http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.zip
- - http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qt5-opensource-src-5.5.0.zip
- - https://www.openssl.org/source/openssl-1.0.2d.tar.gz
- - http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.zip
+ - http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.zip
+ - http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwinextras-opensource-src-5.7.1.zip
+ - https://www.openssl.org/source/openssl-1.0.2h.tar.gz
+ - http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.zip
 
 Extract these in the repo, check the folder names are correct in *tools/options.bat*
 
@@ -48,7 +47,7 @@ If you want to install extra Qt modules like qtscript or webkit:
 - You need to run it once per module
 
 You obviously need to do that after installing Qt.
-Modules can be found here: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/
+Modules can be found here: http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/
 
 **Configuration**
 

qt.bat

@@ -0,0 +1,31 @@
+@echo off
+setlocal
+
+call tools\options.bat
+
+IF NOT "%1"=="" (
+
+    IF "%1"=="setup" (
+        call tools\setup_qt.bat
+    )
+    IF "%1"=="build" (
+        call tools\build_qt.bat
+    )
+    IF "%1"=="deps" (
+        call tools\build_icu.bat
+        call tools\build_openssl.bat
+    )
+    IF "%1"=="extra" (
+        set EXTNAME=%2
+        call tools\build_qt_extras.bat
+    )
+
+) ELSE (
+    echo Available commands:
+    echo deps : Build all dependencies for Qt ^(ICU, OpenSSL^)
+    echo setup : Setup Qt
+    echo build : build Qt
+    echo extra [name]: build qt extension ^(you need to specify the name^)
+)
+
+endlocal

tools/build_icu.bat

@@ -1,8 +1,6 @@
 @echo off
 setlocal
 
-call tools\options.bat
-
 IF exist %ICUINSTALLDIR% (
     echo ICU already installed!
     echo Delete or rename %ICUINSTALLDIR% if you want to rebuild it.
@@ -14,14 +12,16 @@ IF exist %ICUINSTALLDIR% (
         rd build /s /q
         md build
         cd build
-        
+
         echo Configuring ICU...
+        copy /Y %STARTDIR%\tools\config.guess ..\source\config.guess
+        copy /Y ..\source\config\mh-msys-msvc ..\source\config\mh-unknown
         start /W /BELOWNORMAL "Configuring ICU..." bash %STARTDIR%/tools/setup_icu.sh
-        
+
         echo Building ICU...
-        start /W /BELOWNORMAL "Building ICU..." make
+        start /W /BELOWNORMAL "Building ICU..." make -j4
         IF %errorlevel% NEQ 0 exit /b %errorlevel%
-        
+
         echo Installing ICU...
         start /W /BELOWNORMAL "Installing ICU..." make install
         IF %errorlevel% NEQ 0 exit /b %errorlevel%
@@ -34,4 +34,4 @@ IF exist %ICUINSTALLDIR% (
     )
 )
 
-endlocal
+endlocal

tools/build_openssl.bat

@@ -1,8 +1,6 @@
 @echo off
 setlocal
 
-call tools\options.bat
-
 echo Configuring OpenSSL...
 IF exist %SSLINSTALLDIR% (
     echo OpenSSL already installed!
@@ -11,15 +9,18 @@ IF exist %SSLINSTALLDIR% (
     IF exist %SSLBUILDDIR% (
 
         cd %SSLBUILDDIR%
-        start /W /BELOWNORMAL "Configuring OpenSSL - 1..." perl Configure VC-WIN32 no-asm enable-static-engine --prefix=%SSLINSTALLDIR%
-        start /W /BELOWNORMAL "Configuring OpenSSL - 2..." ms\do_nt ^&^& exit
+        rd build /s /q
+        md build
+        cd build
+
+        start /W /BELOWNORMAL "Configuring OpenSSL..." perl ..\Configure VC-WIN32 no-asm enable-static-engine no-shared --prefix=%SSLINSTALLDIR%
 
         echo Building OpenSSL...
-        start /W /BELOWNORMAL "Building OpenSSL..." nmake -f ms\nt.mak clean all
+        start /W /BELOWNORMAL "Building OpenSSL..." nmake clean all
         IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
         echo Installing OpenSSL...
-        start /W /BELOWNORMAL "Installing OpenSSL..." nmake -f ms\nt.mak install
+        start /W /BELOWNORMAL "Installing OpenSSL..." nmake install
         IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
     ) ELSE (

tools/build_qt.bat

@@ -1,8 +1,6 @@
 @echo off
 setlocal
 
-call tools\options.bat
-
 cd %QTBUILDDIR% ||  exit /b %errorlevel%
 
 echo Building Qt...

tools/build_qt_extras.bat

@@ -1,8 +1,6 @@
 @echo off
 setlocal
 
-call tools\options.bat
-
 set EXTPATH=%STARTDIR%\%EXTNAME%-opensource-src-%QTVER%
 set QMAKE=%QTINSTALLDIR%\bin\qmake.exe