Skip to content

Commit

Permalink
appveyor: Fix some problems
Browse files Browse the repository at this point in the history
* Exit immediately when nmake fails.
* Remove an unnecessary line.
* Update MSYS2 packages before build, if %compiler% is "msys2".
  Now MSYS2 is used for building static-linked Windows binaries.
  Libraries should be kept up to date to avoid security risks.
  • Loading branch information
k-takata committed Jun 7, 2017
1 parent 6117fa3 commit cff5d1d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions win32/appveyor.bat
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ copy %ICONV_BUILD_DIR%\msvc10\iconv.dll %APPVEYOR_BUILD_FOLDER% > nul
:: Build ctags with nmake
@echo on
cd %APPVEYOR_BUILD_FOLDER%
nmake -f mk_mvc.mak WITH_ICONV=yes ICONV_DIR=%ICONV_DIR% PDB=yes
nmake -f mk_mvc.mak WITH_ICONV=yes ICONV_DIR=%ICONV_DIR% PDB=yes || exit 1

:: Backup VC binaries
mkdir vc
Expand Down Expand Up @@ -120,8 +120,10 @@ goto :eof
@echo on
PATH C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%
set CHERE_INVOKING=yes
:: Synchronize package databases and upgrade the core system
C:\%MSYS2_DIR%\usr\bin\pacman --noconfirm --noprogressbar -Suuy
:: Install and update necessary packages
bash -lc "for i in {1..3}; do pacman --noconfirm -S mingw-w64-%MSYS2_ARCH%-{python3-sphinx,jansson,libxml2,libyaml} && break || sleep 15; done"
bash -lc "for i in {1..3}; do pacman --noconfirm --noprogressbar -Su mingw-w64-%MSYS2_ARCH%-{python3-sphinx,jansson,libxml2,libyaml} && break || sleep 15; done"

bash -lc "./autogen.sh"
:: Patching configure.
Expand Down Expand Up @@ -210,7 +212,6 @@ goto :eof
c:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P dos2unix,libiconv-devel
PATH c:\cygwin\bin;%PATH%
set CHERE_INVOKING=yes
bash -lc ""
bash -lc "./autogen.sh"
:: Patching configure.
:: Workaround for "./configure: line 557: 0: Bad file descriptor"
Expand Down

0 comments on commit cff5d1d

Please sign in to comment.