appveyor: try jom instead of nmake to speed up build

bjtangye · Oct 18, 2015 · 79a97df · 79a97df
1 parent e0d3556
commit 79a97df
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/tools/ci/win/build.bat b/tools/ci/win/build.bat
@@ -1,4 +1,5 @@
 echo cc=%cc%
+where qbs
 if "%cc%" == "MinGW" (
   qmake %APPVEYOR_BUILD_FOLDER%
   mingw32-make -j%NUMBER_OF_PROCESSORS%
@@ -8,6 +9,11 @@ if "%cc%" == "MinGW" (
     msbuild /m /p:Configuration=DEBUG
   ) else (
     qmake %APPVEYOR_BUILD_FOLDER%
-    nmake
+    where jom
+    if %ERRORLEVEL% == 0 (
+      jom
+    ) else (
+      nmake
+    )
   )
 )
diff --git a/tools/ci/win/deploy_win.bat b/tools/ci/win/deploy_win.bat
@@ -6,6 +6,7 @@ if exist %QTDIR%\bin\po*.dll copy /y %QTDIR%\bin\po*.dll bin
 if exist %QTDIR%\bin\msvc*.dll copy /y %QTDIR%\bin\msvc*.dll bin
 if exist %QTDIR%\bin\OpenAL32*.dll copy /y %QTDIR%\bin\OpenAL32*.dll bin
 if exist %QTDIR%\bin\OpenAL32-%cc%.dll copy /y %QTDIR%\bin\OpenAL32-%cc%.dll bin\OpenAL32.dll
+if exist bin\OpenAL32-*.dll del bin\OpenAL32-*.dll
 if exist %QTDIR%\bin\D3DCompiler_*.dll copy /y %QTDIR%\bin\D3DCompiler_*.dll bin
 :: libEGL, GLESv2, gcc_s_dw2-1, stdc++-6, winpthread-1
 if exist %QTDIR%\bin\lib*.dll copy /y %QTDIR%\bin\lib*.dll bin
@@ -30,6 +31,8 @@ if "%mode%" == "debug" (
   if exist %QTDIR%\bin\Qt5Networkd.dll copy /y %QTDIR%\bin\Qt5Networkd.dll bin
   if exist %QTDIR%\bin\Qt5Qmld.dll copy /y %QTDIR%\bin\Qt5Qmld.dll bin
   if exist %QTDIR%\bin\Qt5Quickd.dll copy /y %QTDIR%\bin\Qt5Quickd.dll bin
+  if exist bin\libEGL.dll del bin\libEGL.dll
+  if exist bin\libGLESv2.dll del bin\libGLESv2.dll
 ) else (
   if exist %QTDIR%\bin\Qt5Core.dll copy /y %QTDIR%\bin\Qt5Core.dll bin
   if exist %QTDIR%\bin\Qt5Gui.dll copy /y %QTDIR%\bin\Qt5Gui.dll bin