From 8ab36f0306a511881fb008bd1c60abd7918dae46 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 11 Jun 2015 08:07:49 +0000 Subject: [PATCH] fake.rb.in: scan version.c * template/fake.rb.in: scan MKSTR and MKINT from version.c and then extract the value for them from version.i. * version.c (Init_version): use MKINT as the marker. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- template/fake.rb.in | 6 ++++-- version.c | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/template/fake.rb.in b/template/fake.rb.in index 646a89fe25..fa7f1f79e1 100644 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -8,8 +8,10 @@ end if arg['i'] src = File.read(arg['i']) arg['versions'] = version = {} - src.scan(/rb_define_global_const\("(RUBY_\w+)",\s*(?:.*rb_\w*str_new\w*\s*\(\s*(\w+)|[\(\s]*\(\s*VALUE\s*\)\s*\((.+)\)\s*\)\s*<<\s?)/) do |n, s, i| - version[n] = i ? i.gsub(/\s+/, '').to_i : src[/\b#{s}\[\]\s*=\s*((?:"(?:\\.|[^\"\\])*"\s*)*);/m, 1].gsub(/\A"|"\s*\z|" *"/, '').gsub(/\\(.)/, '\1') + File.read(File.join(arg['srcdir'], 'version.c')). + scan(/rb_define_global_const\("(RUBY_\w+)",[^;]*?\bMK(?:INT|STR)\(([^()]*)\)/m) do |n, v| + version[n] = + eval(src[/\bruby_#{v}(?:\[\])?\s*=\s*((?:"(?:\\.|[^\"\\])*"\s*)*(?=;)|[^{};]+)/m, 1].gsub(/#/, '\\#')) end end %>baseruby="<%=arg['BASERUBY']%>" diff --git a/version.c b/version.c index 7297189276..0aafa926b2 100644 --- a/version.c +++ b/version.c @@ -19,6 +19,7 @@ #define PRINT(type) puts(ruby_##type) #define MKSTR(type) rb_obj_freeze(rb_usascii_str_new_static(ruby_##type, sizeof(ruby_##type)-1)) +#define MKINT(name) INT2FIX(ruby_##name) const int ruby_api_version[] = { RUBY_API_VERSION_MAJOR, @@ -38,6 +39,8 @@ VALUE ruby_engine_name = Qnil; void Init_version(void) { + enum {ruby_patchlevel = RUBY_PATCHLEVEL}; + enum {ruby_revision = RUBY_REVISION}; VALUE version; /* * The running version of ruby @@ -55,11 +58,11 @@ Init_version(void) * The patchlevel for this ruby. If this is a development build of ruby * the patchlevel will be -1 */ - rb_define_global_const("RUBY_PATCHLEVEL", INT2FIX(RUBY_PATCHLEVEL)); + rb_define_global_const("RUBY_PATCHLEVEL", MKINT(patchlevel)); /* * The SVN revision for this ruby. */ - rb_define_global_const("RUBY_REVISION", INT2FIX(RUBY_REVISION)); + rb_define_global_const("RUBY_REVISION", MKINT(revision)); /* * The full ruby version string, like ruby -v prints' */