From dd4374c3a4970c4fcfd13780f6df39909ff43313 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 23 Jan 2016 13:27:13 +0000 Subject: appveyor.yml: simplify * appveyor.yml (install, build_script): simplify by using same opt dir for libressl and zlib. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- appveyor.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'appveyor.yml') diff --git a/appveyor.yml b/appveyor.yml index ae08e7e3d7..e01f673022 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,22 +8,27 @@ install: - ruby --version - 'cl' - SET + - mkdir \usr\local\bin + - mkdir \usr\local\include + - mkdir \usr\local\lib - ps: Start-FileDownload 'http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.2.5-windows.zip' - 7z x libressl-2.2.5-windows.zip - - copy libressl-2.2.5-windows\x64\libcrypto-35.lib libressl-2.2.5-windows\x64\crypto.lib - - copy libressl-2.2.5-windows\x64\libssl-35.lib libressl-2.2.5-windows\x64\ssl.lib - - mkdir \usr\local\bin + - copy libressl-2.2.5-windows\x64\libcrypto-35.lib \usr\local\lib\crypto.lib + - copy libressl-2.2.5-windows\x64\libssl-35.lib \usr\local\lib\ssl.lib - copy libressl-2.2.5-windows\x64\libcrypto-35.dll \usr\local\bin - copy libressl-2.2.5-windows\x64\libssl-35.dll \usr\local\bin + - xcopy /e libressl-2.2.5-windows\include \usr\local\include - ps: Start-FileDownload 'http://zlib.net/zlib128.zip' - 7z x zlib128.zip - cd zlib-1.2.8 - nmake -f win32/Makefile.msc - - copy zlib1.dll .. - copy zlib1.dll \usr\local\bin + - copy zlib.lib \usr\local\lib + - copy zconf.h \usr\local\include + - copy zlib.h \usr\local\include build_script: - cd %APPVEYOR_BUILD_FOLDER% - - win32\configure.bat --without-ext=+,dbm,gdbm,readline,tk* --with-openssl-include=/projects/%APPVEYOR_PROJECT_SLUG%/libressl-2.2.5-windows/include --with-openssl-lib=/projects/%APPVEYOR_PROJECT_SLUG%/libressl-2.2.5-windows/x64 --with-zlib-include=/projects/%APPVEYOR_PROJECT_SLUG%/zlib-1.2.8 --with-zlib-lib=/projects/%APPVEYOR_PROJECT_SLUG%/zlib-1.2.8 + - win32\configure.bat --without-ext=+,dbm,gdbm,readline,tk* --with-opt-dir=/usr/local - nmake -l up - nmake -l - nmake install-nodoc -- cgit v1.2.3