Skip to content

Commit 56f65b0

Browse files
committed
adapt appveyor build to VS2019
1 parent 2466836 commit 56f65b0

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ install_modules: d_modules vdextension vdext15 visualdwizard dcxxfilt
248248

249249
d_modules: prerequisites visuald_vs visuald_vs_x64 vdserver dmdserver
250250

251+
appveyor: d_modules cv2pdb_vs16 mago_vs16 magogc
252+
251253
install_only:
252254
if not exist ..\downloads\nul md ..\downloads
253255
cd nsis && "$(NSIS)\makensis" /V1 "/DCONFIG=$(CONFIG)" "/DCONFIG_DMDSERVER=$(CONFIG_DMDSERVER)" $(NSIS_ARGS) visuald.nsi

appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,17 @@ build_script:
143143
# can build dbuild15 and dparser only with VS2017
144144
- if "%VS%"=="15" nuget restore vdc\abothe\VDServer.sln
145145
- if "%VS%"=="15" nmake "CONFIG=%CONFIG%" "CONFIG_DMDSERVER=%CONFIG_DMDSERVER%" install_vs_only_vs2017
146-
- if not "%VS%"=="15" nmake "CONFIG=%CONFIG%" "CONFIG_DMDSERVER=%CONFIG_DMDSERVER%" install_vs_no_vs2017
146+
- if not "%VS%"=="15" nmake "CONFIG=%CONFIG%" "CONFIG_DMDSERVER=%CONFIG_DMDSERVER%" appveyor
147147

148148
after_build:
149149
# publish as artifact
150150
- cd c:\projects
151151
- 7z a logs_and_symbols.7z -r visuald\bin\*.pdb visuald\bin\*.html
152-
- for %%I in (downloads\*.exe) do (set BUILD_EXE=%%I && set ARTIFACT=%%~dpnI-%APPVEYOR_BUILD_NUMBER%-vs%VS%.exe)
153-
- copy %BUILD_EXE% %ARTIFACT%
152+
# - for %%I in (downloads\*.exe) do (set BUILD_EXE=%%I && set ARTIFACT=%%~dpnI-%APPVEYOR_BUILD_NUMBER%-vs%VS%.exe)
153+
# - copy %BUILD_EXE% %ARTIFACT%
154+
# Push-AppveyorArtifact $Env:ARTIFACT
154155
- ps: |
155156
echo 'Creating artifacts...'
156-
Push-AppveyorArtifact $Env:ARTIFACT
157157
Push-AppveyorArtifact ..\cv2pdb\trunk\bin\Release\cv2pdb.exe
158158
Push-AppveyorArtifact logs_and_symbols.7z
159159

0 commit comments

Comments
 (0)