diff --git a/ChangeLog b/ChangeLog index 9ebe712f79..8ffdd89918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Mar 1 02:05:17 2007 Nobuyoshi Nakada + + * mkconfig.rb (patchlevel): read from version.h. + Wed Feb 28 21:15:00 2007 WATANABE Hirofumi * configure.in (ac_cv_func_fcntl): fcntl support for MinGW. diff --git a/mkconfig.rb b/mkconfig.rb index 3ae1f2812f..1e75cae23f 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 f66b7486fb..4d96118a2d 100644 --- a/version.h +++ b/version.h @@ -1,17 +1,19 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-02-28" +#define RUBY_RELEASE_DATE "2007-03-01" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070228 +#define RUBY_RELEASE_CODE 20070301 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 -#define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 28 +#define RUBY_RELEASE_MONTH 3 +#define RUBY_RELEASE_DAY 1 +#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