1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* include/ruby/version.h (RUBY_API_VERSION_*): renamed and moved

Browse Source 
from version.h.  [ruby-dev:42103]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-08-23 21:08:19 +00:00
parent 0d5b1718c2
commit 89339af9c1
5 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Aug 24 06:08:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/version.h (RUBY_API_VERSION_*): renamed and moved
from version.h. [ruby-dev:42103]
Tue Aug 24 05:58:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Aug 24 05:58:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ChangeLog: flushed. [ruby-dev:42050] * ChangeLog: flushed. [ruby-dev:42050]

7
include/ruby/version.h
View File

@ -29,6 +29,12 @@
#define RUBY_BIRTH_MONTH 2 #define RUBY_BIRTH_MONTH 2
#define RUBY_BIRTH_DAY 24 #define RUBY_BIRTH_DAY 24
/* API version */
#define RUBY_API_VERSION_MAJOR 1
#define RUBY_API_VERSION_MINOR 9
#define RUBY_API_VERSION_TEENY 1
#define RUBY_API_VERSION_CODE (RUBY_API_VERSION_MAJOR*10000+RUBY_API_VERSION_MINOR*100+RUBY_API_VERSION_TEENY)
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -48,6 +54,7 @@ extern "C" {
* necessary or not, and if the answer was yes, think twice a week * necessary or not, and if the answer was yes, think twice a week
* later again. * later again.
*/ */
RUBY_EXTERN const int ruby_api_version[3];
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[]; RUBY_EXTERN const char ruby_release_date[];
RUBY_EXTERN const char ruby_platform[]; RUBY_EXTERN const char ruby_platform[];

11
tool/mkconfig.rb
View File

@ -144,9 +144,16 @@ print " CONFIG[\"DESTDIR\"] = DESTDIR\n"
versions = {} versions = {}
IO.foreach(File.join(srcdir, "version.h")) do |l| IO.foreach(File.join(srcdir, "version.h")) do |l|
m = /^\s*#\s*define\s+RUBY_(VERSION_(MAJOR|MINOR|TEENY)|PATCHLEVEL)\s+(-?\d+)/.match(l) m = /^\s*#\s*define\s+RUBY_(PATCHLEVEL)\s+(-?\d+)/.match(l)
if m if m
versions[m[2]||m[1]] = m[3] versions[m[1]] = m[2]
break
end
end
IO.foreach(File.join(srcdir, "include/ruby/version.h")) do |l|
m = /^\s*#\s*define\s+RUBY_API_VERSION_(MAJOR|MINOR|TEENY)\s+(-?\d+)/.match(l)
if m
versions[m[1]] = m[2]
break if versions.size == 4 break if versions.size == 4
end end
end end

5
version.c
View File

@ -50,6 +50,11 @@
#define RUBY_VENDOR_THIN_ARCHLIB RUBY_VENDOR_LIB2 "/"RUBY_THINARCH #define RUBY_VENDOR_THIN_ARCHLIB RUBY_VENDOR_LIB2 "/"RUBY_THINARCH
#endif #endif
const int ruby_api_version[] = {
RUBY_API_VERSION_MAJOR,
RUBY_API_VERSION_MINOR,
RUBY_API_VERSION_TEENY,
};
const char ruby_version[] = RUBY_VERSION; const char ruby_version[] = RUBY_VERSION;
const char ruby_release_date[] = RUBY_RELEASE_DATE; const char ruby_release_date[] = RUBY_RELEASE_DATE;
const char ruby_platform[] = RUBY_PLATFORM; const char ruby_platform[] = RUBY_PLATFORM;

3
version.h
View File

@ -3,9 +3,6 @@
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8
#define RUBY_RELEASE_DAY 24 #define RUBY_RELEASE_DAY 24