From 979841b86c5c03966cd9f317e6481b431bdcfec0 Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Mon, 13 Feb 2017 07:25:16 +0100
Subject: [PATCH] AppVeyor: Use consistent script names
---
appveyor.yml | 17 +++++++----------
.../after_build.bat} | 0
.../before_build.bat} | 0
utils/appveyor/build_script.bat | 1 +
utils/appveyor/install.bat | 6 ++++++
5 files changed, 14 insertions(+), 10 deletions(-)
rename utils/{appveyor-after-build.bat => appveyor/after_build.bat} (100%)
rename utils/{appveyor-before-build.bat => appveyor/before_build.bat} (100%)
create mode 100644 utils/appveyor/build_script.bat
create mode 100644 utils/appveyor/install.bat
diff --git a/appveyor.yml b/appveyor.yml
index 4ee5e77e5..352af58a0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,23 +17,20 @@ environment:
CMAKE_GENERATOR: Visual Studio 14 2015 Win64
VC_VARS_ARCH: amd64
+# Parameters for default build commands (build_script is used instead).
+build:
+
install:
-- set PATH=%QTDIR%\bin;%PATH%
-- set CMAKE_PREFIX_PATH=%QTDIR%\lib\cmake
-# Note: Following also removes sh.exe from PATH so that CMake can generate MinGW Makefile.
-- if NOT [%MINGW_PATH%] == [] set PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=%
-- if [%VC_VARS_ARCH%] == [] call "%VCINSTALLDIR%\vcvarsall.bat" %VC_VARS_ARCH%
+- utils\appveyor\install.bat
before_build:
-- utils\appveyor-before-build.bat
-
-build:
+- utils\appveyor\before_build.bat
build_script:
-- cmake --build build/ --config Release
+- utils\appveyor\build_script.bat
after_build:
-- utils\appveyor-after-build.bat
+- utils\appveyor\after_build.bat
artifacts:
- path: 'copyq*.zip'
diff --git a/utils/appveyor-after-build.bat b/utils/appveyor/after_build.bat
similarity index 100%
rename from utils/appveyor-after-build.bat
rename to utils/appveyor/after_build.bat
diff --git a/utils/appveyor-before-build.bat b/utils/appveyor/before_build.bat
similarity index 100%
rename from utils/appveyor-before-build.bat
rename to utils/appveyor/before_build.bat
diff --git a/utils/appveyor/build_script.bat b/utils/appveyor/build_script.bat
new file mode 100644
index 000000000..b58c07afc
--- /dev/null
+++ b/utils/appveyor/build_script.bat
@@ -0,0 +1 @@
+cmake --build build/ --config Release
diff --git a/utils/appveyor/install.bat b/utils/appveyor/install.bat
new file mode 100644
index 000000000..0849cd073
--- /dev/null
+++ b/utils/appveyor/install.bat
@@ -0,0 +1,6 @@
+set PATH=%QTDIR%\bin;%PATH%
+set CMAKE_PREFIX_PATH=%QTDIR%\lib\cmake
+
+REM Note: Following removes sh.exe from PATH so that CMake can generate MinGW Makefile.
+if NOT [%MINGW_PATH%] == [] set PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=%
+if [%VC_VARS_ARCH%] == [] call "%VCINSTALLDIR%\vcvarsall.bat" %VC_VARS_ARCH%
--
GitLab