summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-28 19:10:44 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-28 19:10:44 +0000
commit5a6cc389ed39f12504967ef988e4786e47e18848 (patch)
treed75309c58597a09fce34e72357374789b6e3585a
parentbc4f7332e35278c751c654b44b2cc34d0b0c9344 (diff)
* mkconfig.rb (patchlevel): read from version.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@11951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rwxr-xr-xmkconfig.rb5
-rw-r--r--version.h2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 98b586d0b0..f4997c9cb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 1 04:08:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * mkconfig.rb (patchlevel): read from version.h.
+
Thu Mar 1 03:42:09 2007 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
diff --git a/mkconfig.rb b/mkconfig.rb
index b47b7423c5..fdc3dcf0af 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -112,7 +112,10 @@ unless has_version
print " CONFIG[\"MINOR\"] = \"" + $2 + "\"\n"
print " CONFIG[\"TEENY\"] = \"" + $3 + "\"\n"
}
- print " CONFIG[\"PATCHLEVEL\"] = \"" + RUBY_PATCHLEVEL + "\"\n"
+ patchlevel = IO.foreach(File.join(srcdir, "version.h")) {|l|
+ m = /^\s*#\s*define\s+RUBY_PATCHLEVEL\s+(\d+)/.match(l) and break m[1]
+ }
+ print " CONFIG[\"PATCHLEVEL\"] = \"#{patchlevel}\"\n"
end
dest = drive ? /= \"(?!\$[\(\{])(?:[a-z]:)?/i : /= \"(?!\$[\(\{])/
diff --git a/version.h b/version.h
index e9522e3b1a..6ec4662156 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,9 @@
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 28
+#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];
RUBY_EXTERN const char ruby_platform[];
RUBY_EXTERN const int ruby_patchlevel;
+#endif