merge revision(s) r47248: [Backport ruby#10161]

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


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

Author: nagachika

ChangeLog

@@ -1,3 +1,8 @@
+Wed Sep 10 22:58:25 2014  Nobuyoshi Nakada  <[email protected]>
+
+	* common.mk (Doxyfile): revert r43888, not to require preinstalled
+	  ruby.  [ruby-core:64488] [Bug #10161]
+
 Wed Sep 10 03:29:48 2014  Nobuyoshi Nakada  <[email protected]>
 
 	* io.c (io_close): ignore only "closed stream" IOError and

common.mk

@@ -204,7 +204,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)

tool/file2lastrev.rb

@@ -31,6 +31,9 @@ def self.output=(output)
   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 @@ def self.output=(output)
   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 @@ def self.output=(output)
   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

tool/vcs.rb

@@ -1,7 +1,5 @@
 # vcs
 
-require 'time'
-
 ENV.delete('PWD')
 
 unless File.respond_to? :realpath
@@ -45,7 +43,11 @@ def get_revisions(path)
     last, changed, modified, *rest = Dir.chdir(@srcdir) {self.class.get_revisions(path)}
     last or raise VCS::NotFoundError, "last revision not found"
     changed or raise VCS::NotFoundError, "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 GIT < self
     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

version.h

@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-09-10"
-#define RUBY_PATCHLEVEL 232
+#define RUBY_PATCHLEVEL 233
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9