ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 10:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch to appveyor VS2019 image to match cutter-deps (#2184)

Browse Source 
* Force gyp to generate vs2017 project and then upgrade it to vs2019 because version used by breakpad doesn't recognize vs2019.
This commit is contained in:
karliss 2020-05-07 22:09:58 +03:00 committed by GitHub
parent cd85582164
commit 1eeb2c166b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@ -1,5 +1,5 @@
version: '1.10.3-pre2-git-{build}' version: '1.10.3-pre2-git-{build}'
image: 'Visual Studio 2017' image: 'Visual Studio 2019'
clone_depth: 1 clone_depth: 1
# Build configuration # Build configuration
@ -9,7 +9,7 @@ configuration:
# Environment # Environment
environment: environment:
NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip
VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat' VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat'
QTPATH: 'cutter-deps\qt' QTPATH: 'cutter-deps\qt'
USE_APPVEYOR_QT: 'false' USE_APPVEYOR_QT: 'false'
matrix: matrix:

2
scripts/prepare_breakpad.bat
View File

@ -24,7 +24,9 @@ DEL %CD%\build_all.vcxproj
COPY %ROOT_DIR%\scripts\breakpad_client.gyp %CD% COPY %ROOT_DIR%\scripts\breakpad_client.gyp %CD%
CD %ROOT_DIR%\src\breakpad\src\src CD %ROOT_DIR%\src\breakpad\src\src
SET GYP_MSVS_VERSION=2017
powershell -Command "tools\gyp\gyp.bat --no-circular-check client\windows\breakpad_client.gyp -Dwin_release_RuntimeLibrary=2 -Dwin_debug_RuntimeLibrary=2 -Dplatform=%ARCH% -Dconfiguration=release" powershell -Command "tools\gyp\gyp.bat --no-circular-check client\windows\breakpad_client.gyp -Dwin_release_RuntimeLibrary=2 -Dwin_debug_RuntimeLibrary=2 -Dplatform=%ARCH% -Dconfiguration=release"
devenv client\windows\breakpad_client.sln /upgrade
set PATH=%BUFF_PATH% set PATH=%BUFF_PATH%
msbuild /m %CD%\client\windows\breakpad_client.sln /p:Configuration=release /p:Platform=%ARCH% || exit /b 1 msbuild /m %CD%\client\windows\breakpad_client.sln /p:Configuration=release /p:Platform=%ARCH% || exit /b 1