Moved version numbers

* Define major and minor version numbers only in the public
  include/ruby/version.h header, as the API version numbers.

* Define only teeny version number in the private version.h
  header.

* RUBY_VERSION moved to version.c.

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

1 files changed, 14 insertions, 0 deletions

diff --git a/tool/merger.rb b/tool/merger.rb
index 3362eafd7a..cbe3a8df91 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -54,11 +54,25 @@ def version
       case l
       when /^#define RUBY_VERSION "(\d+)\.(\d+)\.(\d+)"$/
         v = $~.captures
+      when /^#define RUBY_VERSION_TEENY (\d+)$/
+        (v ||= [])[2] = $1
       when /^#define RUBY_PATCHLEVEL (-?\d+)$/
         p = $1
       end
     end
   end
+  if v and !v[0]
+    open 'include/ruby/version.h', 'rb' do |f|
+      f.each_line do |l|
+        case l
+        when /^#define RUBY_API_VERSION_MAJOR (\d+)/
+          v[0] = $1
+        when /^#define RUBY_API_VERSION_MINOR (\d+)/
+          v[1] = $1
+        end
+      end
+    end
+  end
   return v, p
 end