[前][次][番号順一覧][スレッド一覧]

ruby-changes:41564

From: nobu <ko1@a...>
Date: Sat, 23 Jan 2016 22:26:27 +0900 (JST)
Subject: [ruby-changes:41564] nobu:r53638 (trunk): appveyor.yml: simplify

nobu	2016-01-23 22:27:13 +0900 (Sat, 23 Jan 2016)

  New Revision: 53638

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53638

  Log:
    appveyor.yml: simplify
    
    * appveyor.yml (install, build_script): simplify by using same opt
      dir for libressl and zlib.

  Modified files:
    trunk/appveyor.yml
Index: appveyor.yml
===================================================================
--- appveyor.yml	(revision 53637)
+++ appveyor.yml	(revision 53638)
@@ -8,22 +8,27 @@ install: https://github.com/ruby/ruby/blob/trunk/appveyor.yml#L8
   - 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]