diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 00:19:16 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 00:19:16 +0000 |
commit | bc8a7f9ab715595df6669db00efe7ad8e36b970e (patch) | |
tree | f238f6683cc2881772e412a8ee236f3d0199c900 /tool | |
parent | fca0cf6e6b8ab8882f3403e5909c8eb91c5c351e (diff) | |
download | ruby-bc8a7f9ab715595df6669db00efe7ad8e36b970e.tar.gz |
revert r53459, r53427, r53314
Revert "* tool/make-snapshot: fix for the changes of version.h in r53314."
Revert "* version.h (RUBY_BUILD_VERSION_STR_3): Workaround for old version of"
Revert "program version from API version"
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/make-snapshot | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index 8566daeed5..865fdeb965 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -46,7 +46,6 @@ PACKAGES = { ENV["LC_ALL"] = ENV["LANG"] = "C" SVNURL = URI.parse("http://svn.ruby-lang.org/repos/ruby/") RUBY_VERSION_PATTERN = /^\#define\s+RUBY_VERSION\s+"([\d.]+)"/ -RUBY_API_VERSION_PATTERN = /^\#define\s+RUBY_API_VERSION_MAJOR\s+([\d]+)\n+\#define\s+RUBY_API_VERSION_MINOR\s+([\d]+)\n+\#define\s+RUBY_API_VERSION_TEENY\s+([\d]+)/ ENV["VPATH"] ||= "include/ruby" YACC = ENV["YACC"] ||= "bison" @@ -210,13 +209,6 @@ def package(vcs, rev, destdir, tmp = nil) end open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"} version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1] - unless version - s = IO.read("#{v}/include/ruby/version.h") - api_version_components = s.scan(RUBY_API_VERSION_PATTERN)[0] - if api_version_components - version = api_version_components.join(".") - end - end version or return if patchlevel unless tag.empty? @@ -326,14 +318,6 @@ clean-cache $(CLEAN_CACHE): after-update after-update:: extract-gems extract-gems: APPEND - if /^MAJOR\s*=/ !~ mk - major, minor, teeny = version.split(".") - mk.prepend(<<-PREPEND) -MAJOR = #{major} -MINOR = #{minor} -TEENY = #{teeny} - PREPEND - end open(clean.add("Makefile"), "w") do |f| f.puts mk end |