added single ci-script for windows

modified some entries in gitlab-ci.yml for testing

.gitlab-ci.yml

@@ -52,10 +52,13 @@ cppcheck:
     paths:
       - cppcheck.log
 
-VS2015-Qt-5.6.0-x64:
-  script: "CI\\VS2015-Qt-5.6.0-x64.bat"
+VS2015-Qt-5.6.2-x64:
+  script: "CI\\ci-windows.bat"
   variables:
      GIT_SUBMODULE_STRATEGY: recursive
+     ARCHITECTURE: "x64"
+     QT_VERSION: "Qt5.6.2"
+     COMPILER: "VS2015"
   tags: 
     - VS2015
     - Qt56
@@ -63,10 +66,13 @@ VS2015-Qt-5.6.0-x64:
     paths:
       - rel/*.exe
 
-VS2015-Qt-5.6.0-x32:
-  script: "CI\\VS2015-Qt-5.6.0-x32.bat"
+VS2015-Qt-5.6.2-x32:
+  script: "CI\\ci-windows.bat"
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
+    ARCHITECTURE: "x32"
+    QT_VERSION: "Qt5.6.2"
+    COMPILER: "VS2015"
   tags: 
     - VS2015
     - Qt56

CI/ci-windows.bat

+::########################################
+::# Fetch test data
+::########################################
+rmdir /Q /S TestData
+:: clone libraries git (set env variable to GIT_SSH_COMMAND maybe use setx once as this key won't change) 
+set GIT_SSH_COMMAND=ssh -i E:\\\gitlab\\\id_rsa 
+git clone git@roosevelt:moebius/OpenFlipper-Test-Data.git TestData
+
+mkdir rel
+cd rel
+
+del *.exe
+
+:: use 4 threads for parallel compilation of the project
+set CL=/MP4
+
+:: determine VS version and set variables
+if "%COMPILER%" == "VS2015" (
+set QT_COMPILERPREFIX=msvc2015
+set VS_COMPILERVERSION_LONG=14.0
+set VS_COMPILERVERSION_SHORT=14
+)
+
+set BUILD_PLATFORM=%COMPILER%
+
+:: determine architecture and set variables
+if "%ARCHITECTURE%" == "x64" (
+set ARCHBITS=64
+set ARCH_VS=Win64
+set STRING_ARCH=64-Bit
+)
+else (
+set ARCHBITS=
+set ARCH_VS=
+set STRING_ARCH=32-Bit
+)
+
+set GENERATOR=Visual Studio %VS_COMPILERVERSION_SHORT% %ARCH_VS%
+set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio %VS_COMPILERVERSION_LONG%\Common7\IDE\devenv.com"
+
+:: determine Qt Version and set variables
+if "%QT_VERSION%" == "Qt5.6.2" (
+set QT_REV=5.6 
+)
+
+set QT_SUFFIX=
+set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPREFIX%_%ARCHBITS%%QT_SUFFIX%
+
+:: set up Libraty Paths
+set LIBPATH_BASE=E:\libs\%COMPILER%
+set GTESTVERSION=gtest-1.7.0
+set GLUT_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\freeglut-3.0.0\include
+set GLUT_GLUT_LIBRARY=%LIBPATH_BASE%\%ARCHITECTURE%\freeglut-3.0.0\lib\freeglut.lib
+set GLEW_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\glew-1.13.0\include
+set GLEW_LIBRARY_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\glew-1.13.0\lib\glew32.lib
+
+set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DGLUT_INCLUDE_DIR="%GLUT_INCLUDE_DIR%" -DGLUT_glut_LIBRARY="%GLUT_GLUT_LIBRARY%" -DGLEW_INCLUDE_DIR="%GLEW_INCLUDE_DIR%" -DGLEW_LIBRARY="%GLEW_LIBRARY_DIR%"
+
+"C:\Program Files (x86)\CMake\bin\cmake.exe"  -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%"  -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
+
+IF %errorlevel% NEQ 0 exit /b %errorlevel%
+
+:: build Open-Flipper
+
+%VS_PATH% /Build "Release" OpenFlipper.sln /Project "ALL_BUILD"
+
+IF %errorlevel% NEQ 0 exit /b %errorlevel%
+
+del *.exe
+
+:: collect dlls and copy them to Openflipper dir
+
+"C:\Program Files (x86)\CMake\bin\cmake.exe"  -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%"  -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
+
+%VS_PATH% /Build "Release" OpenFlipper.sln /Project "PACKAGE"
+
+IF %errorlevel% NEQ 0 exit /b %errorlevel%
+
+move OpenFlipper-*.exe "OpenFlipper-Free-Git-Master-%CI_BUILD_REF%-%BUILD_PLATFORM%-%STRING_ARCH%-%QT_VERSION%.exe"
+
+cd tests
+copy ..\Build\Qt*.dll testBinaries
+copy ..\Build\icu*.dll testBinaries
+run_tests.bat
+
+IF %errorlevel% NEQ 0 exit /b %errorlevel%
+
+cd ..
+
+cd Build
+
+dir
+
+
+
+
+
+
+
+
+
+