Update appveyor, .gitignore and master build script

This commit is contained in:
Vasily
2018-12-26 19:38:50 +01:00
parent 43eafba7a7
commit 2085d0716b
3 changed files with 21 additions and 17 deletions
+1
View File
@@ -9,3 +9,4 @@ Makefile*
*.stash
*.appxmanifest
*.user
installer/AdvancedSettings-Installer.exe
+6 -3
View File
@@ -2,10 +2,14 @@ image: Visual Studio 2017
environment:
matrix:
- QT: C:\Qt\5.10.1\msvc2017_64
PLATFORM: amd64
- QT_LOC: C:\Qt\5.11.2\msvc2017_64\bin\
VS_LOC: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"'
JOM_LOC: C:\Qt\Tools\QtCreator\bin\jom.exe
NSIS_LOC: C:\Program Files (x86)\NSIS\
ZIP_LOC: 7z
COMPILER: msvc
VSVER: 14
clone_depth: 1
@@ -14,7 +18,6 @@ init:
build_script:
- call "build_windows.cmd"
- call "package.cmd"
artifacts:
- path: bin\win64\AdvancedSettings.zip
+14 -14
View File
@@ -5,28 +5,28 @@ REM Used for echos.
SET top_level_activity=MASTER
REM If scripts are chain called the original dirs should not be overwritten.
IF NOT DEFINED original_dir (
SET original_dir=%CD%
)
IF NOT DEFINED project_dir (
REM Arg 0 (called %0) is the full path to the file.
REM https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/call#batch-parameters
REM As per above link, %~dp0 expands the zeroth arg to a drive letter and path only.
SET folder_path=%~dp0
REM Project dir is up two dirs from the file.
SET project_dir=%folder_path%
)
SET original_dir=%CD%
REM Arg 0 (called %0) is the full path to the file.
REM https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/call#batch-parameters
REM As per above link, %~dp0 expands the zeroth arg to a drive letter and path only.
SET folder_path=%~dp0
REM Project dir is up two dirs from the file.
SET project_dir=%folder_path%
ECHO %top_level_activity%: Calling build script.
CALL %project_dir%\build_scripts\win\build_windows.cmd
CALL %project_dir%\build_scripts\win\build.cmd
IF ERRORLEVEL 1 EXIT /B 1
ECHO %top_level_activity%: Calling deployment script.
CALL %project_dir%\build_scripts\win\deploy_windows.cmd
CALL %project_dir%\build_scripts\win\deploy.cmd
IF ERRORLEVEL 1 EXIT /B 1
ECHO %top_level_activity%: Calling packaging script.
CALL %project_dir%\build_scripts\win\package_windows.cmd
CALL %project_dir%\build_scripts\win\package.cmd
IF ERRORLEVEL 1 EXIT /B 1
CD %original_dir%