mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* configure.in: read API version from include/ruby/version.h.
* {bcc,win}32/setup.mak (-version-): ditto. * version.h (RUBY_LIB_VERSION): use API version numbers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
2f6c0e3be3
commit
f2ff3eb6ec
5 changed files with 17 additions and 9 deletions
|
@ -1,3 +1,11 @@
|
|||
Tue Aug 24 10:11:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in: read API version from include/ruby/version.h.
|
||||
|
||||
* {bcc,win}32/setup.mak (-version-): ditto.
|
||||
|
||||
* version.h (RUBY_LIB_VERSION): use API version numbers.
|
||||
|
||||
Tue Aug 24 07:07:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* array.c (rb_ary_shuffle_bang, rb_ary_sample): add optional
|
||||
|
|
|
@ -96,9 +96,9 @@ $(BANG)endif
|
|||
@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
|
||||
\#define RUBY_REVISION 0
|
||||
\#include "version.h"
|
||||
MAJOR = RUBY_VERSION_MAJOR
|
||||
MINOR = RUBY_VERSION_MINOR
|
||||
TEENY = RUBY_VERSION_TEENY
|
||||
MAJOR = RUBY_API_VERSION_MAJOR
|
||||
MINOR = RUBY_API_VERSION_MINOR
|
||||
TEENY = RUBY_API_VERSION_TEENY
|
||||
|
||||
BORLANDC = __BORLANDC__
|
||||
|
|
||||
|
|
|
@ -66,7 +66,7 @@ fi
|
|||
GNU_LD=$rb_cv_prog_gnu_ld
|
||||
AC_SUBST(GNU_LD)])
|
||||
|
||||
eval `sed -n 's/^#define RUBY_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/version.h`
|
||||
eval `sed -n 's/^#define RUBY_API_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/include/ruby/version.h`
|
||||
for v in MAJOR MINOR TEENY; do
|
||||
if eval "test \"\$$v\" = ''"; then
|
||||
AC_MSG_ERROR(could not determine $v number from version.h)
|
||||
|
|
|
@ -11,9 +11,9 @@
|
|||
|
||||
#if !defined RUBY_LIB_VERSION && defined RUBY_LIB_VERSION_STYLE
|
||||
# if RUBY_LIB_VERSION_STYLE == 3
|
||||
# define RUBY_LIB_VERSION STRINGIZE(RUBY_VERSION_MAJOR)"."STRINGIZE(RUBY_VERSION_MINOR)"."STRINGIZE(RUBY_VERSION_TEENY)
|
||||
# define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR)"."STRINGIZE(RUBY_API_VERSION_TEENY)
|
||||
# elif RUBY_LIB_VERSION_STYLE == 2
|
||||
# define RUBY_LIB_VERSION STRINGIZE(RUBY_VERSION_MAJOR)"."STRINGIZE(RUBY_VERSION_MINOR)
|
||||
# define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
|
|
@ -167,9 +167,9 @@ int main()
|
|||
@$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(MAKEFILE)" | find "=" >>$(MAKEFILE)
|
||||
#define RUBY_REVISION 0
|
||||
#include "version.h"
|
||||
MAJOR = RUBY_VERSION_MAJOR
|
||||
MINOR = RUBY_VERSION_MINOR
|
||||
TEENY = RUBY_VERSION_TEENY
|
||||
MAJOR = RUBY_API_VERSION_MAJOR
|
||||
MINOR = RUBY_API_VERSION_MINOR
|
||||
TEENY = RUBY_API_VERSION_TEENY
|
||||
MSC_VER = _MSC_VER
|
||||
<<
|
||||
|
||||
|
|
Loading…
Reference in a new issue