summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-23 09:49:42 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-23 09:49:42 +0000
commit7a05e0ae9f1983bb6446ef64092b58cbaa26bc45 (patch)
tree6bc9ea314a63d2d90b8aa431bc4f540aea61b21f
parent6f3e8df133c7785ff6bb6f18d1faec81fefb3999 (diff)
* tool/config_files.rb: rename class ConfigFiles to Downloader.
* tool/get-config_files: ditto. * tool/make-snapshot: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--tool/downloader.rb (renamed from tool/config_files.rb)4
-rwxr-xr-xtool/get-config_files4
-rwxr-xr-xtool/make-snapshot6
4 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 22f3e80486..a0feda9eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 23 18:44:45 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * tool/config_files.rb: rename class ConfigFiles to Downloader.
+ * tool/get-config_files: ditto.
+ * tool/make-snapshot: ditto.
+
Mon Jun 23 18:03:13 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* tool/rbinstall.rb: support to install bundle gems.
diff --git a/tool/config_files.rb b/tool/downloader.rb
index 4d6cc683db..83554fb19d 100644
--- a/tool/config_files.rb
+++ b/tool/downloader.rb
@@ -1,7 +1,7 @@
require 'open-uri'
-ConfigFiles = "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=%s;hb=HEAD"
-def ConfigFiles.download(name, dir = nil)
+Downloader = "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=%s;hb=HEAD"
+def Downloader.download(name, dir = nil)
uri = URI(self % name)
data = uri.read
file = dir ? File.join(dir, name) : name
diff --git a/tool/get-config_files b/tool/get-config_files
index 7828dade99..a849c2b1e3 100755
--- a/tool/get-config_files
+++ b/tool/get-config_files
@@ -1,9 +1,9 @@
#!/usr/bin/ruby
-require File.expand_path('../config_files', __FILE__)
+require File.expand_path('../downloader', __FILE__)
ARGV.each {|n|
STDOUT.print "Downloading #{n}..."; STDOUT.flush
begin
- ConfigFiles.download(n)
+ Downloader.download(n)
STDOUT.puts
rescue => e
STDOUT.puts
diff --git a/tool/make-snapshot b/tool/make-snapshot
index f154ac435a..17be5eaed2 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -218,11 +218,11 @@ def package(rev, destdir)
%w[config.guess config.sub].each do |conf|
next if File.exist?("tool/#{conf}")
begin
- require File.expand_path("config_files", $tooldir)
+ require File.expand_path("downloader", $tooldir)
rescue LoadError
- abort "Error!!! Copy 'config_files.rb' from 'tool' directory of the recent ruby repository!"
+ abort "Error!!! Copy 'downloader.rb' from 'tool' directory of the recent ruby repository!"
end
- ConfigFiles.download(conf, "tool")
+ Downloader.download(conf, "tool")
end
File.open(clean.add("cross.rb"), "w") do |f|
f.puts "Object.__send__(:remove_const, :CROSS_COMPILING) if defined?(CROSS_COMPILING)"