1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tool/vcs.rb: no time.rb

Browse Source 
* 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/trunk@47248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-08-22 06:36:46 +00:00
parent 3229456d40
commit f024d46f11
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Aug 22 15:36:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (Doxyfile): revert r43888, not to require preinstalled
ruby. [ruby-core:64488] [Bug #10161]
Fri Aug 22 12:32:15 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Fri Aug 22 12:32:15 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/shell.rb: removed commented-out code. * lib/shell.rb: removed commented-out code.

2
common.mk
View File

@ -204,7 +204,7 @@ $(CAPIOUT)/.timestamp: Doxyfile $(PREP)
Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG) Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \ $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
--srcdir="$(srcdir)" --miniruby="$(BASERUBY)" --srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
program: showflags $(PROGRAM) program: showflags $(PROGRAM)
wprogram: showflags $(WPROGRAM) wprogram: showflags $(WPROGRAM)

7
tool/file2lastrev.rb
View File

@ -31,6 +31,9 @@ parser = OptionParser.new {|opts|
opts.on("--doxygen", "Doxygen format") do opts.on("--doxygen", "Doxygen format") do
self.output = :doxygen self.output = :doxygen
end end
opts.on("--modified", "modified time") do
self.output = :modified
end
opts.on("-q", "--suppress_not_found") do opts.on("-q", "--suppress_not_found") do
@suppress_not_found = true @suppress_not_found = true
end end
@ -44,7 +47,7 @@ rescue VCS::NotFoundError => e
abort "#{File.basename(Program)}: #{e.message}" unless @suppress_not_found abort "#{File.basename(Program)}: #{e.message}" unless @suppress_not_found
else else
begin begin
last, changed = vcs.get_revisions(ARGV.shift) last, changed, modified = vcs.get_revisions(ARGV.shift)
rescue => e rescue => e
abort "#{File.basename(Program)}: #{e.message}" unless @suppress_not_found abort "#{File.basename(Program)}: #{e.message}" unless @suppress_not_found
exit false exit false
@ -58,6 +61,8 @@ when :revision_h
puts "#define RUBY_REVISION #{changed.to_i}" puts "#define RUBY_REVISION #{changed.to_i}"
when :doxygen when :doxygen
puts "r#{changed}/r#{last}" puts "r#{changed}/r#{last}"
when :modified
puts modified.strftime('%Y-%m-%dT%H:%M:%S%z')
else else
raise "unknown output format `#{@output}'" raise "unknown output format `#{@output}'"
end end

12
tool/vcs.rb
View File

@ -1,7 +1,5 @@
# vcs # vcs
require 'time'
ENV.delete('PWD') ENV.delete('PWD')
unless File.respond_to? :realpath unless File.respond_to? :realpath
@ -61,7 +59,11 @@ class VCS
} }
last or raise VCS::NotFoundError, "last revision not found" last or raise VCS::NotFoundError, "last revision not found"
changed or raise VCS::NotFoundError, "changed 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 return last, changed, modified, *rest
end end
@ -100,16 +102,16 @@ class VCS
register(".git") register(".git")
def self.get_revisions(path) 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/ idpat = /git-svn-id: .*?@(\d+) \S+\Z/
last = `#{logcmd}`[idpat, 1] last = `#{logcmd}`[idpat, 1]
if path if path
log = `#{logcmd} "#{path}"` log = `#{logcmd} "#{path}"`
changed = log[idpat, 1] changed = log[idpat, 1]
modified = `git log --format=%ai -- #{path}`
else else
changed = last changed = last
end end
modified = log[/^Date:\s+(.*)/, 1]
[last, changed, modified] [last, changed, modified]
end end
end end