diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-12 07:16:12 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-12 07:16:12 +0000 |
| commit | dd19c29f867a20d06ee793d106df333ea5ef9b35 (patch) | |
| tree | 5055780d3307607db0bd60ee3052967b96c10367 | |
| parent | 35df73cfa739edffea41ec6d355961f8bf569dbd (diff) | |
*merge -c 11946
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | mkconfig.rb | 5 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Mon Mar 12 16:09:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * mkconfig.rb (patchlevel): read from version.h. + Sun Mar 11 18:57:50 2007 Akinori MUSHA <knu@iDaemons.org> * misc/README: Add a note about ruby-electric.el. diff --git a/mkconfig.rb b/mkconfig.rb index 440399b1b8..1f075b0b30 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -86,7 +86,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 : /= \"(?!\$[\(\{])/ @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-03-12" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070312 -#define RUBY_PATCHLEVEL 31 +#define RUBY_PATCHLEVEL 32 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 @@ -11,7 +11,9 @@ #define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_DAY 12 +#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 |