diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-07-12 16:44:57 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-08-12 15:57:25 +0900 |
| commit | cd1a0b3caaa5446e9258c192cf483b6dfe8d7819 (patch) | |
| tree | 7dcc4a1f0a2ff245fd7e1f36b4d10994574491f3 /win32 | |
| parent | a201cfd0cdb9f613f687dc6fee1908ec54e63c72 (diff) | |
Stop defining `RUBY_ABI_VERSION` if released versions
As commented in include/ruby/internal/abi.h, since teeny versions of
Ruby should guarantee ABI compatibility, `RUBY_ABI_VERSION` has no role
in released versions of Ruby.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6231
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 8 | ||||
| -rw-r--r-- | win32/setup.mak | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 9dc5ee6f51..bea24450ed 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -148,7 +148,10 @@ PLATFORM_DIR = win32 arch = $(ARCH)-$(PLATFORM) sitearch = $(ARCH)-$(RT) !if !defined(ruby_version) -ruby_version = $(MAJOR).$(MINOR).0+$(ABI_VERSION) +ruby_version = $(MAJOR).$(MINOR).0 +!endif +!if defined(ABI_VERSION) +ruby_version = $(ruby_version)+$(ABI_VERSION) !endif !if !defined(RUBY_VERSION_NAME) RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version) @@ -624,6 +627,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #endif !endif #define RUBY_MSVCRT_VERSION $(RT_VER) +!if defined(ABI_VERSION) +#define RUBY_ABI_VERSION $(ABI_VERSION) +!endif #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 diff --git a/win32/setup.mak b/win32/setup.mak index 39323c61c2..fd804a84ce 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -178,6 +178,7 @@ main(void) -version-: nul verconf.mk verconf.mk: nul + @findstr /R /C:"^#define RUBY_ABI_VERSION " $(srcdir:/=\)\include\ruby\internal\abi.h > $(@) @$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(@)" > $(*F).bat && cmd /c $(*F).bat > $(@) @echo off #define RUBY_REVISION 0 @@ -198,8 +199,9 @@ echo RUBY_RELEASE_DAY = %ruby_release_day:~-2% echo MAJOR = RUBY_VERSION_MAJOR echo MINOR = RUBY_VERSION_MINOR echo TEENY = RUBY_VERSION_TEENY -echo ABI_VERSION = RUBY_ABI_VERSION #if defined RUBY_PATCHLEVEL && RUBY_PATCHLEVEL < 0 +#include "$(@F)" +echo ABI_VERSION = RUBY_ABI_VERSION #endif set /a MSC_VER = _MSC_VER #if _MSC_VER >= 1920 |