diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | common.mk | 1 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rwxr-xr-x | tool/make-snapshot | 16 | ||||
| -rw-r--r-- | version.h | 16 | ||||
| -rw-r--r-- | win32/setup.mak | 7 |
7 files changed, 14 insertions, 58 deletions
@@ -42,10 +42,6 @@ Fri Jan 8 17:07:14 2016 Koichi Sasada <ko1@atdot.net> Also type of heap_page::(total|free|final)_slots are changed from int to short. 2B is enough for them. -Fri Jan 8 12:30:54 2016 Shugo Maeda <shugo@ruby-lang.org> - - * tool/make-snapshot: fix for the changes of version.h in r53314. - Fri Jan 8 09:33:59 2016 Shugo Maeda <shugo@ruby-lang.org> * iseq.c (rb_iseq_compile_with_option): move variable initialization @@ -124,11 +120,6 @@ Mon Jan 4 15:36:38 2016 Sho Hashimoto <sho-h@ruby-lang.org> * thread_sync.c: [DOC] remove SizedQueue#close argument. [ci skip] -Mon Jan 4 12:07:00 2016 Naohisa Goto <ngotogenome@gmail.com> - - * version.h (RUBY_BUILD_VERSION_STR_3): Workaround for old version of - Fujitsu C Compiler (fcc) on Solaris. [Bug #11944] [ruby-dev:49468] - Mon Jan 4 10:14:24 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> * test/coverage/test_coverage.rb: ignored test when enabled to coverage. @@ -475,14 +466,6 @@ Sat Dec 26 11:26:38 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * miniinit.c (Init_enc): add some common aliases of built-in encodings. [ruby-core:72481] [Bug #11872] -Sat Dec 26 01:24:40 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in, version.h (RUBY_PROGRAM_VERSION): extract version - numbers from API version in include/ruby/version.h except for - TEENY, to save matz job next year. - - * win32/setup.mak (-version-): use program version. - Fri Dec 25 22:43:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in: extract RUBY_RELEASE_DAY at generating Makefile. diff --git a/Makefile.in b/Makefile.in index 47e316fd2f..b50d02da56 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,6 +90,7 @@ BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@ POSTLINK = @POSTLINK@ RUBY_BASE_NAME=@RUBY_BASE_NAME@ +RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ RUBY_SO_NAME=@RUBY_SO_NAME@ EXEEXT = @EXEEXT@ @@ -118,6 +119,10 @@ BOOTSTRAPRUBY = @BOOTSTRAPRUBY@ #### End of system configuration section. #### +MAJOR= @MAJOR@ +MINOR= @MINOR@ +TEENY= @TEENY@ + LIBRUBY_A = @LIBRUBY_A@ LIBRUBY_SO = @LIBRUBY_SO@ LIBRUBY_ALIASES= @LIBRUBY_ALIASES@ @@ -13,7 +13,6 @@ ECHO = @$(ECHO0) UNICODE_VERSION = 8.0.0 -RUBY_PROGRAM_VERSION = $(MAJOR).$(MINOR).$(TEENY) RUBY_RELEASE_DATE = $(RUBY_RELEASE_YEAR)-$(RUBY_RELEASE_MONTH)-$(RUBY_RELEASE_DAY) RUBYLIB = $(PATH_SEPARATOR) RUBYOPT = - diff --git a/configure.in b/configure.in index 633e114809..c6a4edaed7 100644 --- a/configure.in +++ b/configure.in @@ -225,7 +225,6 @@ GNU_LD=$rb_cv_prog_gnu_ld AC_SUBST(GNU_LD)]) 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` -eval `sed -n 's/^#define RUBY_PROGRAM_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/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) @@ -234,7 +233,7 @@ done AC_SUBST(MAJOR) AC_SUBST(MINOR) AC_SUBST(TEENY) -RUBY_PROGRAM_VERSION=$MAJOR.$MINOR.$TEENY +RUBY_PROGRAM_VERSION=`sed -n 's/^#define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h` AC_SUBST(RUBY_PROGRAM_VERSION) RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h` AC_DEFINE(CANONICALIZATION_FOR_MATHN) @@ -4410,12 +4409,7 @@ AC_CONFIG_FILES(Makefile, [ ["git svn"], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'], [git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'], [VCSUP='$(VCS)']) - # MAJOR and MINOR are public and come from include/ruby/version.h by reconfig - echo MAJOR = $MAJOR - echo MINOR = $MINOR - # TEENY is private and come from version.h sed -n \ - -e '[s/^@%:@define RUBY_PROGRAM_VERSION_\([A-Z]*\) \([0-9][0-9]*\)/\1 = \2/p]' \ -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \ -e 's//\1 = \2/' \ -e '[s/ \([0-9]\)$/ 0\1/]' \ @@ -4443,7 +4437,7 @@ AC_CONFIG_FILES(Makefile, [ echo 'ruby: $(PROGRAM);' >> $tmpmk test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk" fi && mv -f $tmpmk Makefile], -[EXEEXT='$EXEEXT' MAJOR='$MAJOR' MINOR='$MINOR' gnumake='$gnumake']) +[EXEEXT='$EXEEXT' gnumake='$gnumake']) AC_ARG_WITH([ruby-pc], AC_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]), diff --git a/tool/make-snapshot b/tool/make-snapshot index 8566daeed5..865fdeb965 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -46,7 +46,6 @@ PACKAGES = { ENV["LC_ALL"] = ENV["LANG"] = "C" SVNURL = URI.parse("http://svn.ruby-lang.org/repos/ruby/") RUBY_VERSION_PATTERN = /^\#define\s+RUBY_VERSION\s+"([\d.]+)"/ -RUBY_API_VERSION_PATTERN = /^\#define\s+RUBY_API_VERSION_MAJOR\s+([\d]+)\n+\#define\s+RUBY_API_VERSION_MINOR\s+([\d]+)\n+\#define\s+RUBY_API_VERSION_TEENY\s+([\d]+)/ ENV["VPATH"] ||= "include/ruby" YACC = ENV["YACC"] ||= "bison" @@ -210,13 +209,6 @@ def package(vcs, rev, destdir, tmp = nil) end open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"} version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1] - unless version - s = IO.read("#{v}/include/ruby/version.h") - api_version_components = s.scan(RUBY_API_VERSION_PATTERN)[0] - if api_version_components - version = api_version_components.join(".") - end - end version or return if patchlevel unless tag.empty? @@ -326,14 +318,6 @@ clean-cache $(CLEAN_CACHE): after-update after-update:: extract-gems extract-gems: APPEND - if /^MAJOR\s*=/ !~ mk - major, minor, teeny = version.split(".") - mk.prepend(<<-PREPEND) -MAJOR = #{major} -MINOR = #{minor} -TEENY = #{teeny} - PREPEND - end open(clean.add("Makefile"), "w") do |f| f.puts mk end @@ -1,12 +1,4 @@ -#define RUBY_PROGRAM_VERSION_MAJOR RUBY_API_VERSION_MAJOR -#define RUBY_PROGRAM_VERSION_MINOR RUBY_API_VERSION_MINOR -#define RUBY_PROGRAM_VERSION_TEENY 0 - -#define RUBY_BUILD_VERSION_STR_2(v) STRINGIZE(v##_MAJOR)"."STRINGIZE(v##_MINOR) -#define RUBY_BUILD_VERSION_STR_3(v) STRINGIZE(v##_MAJOR)"."STRINGIZE(v##_MINOR)"."STRINGIZE(v##_TEENY) - -#define RUBY_PROGRAM_VERSION RUBY_BUILD_VERSION_STR_3(RUBY_PROGRAM_VERSION) -#define RUBY_VERSION RUBY_PROGRAM_VERSION +#define RUBY_VERSION "2.4.0" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_PATCHLEVEL -1 @@ -33,13 +25,11 @@ #define RUBY_RELEASE_DAY_STR STRINGIZE(RUBY_RELEASE_DAY) #endif -#define RUBY_LIB_VERSION_2 RUBY_BUILD_VERSION_STR_2(RUBY_API_VERSION) -#define RUBY_LIB_VERSION_3 RUBY_BUILD_VERSION_STR_3(RUBY_API_VERSION) #if !defined RUBY_LIB_VERSION && defined RUBY_LIB_VERSION_STYLE # if RUBY_LIB_VERSION_STYLE == 3 -# define RUBY_LIB_VERSION RUBY_LIB_VERSION_3 +# 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 RUBY_LIB_VERSION_2 +# define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR) # endif #endif diff --git a/win32/setup.mak b/win32/setup.mak index 224ccbeab0..143c218d38 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -120,9 +120,10 @@ int main(void) {return (EnumProcesses(NULL,0,NULL) ? 0 : 1);} @$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE) #define RUBY_REVISION 0 #include "version.h" -MAJOR = RUBY_PROGRAM_VERSION_MAJOR -MINOR = RUBY_PROGRAM_VERSION_MINOR -TEENY = RUBY_PROGRAM_VERSION_TEENY +MAJOR = RUBY_API_VERSION_MAJOR +MINOR = RUBY_API_VERSION_MINOR +TEENY = RUBY_API_VERSION_TEENY +RUBY_PROGRAM_VERSION = RUBY_VERSION MSC_VER = _MSC_VER << |