merge revision(s) 47248: [Backport #10161]

	* common.mk (Doxyfile): revert r43888, not to require preinstalled
	  ruby.  [ruby-core:64488] [Bug #10161]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 20 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 7b719d64ed..7efd56df51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 12 11:22:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (Doxyfile): revert r43888, not to require preinstalled
+	  ruby.  [ruby-core:64488] [Bug #10161]
+
 Fri Sep 12 11:15:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_reopen): create a new, temporary FD via rb_sysopen and
diff --git a/common.mk b/common.mk
index 78c17849c9..e3df7d05d2 100644
--- a/common.mk
+++ b/common.mk
@@ -206,7 +206,7 @@ $(CAPIOUT)/.timestamp: Doxyfile $(PREP)
 Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
 	$(ECHO) generating $@
 	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
-	--srcdir="$(srcdir)" --miniruby="$(BASERUBY)"
+	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
 
 program: showflags $(PROGRAM)
 wprogram: showflags $(WPROGRAM)
diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 56e1b9f512..616c5f7fe4 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -31,6 +31,9 @@ parser = OptionParser.new {|opts|
   opts.on("--doxygen", "Doxygen format") do
     self.output = :doxygen
   end
+  opts.on("--modified", "modified time") do
+    self.output = :modified
+  end
   opts.on("-q", "--suppress_not_found") do
     @suppress_not_found = true
   end
@@ -44,7 +47,7 @@ rescue VCS::NotFoundError => e
   abort "#{File.basename(Program)}: #{e.message}" unless @suppress_not_found
 else
   begin
-    last, changed = vcs.get_revisions(ARGV.shift)
+    last, changed, modified = vcs.get_revisions(ARGV.shift)
   rescue => e
     abort "#{File.basename(Program)}: #{e.message}" unless @suppress_not_found
     exit false
@@ -58,6 +61,8 @@ when :revision_h
   puts "#define RUBY_REVISION #{changed.to_i}"
 when :doxygen
   puts "r#{changed}/r#{last}"
+when :modified
+  puts modified.strftime('%Y-%m-%dT%H:%M:%S%z')
 else
   raise "unknown output format `#{@output}'"
 end
diff --git a/tool/vcs.rb b/tool/vcs.rb
index 6e86cfb07e..198df284d1 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -1,7 +1,5 @@
 # vcs
 
-require 'time'
-
 ENV.delete('PWD')
 
 unless File.respond_to? :realpath
@@ -45,7 +43,11 @@ class VCS
     last, changed, modified, *rest = Dir.chdir(@srcdir) {self.class.get_revisions(path)}
     last or raise "last revision not found"
     changed or raise "changed revision not found"
-    modified &&= Time.parse(modified)
+    if modified
+      /\A(\d+)-(\d+)-(\d+)\D(\d+):(\d+):(\d+(?:\.\d+)?)\s*(?:Z|([-+]\d\d)(\d\d))\z/ =~ modified or
+        raise "unknown time format - #{modified}"
+      modified = Time.mktime(*($~[1..6] + [$7 ? "#{$7}:#{$8}" : "+00:00"]))
+    end
     return last, changed, modified, *rest
   end
 
@@ -96,16 +98,16 @@ class VCS
     register(".git")
 
     def self.get_revisions(path)
-      logcmd = %Q[git log -n1 --grep="^ *git-svn-id: .*@[0-9][0-9]* "]
+      logcmd = %Q[git log -n1 --date=iso --grep="^ *git-svn-id: .*@[0-9][0-9]* "]
       idpat = /git-svn-id: .*?@(\d+) \S+\Z/
       last = `#{logcmd}`[idpat, 1]
       if path
         log = `#{logcmd} "#{path}"`
         changed = log[idpat, 1]
-        modified = `git log --format=%ai -- #{path}`
       else
         changed = last
       end
+      modified = log[/^Date:\s+(.*)/, 1]
       [last, changed, modified]
     end
   end
diff --git a/version.h b/version.h
index 96bc203cbb..1c1fd89d9b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-09-12"
-#define RUBY_PATCHLEVEL 567
+#define RUBY_PATCHLEVEL 568
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9