Uupdate for build with updated scintilla 4.1.4 and vs2017

Close #5635
This commit is contained in:
Christian Grasser 2019-05-09 00:12:07 +02:00 committed by Don HO
parent 01d8349b1f
commit 3fb6db3e53
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E

View File

@ -1,8 +1,5 @@
version: 1.0.{build} version: 7.6.{build}
image: Visual Studio 2015 image: Visual Studio 2017
clone_depth: 1
platform: platform:
- x64 - x64
@ -14,38 +11,40 @@ configuration:
install: install:
- if "%platform%"=="x64" set archi=amd64 - if "%platform%"=="x64" set archi=amd64
- if "%platform%"=="Win32" set archi=x86 - if "%platform%"=="x64" set platform_input=x64
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
- if "%platform%"=="Win32" set archi=x86
- if "%platform%"=="Win32" set platform_input=Win32
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
build:
verbosity: minimal
build_script: build_script:
- cd c:\projects\notepad-plus-plus\scintilla\win32 - cd "%APPVEYOR_BUILD_FOLDER%"\scintilla\win32
- if "%configuration%"=="Unicode Debug" set scintilla_debug=DEBUG=1 - if "%configuration%"=="Unicode Debug" set scintilla_debug=DEBUG=1
- if "%configuration%"=="Unicode Release" set scintilla_debug= - if "%configuration%"=="Unicode Release" set scintilla_debug=
- nmake NOBOOST=1 %scintilla_debug% -f scintilla.mak - nmake SUPPORT_XP=1 %scintilla_debug% -f scintilla.mak
- cd c:\projects\notepad-plus-plus\PowerEditor\visual.net\ - cd "%APPVEYOR_BUILD_FOLDER%"\PowerEditor\visual.net\
- msbuild notepadPlus.vcxproj /p:configuration="%configuration%" /p:platform="%platform%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - msbuild notepadPlus.vcxproj /p:configuration="%configuration%" /p:platform="%platform_input%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
after_build: after_build:
- cd c:\projects\notepad-plus-plus\ - cd "%APPVEYOR_BUILD_FOLDER%"
- ps: >- - ps: >-
$nppFileName = "Notepad++.$env:PLATFORM.$env:CONFIGURATION.exe" $nppFileName = "Notepad++.$env:PLATFORM_INPUT.$env:CONFIGURATION.exe"
if ($env:PLATFORM -eq "x64" -and $env:CONFIGURATION -eq "Unicode Release") { if ($env:PLATFORM_INPUT -eq "x64" -and $env:CONFIGURATION -eq "Unicode Release") {
Push-AppveyorArtifact "PowerEditor\bin64\Notepad++.exe" -FileName "$nppFileName" Push-AppveyorArtifact "PowerEditor\bin64\Notepad++.exe" -FileName "$nppFileName"
} }
if ($env:PLATFORM -eq "x64" -and $env:CONFIGURATION -eq "Unicode Debug") { if ($env:PLATFORM_INPUT -eq "x64" -and $env:CONFIGURATION -eq "Unicode Debug") {
Push-AppveyorArtifact "PowerEditor\visual.net\x64\Unicode Debug\Notepad++.exe" -FileName "$nppFileName" Push-AppveyorArtifact "PowerEditor\visual.net\x64\Unicode Debug\Notepad++.exe" -FileName "$nppFileName"
} }
if ($env:PLATFORM -eq "Win32" -and $env:CONFIGURATION -eq "Unicode Release") { if ($env:PLATFORM_INPUT -eq "Win32" -and $env:CONFIGURATION -eq "Unicode Release") {
Push-AppveyorArtifact "PowerEditor\bin\Notepad++.exe" -FileName "$nppFileName" Push-AppveyorArtifact "PowerEditor\bin\Notepad++.exe" -FileName "$nppFileName"
} }
if ($env:PLATFORM -eq "Win32" -and $env:CONFIGURATION -eq "Unicode Debug") { if ($env:PLATFORM_INPUT -eq "Win32" -and $env:CONFIGURATION -eq "Unicode Debug") {
Push-AppveyorArtifact "PowerEditor\visual.net\Unicode Debug\Notepad++.exe" -FileName "$nppFileName" Push-AppveyorArtifact "PowerEditor\visual.net\Unicode Debug\Notepad++.exe" -FileName "$nppFileName"
} }