f10bd1279d
We need to remove the directory containing sh.exe from the PATH as
otherwise mingw32-make seems to use it and not cmd.exe for executing the
commands in the makefile, but the wrong directory was being removed in
appveyor.yml, having no effect.
Fix this and undo 5f2ccde269 which
compensated for it by (almost) clearing the PATH entirely which, in
turn, broke one of our unit tests (and could break other things in the
future, as having an empty PATH is rather unexpected).
Also use the full path for head program now that its directory is not in
the PATH any more. Alternative could be to use PowerShell, but while
powershell -Command "'gcc','mingw32-make','ar'|%%{ iex \"$_ --version\"|select -first 1 }"
does work, it looks really ugly, so avoid it for now.
See https://github.com/wxWidgets/wxWidgets/pull/142
See #17274.
53 lines
1.8 KiB
Batchfile
53 lines
1.8 KiB
Batchfile
goto %TOOLSET%
|
|
|
|
:msbuild
|
|
cd build\msw
|
|
msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wx_vc12.sln
|
|
cd ..\..\tests
|
|
msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_vc12.sln
|
|
msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_gui_vc12.sln
|
|
goto :eof
|
|
|
|
:nmake
|
|
cd build\msw
|
|
call "C:\Program Files (x86)\Microsoft Visual Studio %VS%\VC\vcvarsall.bat" %ARCH%
|
|
nmake -f makefile.vc BUILD=%BUILD%
|
|
cd ..\..\tests
|
|
nmake -f makefile.vc BUILD=%BUILD%
|
|
goto :eof
|
|
|
|
:mingw
|
|
cd build\msw
|
|
path C:\MinGW\bin;%path%
|
|
echo --- Tools versions:
|
|
g++ --version | "C:\Program Files\Git\usr\bin\head" -n 1
|
|
mingw32-make --version | "C:\Program Files\Git\usr\bin\head" -n 1
|
|
ar --version | "C:\Program Files\Git\usr\bin\head" -n 1
|
|
echo.
|
|
echo --- Starting the build
|
|
echo.
|
|
mingw32-make -f makefile.gcc setup_h BUILD=debug SHARED=0
|
|
mingw32-make -j3 -f makefile.gcc BUILD=debug SHARED=0
|
|
cd ..\..\tests
|
|
mingw32-make -j3 -f makefile.gcc BUILD=debug SHARED=0
|
|
goto :eof
|
|
|
|
:msys2
|
|
path C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%path%
|
|
set CHERE_INVOKING=yes
|
|
:: Workaround for "configure: Bad file descriptor"
|
|
perl -i".bak" -pe "s/^test -n \".DJDIR\"/#$&/" configure
|
|
bash -lc "g++ --version"
|
|
bash -lc "CXXFLAGS=-Wno-deprecated-declarations ./configure --disable-optimise && make -j3 && make -j3 -C tests"
|
|
goto :eof
|
|
|
|
:cygwin
|
|
C:\cygwin\setup-x86.exe -qgnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P libjpeg-devel -P libpng-devel -P libtiff-devel -P libexpat-devel
|
|
path c:\cygwin\bin;%path%
|
|
set CHERE_INVOKING=yes
|
|
:: Workaround for "configure: Bad file descriptor"
|
|
perl -i".bak" -pe "s/^test -n \".DJDIR\"/#$&/" configure
|
|
bash -lc "g++ --version"
|
|
bash -lc "LDFLAGS=-L/usr/lib/w32api ./configure --disable-optimise --disable-shared && make -j3 && make -j3 -C tests"
|
|
goto :eof
|