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

ruby-changes:46741

From: nobu <ko1@a...>
Date: Tue, 23 May 2017 21:42:54 +0900 (JST)
Subject: [ruby-changes:46741] nobu:r58856 (trunk): out-of-place on travis

nobu	2017-05-23 21:42:40 +0900 (Tue, 23 May 2017)

  New Revision: 58856

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

  Log:
    out-of-place on travis
    
    * .travis.yml (before_script, script): out-of-place build.

  Modified files:
    trunk/.travis.yml
Index: .travis.yml
===================================================================
--- .travis.yml	(revision 58855)
+++ .travis.yml	(revision 58856)
@@ -35,24 +35,26 @@ before_script: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L35
   - "uname -r"
   - "rm -fr .ext autom4te.cache"
   - "echo $TERM"
-  - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files"
-  - "autoconf"
-  - "mkdir config_1st config_2nd"
-  - "./configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG"
-  - "cp -pr config.status .ext/include config_1st"
-  - "make reconfig"
-  - "cp -pr config.status .ext/include config_2nd"
-  - "diff -ru config_1st config_2nd"
+  - "> config.status"
+  - "sed -f tool/prereq.status Makefile.in common.mk > Makefile"
+  - "make update-config_files"
   - "make touch-unicode-files"
-  - "make after-update BASERUBY=ruby BOOTSTRAPRUBY='$(BASERUBY)' MINIRUBY='$(BASERUBY)' UNICODE_FILES=. PREP= CC=false"
-  - "make -s $JOBS"
+  - "make srcs UNICODE_FILES=."
   - "make update-rubyspec"
-  - "requests="
-  - "for req in ${RUBYSPEC_PULL_REQUEST//,/ }; do
+  - "requests=; for req in ${RUBYSPEC_PULL_REQUEST//,/ }; do
       requests=\"$requests +refs/pull/$req/merge:\";
     done"
   - "${requests:+git -C spec/rubyspec -c user.email=none -c user.name=none pull --no-edit origin $requests}"
   - "${requests:+git -C spec/rubyspec log --oneline origin/master..@}"
+  - "rm config.status Makefile rbconfig.rb .rbconfig.time"
+  - "mkdir build config_1st config_2nd"
+  - "cd build"
+  - "../configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG"
+  - "cp -pr config.cache config.status .ext/include ../config_1st"
+  - "make reconfig"
+  - "cp -pr config.cache config.status .ext/include ../config_2nd"
+  - "(cd .. && exec diff -ru config_1st config_2nd)"
+  - "make -s $JOBS"
 
 script:
   - "make -s test TESTOPTS=--color=never"

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

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