Skip to content

Commit

Permalink
Use the generated SciLexer.dll which contains regExpr of Boost
Browse files Browse the repository at this point in the history
Currently in Appveyor build, we download SciLixer.dll from the latest release for Unit tests (of function list especially).
In PR notepad-plus-plus#9574 the boost is included in Appveyor build.

In this PR:
- Remove the download last release part from Appveyor script and use the generated SciLexer.dll
- Remove SUPPORT_XP from the script

Fix notepad-plus-plus#9581, close notepad-plus-plus#9591
  • Loading branch information
chcg authored and donho committed Feb 27, 2021
1 parent d6c6a49 commit 10b091b
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ build_script:
- cd "%APPVEYOR_BUILD_FOLDER%"\scintilla\win32
- if "%configuration%"=="Unicode Debug" set scintilla_debug=DEBUG=1
- if "%configuration%"=="Unicode Release" set scintilla_debug=
- if "%archi%"=="x86" nmake SUPPORT_XP=1 %scintilla_debug% BOOSTPATH=C:\Libraries\boost_1_69_0\ BOOSTREGEXLIBPATH=C:\Libraries\boost_1_69_0\lib32-msvc-14.1\ -f scintilla.mak
- if "%archi%"=="amd64" nmake SUPPORT_XP=1 %scintilla_debug% BOOSTPATH=C:\Libraries\boost_1_69_0\ BOOSTREGEXLIBPATH=C:\Libraries\boost_1_69_0\lib64-msvc-14.1\ -f scintilla.mak
- if "%archi%"=="x86" nmake %scintilla_debug% BOOSTPATH=C:\Libraries\boost_1_69_0\ BOOSTREGEXLIBPATH=C:\Libraries\boost_1_69_0\lib32-msvc-14.1\ -f scintilla.mak
- if "%archi%"=="amd64" nmake %scintilla_debug% BOOSTPATH=C:\Libraries\boost_1_69_0\ BOOSTREGEXLIBPATH=C:\Libraries\boost_1_69_0\lib64-msvc-14.1\ -f scintilla.mak
- if "%Platform%"=="mingw-w64_810_X64" mingw32-make -j%NUMBER_OF_PROCESSORS%
- cd "%APPVEYOR_BUILD_FOLDER%"\PowerEditor\visual.net\
- if "%archi%" NEQ "" msbuild notepadPlus.vcxproj /p:configuration="%configuration%" /p:platform="%platform_input%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
Expand Down Expand Up @@ -68,11 +68,8 @@ after_build:
if ($env:PLATFORM_INPUT -eq "Win32" -and $env:CONFIGURATION -eq "Unicode Debug") {
Push-AppveyorArtifact "PowerEditor\visual.net\Unicode Debug\Notepad++.exe" -FileName "$nppFileName"
Start-FileDownload 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v7.9/npp.7.9.portable.minimalist.7z'
7z x -y npp.7.9.portable.minimalist.7z | Out-Null
#take SciLexer.dll from downloaded version due to dependency of the functionlist tests on a version build with boost regex
#what is not the case for the dll build on appveyor CI (would either need a very time consuming boost build or usage of nuget packages)
Copy-Item "$env:APPVEYOR_BUILD_FOLDER\SciLexer.dll" -Destination "$env:APPVEYOR_BUILD_FOLDER\PowerEditor\bin"
#take SciLexer.dll from build since dependency of the functionlist tests on a version build with boost regex is fullfilled also for appveyor
Copy-Item "$env:APPVEYOR_BUILD_FOLDER\scintilla\bin\SciLexer.dll" -Destination "$env:APPVEYOR_BUILD_FOLDER\PowerEditor\bin"
Copy-Item "$env:APPVEYOR_BUILD_FOLDER\PowerEditor\visual.net\Unicode Debug\Notepad++.exe" -Destination "$env:APPVEYOR_BUILD_FOLDER\PowerEditor\bin"
Copy-Item "$env:APPVEYOR_BUILD_FOLDER\PowerEditor\src\langs.model.xml" -Destination "$env:APPVEYOR_BUILD_FOLDER\PowerEditor\bin"
Copy-Item "$env:APPVEYOR_BUILD_FOLDER\PowerEditor\src\stylers.model.xml" -Destination "$env:APPVEYOR_BUILD_FOLDER\PowerEditor\bin"
Expand Down

0 comments on commit 10b091b

Please sign in to comment.