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

ruby-changes:29242

From: nobu <ko1@a...>
Date: Fri, 14 Jun 2013 13:40:44 +0900 (JST)
Subject: [ruby-changes:29242] nobu:r41294 (trunk): update config files

nobu	2013-06-14 13:40:32 +0900 (Fri, 14 Jun 2013)

  New Revision: 41294

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41294

  Log:
    update config files
    
    * .travis.yml (before_script): update config files.
    * common.mk ($(srcdir)/tool/config.{guess,sub}): use get-config_files.
    * tool/config_files.rb: split get-config_files.

  Added files:
    trunk/tool/get-config_files
  Modified files:
    trunk/.travis.yml
    trunk/ChangeLog
    trunk/common.mk
    trunk/tool/config_files.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 41293)
+++ ChangeLog	(revision 41294)
@@ -1,11 +1,17 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
-Fri Jun 14 13:01:49 2013  Nobuyoshi Nakada  <nobu@r...>
+Fri Jun 14 13:40:27 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* .travis.yml (before_script): update config files.
+
+	* common.mk ($(srcdir)/tool/config.{guess,sub}): use get-config_files.
+
+	* tool/config_files.rb: split get-config_files.
 
 	* common.mk (update-config_files): rule to download config files.
 
 	* tool/config.guess, tool/config.sub: remove and download from the
 	  upstream.
 
-	* tool/get-config_files: download config files from GNU.
+	* tool/config_files.rb: download config files from GNU.
 
 Fri Jun 14 12:21:20 2013  Nobuyoshi Nakada  <nobu@r...>
 
Index: common.mk
===================================================================
--- common.mk	(revision 41293)
+++ common.mk	(revision 41294)
@@ -1024,9 +1024,9 @@ up:: update-config_files https://github.com/ruby/ruby/blob/trunk/common.mk#L1024
 
 update-config_files: $(srcdir)/tool/config.guess $(srcdir)/tool/config.sub
 $(srcdir)/tool/config.guess:
-	$(Q) $(BASERUBY) -C $(@D) config_files.rb $(@F)
+	$(Q) $(BASERUBY) -C $(@D) get-config_files $(@F)
 $(srcdir)/tool/config.sub:
-	$(Q) $(BASERUBY) -C $(@D) config_files.rb $(@F)
+	$(Q) $(BASERUBY) -C $(@D) get-config_files $(@F)
 
 info: info-program info-libruby_a info-libruby_so info-arch
 info-program:
Index: tool/config_files.rb
===================================================================
--- tool/config_files.rb	(revision 41293)
+++ tool/config_files.rb	(revision 41294)
@@ -1,4 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/tool/config_files.rb#L1
-#!/usr/bin/ruby
 require 'open-uri'
 
 ConfigFiles = "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=%s;hb=HEAD"
@@ -7,7 +6,3 @@ def ConfigFiles.download(name, dir = nil https://github.com/ruby/ruby/blob/trunk/tool/config_files.rb#L6
   file = dir ? File.join(dir, name) : name
   open(file, "wb", 0755) {|f| f.write(data)}
 end
-
-if $0 == __FILE__
-  ARGV.each {|n| ConfigFiles.download(n)}
-end

Property changes on: tool/config_files.rb
___________________________________________________________________
Deleted: svn:executable
   - *

Index: tool/get-config_files
===================================================================
--- tool/get-config_files	(revision 0)
+++ tool/get-config_files	(revision 41294)
@@ -0,0 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/tool/get-config_files#L1
+#!/usr/bin/ruby
+require File.expand_path('../config_files', __FILE__)
+ARGV.each {|n| ConfigFiles.download(n)}

Property changes on: tool/get-config_files
___________________________________________________________________
Added: svn:eol-style
   + LF
Added: svn:executable
   + *

Index: .travis.yml
===================================================================
--- .travis.yml	(revision 41293)
+++ .travis.yml	(revision 41294)
@@ -38,6 +38,7 @@ install: "sudo apt-get -qq build-dep rub https://github.com/ruby/ruby/blob/trunk/.travis.yml#L38
 # like  test-all, test-rubyspec.   This is  because  they take  too much  time,
 # enough for Travis to shut down the VM as being stalled.
 before_script:
+  - "make -f common.mk BASERUBY=ruby srcdir=. update-config_files"
   - "autoconf"
   - "./configure --with-gcc=$CC"
   - "make -sj encs"

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

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