Revert "try fixing appveyor"

This reverts commit 30dfe12910.
This commit is contained in:
Jeff Becker 2016-10-05 11:03:51 -04:00
parent 30dfe12910
commit 4a3bf46c30

View File

@ -22,7 +22,7 @@ init:
if exist \OpenSSL rmdir /S /Q \OpenSSL if exist \OpenSSL rmdir /S /Q \OpenSSL
environment: environment:
BOOST_ROOT: C:\Libraries\boost_1_60_0 BOOST_ROOT: C:\Libraries\boost_1_59_0
MINIUPNPC: miniupnpc-1.9.20151026 MINIUPNPC: miniupnpc-1.9.20151026
OPENSSL: OpenSSL_1_0_2e OPENSSL: OpenSSL_1_0_2e
ZLIB: zlib-1.2.8 ZLIB: zlib-1.2.8
@ -167,7 +167,7 @@ build_script:
echo "bitness=%bitness%; static=%static%; dll=%dll%; type=%type%; generator=%generator%; variant=%variant%; cmake=%cmake%; cmake_extra=%cmake_extra%" echo "bitness=%bitness%; static=%static%; dll=%dll%; type=%type%; generator=%generator%; variant=%variant%; cmake=%cmake%; cmake_extra=%cmake_extra%"
- if not defined msvc ( - if not defined msvc (
C:\msys64\usr\bin\bash -lc "export PATH=/mingw%bitness%/bin:/usr/bin && cd /c/projects/build && CC=/mingw%bitness%/bin/gcc.exe CXX=/mingw%bitness%/bin/g++.exe /usr/bin/cmake /c/projects/i2pd/build -G 'Unix Makefiles' -DBOOSTROOT=/mingw%bitness%/ -DWITH_AESNI=ON -DWITH_UPNP=ON %cmake% %cmake_extra% -DWITH_STATIC=%static% -DWITH_HARDENING=ON -DCMAKE_INSTALL_PREFIX:PATH=/c/projects/instdir -DCMAKE_FIND_ROOT_PATH=/mingw%bitness% && make install" C:\msys64\usr\bin\bash -lc "export PATH=/mingw%bitness%/bin:/usr/bin && cd /c/projects/build && CC=/mingw%bitness%/bin/gcc.exe CXX=/mingw%bitness%/bin/g++.exe /usr/bin/cmake /c/projects/i2pd/build -G 'Unix Makefiles' -DWITH_AESNI=ON -DWITH_UPNP=ON %cmake% %cmake_extra% -DWITH_STATIC=%static% -DWITH_HARDENING=ON -DCMAKE_INSTALL_PREFIX:PATH=/c/projects/instdir -DCMAKE_FIND_ROOT_PATH=/mingw%bitness% && make install"
&& 7z a -tzip -mx9 -mmt C:\projects\i2pd\i2pd-mingw-win%bitness%-%type%.zip C:\projects\instdir\* C:\msys64\mingw%bitness%\bin\zlib1.dll C:\msys64\mingw%bitness%\bin\*eay32.dll && 7z a -tzip -mx9 -mmt C:\projects\i2pd\i2pd-mingw-win%bitness%-%type%.zip C:\projects\instdir\* C:\msys64\mingw%bitness%\bin\zlib1.dll C:\msys64\mingw%bitness%\bin\*eay32.dll
) )
- rem We are fine with multiple generated configurations in MS solution. Will use later - rem We are fine with multiple generated configurations in MS solution. Will use later