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

* tool/make-snapshot: replace RUBY_PATCHLEVEL_STR in version.h to

Browse Source 
show users that this ruby is a preview/rc version.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2013-12-20 20:46:21 +00:00
parent 4ed5aeca05
commit 0abe1fee13
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Dec 21 05:43:27 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/make-snapshot: replace RUBY_PATCHLEVEL_STR in version.h to
show users that this ruby is a preview/rc version.
Sat Dec 21 05:03:49 2013 NAKAMURA Usaku <usa@ruby-lang.org> Sat Dec 21 05:03:49 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly * win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly

6
tool/make-snapshot
View File

@ -100,6 +100,7 @@ Dir.chdir tmp
def package(rev, destdir) def package(rev, destdir)
patchlevel = false patchlevel = false
prerelease = false
if revision = rev[/@(\d+)\z/, 1] if revision = rev[/@(\d+)\z/, 1]
rev = $` rev = $`
end end
@ -110,6 +111,7 @@ def package(rev, destdir)
url = SVNURL + "branches/" url = SVNURL + "branches/"
url = url + `svn ls #{url}`[/.*^(ruby_\d+_\d+)\//m, 1] url = url + `svn ls #{url}`[/.*^(ruby_\d+_\d+)\//m, 1]
when /\A(.*)\.(.*)\.(.*)-(preview|rc)(\d+)/ when /\A(.*)\.(.*)\.(.*)-(preview|rc)(\d+)/
prerelease = true
tag = "#{$4}#{$5}" tag = "#{$4}#{$5}"
url = SVNURL + "tags/v#{$1}_#{$2}_#{$3}_#{$4}#{$5}" url = SVNURL + "tags/v#{$1}_#{$2}_#{$3}_#{$4}#{$5}"
when /\A(.*)\.(.*)\.(.*)-p(\d+)/ when /\A(.*)\.(.*)\.(.*)-p(\d+)/
@ -163,6 +165,10 @@ def package(rev, destdir)
versionhdr ||= IO.read("#{v}/version.h") versionhdr ||= IO.read("#{v}/version.h")
patchlevel = versionhdr[/^\#define\s+RUBY_PATCHLEVEL\s+(\d+)/, 1] patchlevel = versionhdr[/^\#define\s+RUBY_PATCHLEVEL\s+(\d+)/, 1]
tag = (patchlevel ? "p#{patchlevel}" : "r#{revision}") tag = (patchlevel ? "p#{patchlevel}" : "r#{revision}")
elsif prerelease
versionhdr ||= IO.read("#{v}/version.h")
versionhdr.sub!(/^\#define\s+RUBY_PATCHLEVEL_STR\s+"\K.+?(?=")/, tag)
IO.write("#{v}/version.h", versionhdr)
else else
tag ||= "r#{revision}" tag ||= "r#{revision}"
end end