From baf19fe9e7dd689597b3320202efeb69c61838a8 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 30 Aug 2016 22:43:51 +0100 Subject: Appveyor: don't list directories that may not exist during build. --- appveyor.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cbca569f..f5222f7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,17 +45,16 @@ build: install: # Show compiled files restored from cache - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\bin_bbackupd.dir - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\bin_bbackupd.dir\%CONFIGURATION% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%\%CONFIGURATION% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%\%CONFIGURATION%\ALL_BUILD - - - cinst strawberryperl 7zip.commandline cmake - - # - dir "C:\Program Files\Microsoft SDKs\Windows" - # - dir "C:\Program Files\Microsoft SDKs\Windows\v7.1" - # - dir "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin" + # test_bbackupd needs 7zip to extract tar archives on Windows: + - cinst -y --limit-output 7zip.commandline + # Install cmake.portable instead of cmake, to get it on the path again: + # http://disq.us/p/xdknrt + - dir "c:\Program Files" + - dir "c:\Program Files (x86)" + # We don't need strawberryperl on AppVeyor because there is already a Perl in c:\Perl. + # If you are doing this on a fresh box for development, you would probably want to + # install Chocolatey and then run: + # cinst -y cmake strawberryperl git vim visualstudio2012wdx - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86' @@ -109,9 +108,6 @@ install: - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-%PCRE_VERSION% - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-%PLATFORM% - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\bin_bbackupd.dir - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%\%CONFIGURATION% test_script: - cd %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build -- cgit v1.2.3