diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-28 02:12:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-28 02:12:34 +0000 |
| commit | 842272540886ff1da58e690907b08f2811a86607 (patch) | |
| tree | 69e0fc86b769cf95b1ec63ce4c593b2a58906460 /win32 | |
| parent | 1095705c4218f8f752210f1a0b4f78d96ad675ac (diff) | |
Moved version numbers
* Define major and minor version numbers only in the public
include/ruby/version.h header, as the API version numbers.
* Define only teeny version number in the private version.h
header.
* RUBY_VERSION moved to version.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 3 | ||||
| -rw-r--r-- | win32/setup.mak | 14 |
2 files changed, 6 insertions, 11 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 03a41793ac..b7309680f3 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1059,6 +1059,9 @@ s,@archincludedir@,$${includedir}/$${arch},;t t s,@sitearchincludedir@,$${includedir}/$${sitearch},;t t s,@arch@,$(ARCH)-$(PLATFORM),;t t s,@sitearch@,$(ARCH)-$(RT),;t t +s,@MAJOR@,$(MAJOR),;t t +s,@MINOR@,$(MINOR),;t t +s,@TEENY@,$(TEENY),;t t s,@ruby_version@,$(ruby_version),;t t s,@RUBY_PROGRAM_VERSION@,$(RUBY_PROGRAM_VERSION),;t t s,@rubylibprefix@,$${prefix}/lib/$${RUBY_BASE_NAME},;t t diff --git a/win32/setup.mak b/win32/setup.mak index eb99c6ed1d..043edbeb66 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -145,19 +145,11 @@ verconf.mk: nul #define STRINGIZE(x) STRINGIZE0(x) #include "version.h" for %%I in (RUBY_RELEASE_DATE) do set ruby_release_date=%%~I -for %%I in (RUBY_VERSION) do set ruby_version=%%~I -for /f "delims=. tokens=1-3" %%I in (RUBY_VERSION) do ( - set major=%%I - set minor=%%J - set teeny=%%K -) #undef RUBY_RELEASE_DATE -#undef RUBY_PROGRAM_VERSION echo RUBY_RELEASE_DATE = %ruby_release_date:""=% -echo RUBY_PROGRAM_VERSION = %ruby_version:""=% -echo MAJOR = %major% -echo MINOR = %minor% -echo TEENY = %teeny% +echo MAJOR = RUBY_VERSION_MAJOR +echo MINOR = RUBY_VERSION_MINOR +echo TEENY = RUBY_VERSION_TEENY #if defined RUBY_PATCHLEVEL && RUBY_PATCHLEVEL < 0 echo RUBY_DEVEL = yes #endif |