AppVeyor: Added 64-bit MSVC 2013 builds

These are without Python support for now.
tinyChen · Sep 22, 2015 · 45888f9 · 45888f9
1 parent d5dbab2
commit 45888f9
Show file tree

Hide file tree

Showing 6 changed files with 336 additions and 101 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,8 +1,11 @@
 clone_depth: 200
 
 environment:
-  QTDIR: C:\Qt\5.5\mingw492_32
-  MINGW: C:\Qt\Tools\mingw492_32
+  global:
+    MINGW: C:\Qt\Tools\mingw492_32
+  matrix:
+    - QTDIR: C:\Qt\5.5\mingw492_32
+    - QTDIR: C:\Qt\5.5\msvc2013_64
 
 configuration: Release
 
@@ -18,11 +21,11 @@ build_script:
   - if not defined APPVEYOR_REPO_TAG_NAME set VERSION=%DATE:~10,4%-%DATE:~4,2%-%DATE:~7,2%
   - if not defined APPVEYOR_REPO_TAG_NAME set BUILD_INFO_VERSION=%COMMITNOW%
   - if not defined APPVEYOR_REPO_TAG_NAME echo Building Tiled daily %VERSION%... (from %COMMITNOW%)
-  - qbs setup-toolchains --type mingw %MINGW%\bin\g++.exe mingw
-  - qbs config profiles.mingw.cpp.archiverPath ar.exe
-  - qbs config profiles.mingw.cpp.nmPath nm.exe
-  - qbs config profiles.mingw.cpp.objcopyPath objcopy.exe
-  - qbs config profiles.mingw.cpp.stripPath strip.exe
+  - qbs setup-toolchains --detect
+  - qbs config profiles.i686-w64-mingw32.cpp.archiverPath ar.exe
+  - qbs config profiles.i686-w64-mingw32.cpp.nmPath nm.exe
+  - qbs config profiles.i686-w64-mingw32.cpp.objcopyPath objcopy.exe
+  - qbs config profiles.i686-w64-mingw32.cpp.stripPath strip.exe
   - qbs setup-qt %QTDIR%\bin\qmake.exe qt
   - qbs config defaultProfile qt
   - qbs install --all-products --install-root install-root release

diff --git a/dist/win/build-daily.bat b/dist/win/build-daily.bat
@@ -47,7 +47,7 @@ popd
 
 echo Building Installer...
 pushd %TILED_SOURCE_DIR%\dist\win
-makensis.exe tiled.nsi
+makensis.exe tiled-vs2013.nsi
 
 echo Uploading installer...
 %SCP% -B tiled-%VERSION%-win32-setup.exe %DESTINATION%

diff --git a/dist/win/build_installer.bat b/dist/win/build_installer.bat
diff --git a/dist/win/dist.qbs b/dist/win/dist.qbs
@@ -3,7 +3,7 @@ import qbs.FileInfo
 
 NSISSetup {
     builtByDefault: false
-    condition: qbs.toolchain.contains("mingw")
+    condition: qbs.toolchain.contains("mingw") || qbs.toolchain.contains("msvc")
 
     Depends { productTypes: ["application", "dynamiclibrary"] }
     type: base.concat(["installable"])
@@ -29,7 +29,10 @@ NSISSetup {
         "BUILD_DIR=" + qbs.installRoot
     ]
 
-    files: [
-        "*"
-    ]
+    files: {
+        if (qbs.toolchain.contains("mingw"))
+            return ["tiled-mingw.nsi"]
+        else
+            return ["tiled-vs2013.nsi"]
+    }
 }
diff --git a/dist/win/tiled.nsi → dist/win/tiled-mingw.nsi b/dist/win/tiled.nsi → dist/win/tiled-mingw.nsi