1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-06-14 04:40:32 +00:00
parent bbe047d4c7
commit a53cb1a05d
5 changed files with 14 additions and 9 deletions

View file

@ -38,6 +38,7 @@ install: "sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null"
# like test-all, test-rubyspec. This is because they take too much time, # like test-all, test-rubyspec. This is because they take too much time,
# enough for Travis to shut down the VM as being stalled. # enough for Travis to shut down the VM as being stalled.
before_script: before_script:
- "make -f common.mk BASERUBY=ruby srcdir=. update-config_files"
- "autoconf" - "autoconf"
- "./configure --with-gcc=$CC" - "./configure --with-gcc=$CC"
- "make -sj encs" - "make -sj encs"

View file

@ -1,11 +1,17 @@
Fri Jun 14 13:01:49 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jun 14 13:40:27 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* .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. * common.mk (update-config_files): rule to download config files.
* tool/config.guess, tool/config.sub: remove and download from the * tool/config.guess, tool/config.sub: remove and download from the
upstream. 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@ruby-lang.org> Fri Jun 14 12:21:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>

View file

@ -1024,9 +1024,9 @@ up:: update-config_files
update-config_files: $(srcdir)/tool/config.guess $(srcdir)/tool/config.sub update-config_files: $(srcdir)/tool/config.guess $(srcdir)/tool/config.sub
$(srcdir)/tool/config.guess: $(srcdir)/tool/config.guess:
$(Q) $(BASERUBY) -C $(@D) config_files.rb $(@F) $(Q) $(BASERUBY) -C $(@D) get-config_files $(@F)
$(srcdir)/tool/config.sub: $(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: info-program info-libruby_a info-libruby_so info-arch
info-program: info-program:

5
tool/config_files.rb Executable file → Normal file
View file

@ -1,4 +1,3 @@
#!/usr/bin/ruby
require 'open-uri' require 'open-uri'
ConfigFiles = "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=%s;hb=HEAD" 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)
file = dir ? File.join(dir, name) : name file = dir ? File.join(dir, name) : name
open(file, "wb", 0755) {|f| f.write(data)} open(file, "wb", 0755) {|f| f.write(data)}
end end
if $0 == __FILE__
ARGV.each {|n| ConfigFiles.download(n)}
end

3
tool/get-config_files Executable file
View file

@ -0,0 +1,3 @@
#!/usr/bin/ruby
require File.expand_path('../config_files', __FILE__)
ARGV.each {|n| ConfigFiles.download(n)}