[前][次][番号順一覧][スレッド一覧]

ruby-changes:41240

From: nobu <ko1@a...>
Date: Sat, 26 Dec 2015 00:02:24 +0900 (JST)
Subject: [ruby-changes:41240] nobu:r53312 (trunk): setup.mak: split release date

nobu	2015-12-26 00:02:14 +0900 (Sat, 26 Dec 2015)

  New Revision: 53312

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53312

  Log:
    setup.mak: split release date
    
    * win32/setup.mak (verconf.mk): split release date into year,
      month, and day.
    
    * common.mk (RUBY_RELEASE_DATE): move from Makefile.in to share
      with win32/setup.mak.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/setup.mak
Index: common.mk
===================================================================
--- common.mk	(revision 53311)
+++ common.mk	(revision 53312)
@@ -13,6 +13,7 @@ ECHO = @$(ECHO0) https://github.com/ruby/ruby/blob/trunk/common.mk#L13
 
 UNICODE_VERSION = 8.0.0
 
+RUBY_RELEASE_DATE = $(RUBY_RELEASE_YEAR)-$(RUBY_RELEASE_MONTH)-$(RUBY_RELEASE_DAY)
 RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 53311)
+++ win32/setup.mak	(revision 53312)
@@ -129,15 +129,17 @@ MSC_VER = _MSC_VER https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L129
 
 verconf.mk: nul
 	@$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(@)" | findstr "=" >$(@)
-#define STRINGIZE(expr) STRINGIZE0(expr)
-#ifndef STRINGIZE0
-#define STRINGIZE0(expr) #expr
-#endif
 #define RUBY_REVISION 0
 #include "version.h"
-release_date = RUBY_RELEASE_DATE
-#undef RUBY_RELEASE_DATE
-RUBY_RELEASE_DATE = $$(release_date)
+release_year = RUBY_RELEASE_YEAR
+release_month = RUBY_RELEASE_MONTH
+release_day = RUBY_RELEASE_DAY
+#undef RUBY_RELEASE_YEAR
+#undef RUBY_RELEASE_MONTH
+#undef RUBY_RELEASE_DAY
+RUBY_RELEASE_YEAR = $$(release_year)
+RUBY_RELEASE_MONTH = $$(release_month)
+RUBY_RELEASE_DAY = $$(release_day)
 <<
 
 -program-name-:
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 53311)
+++ Makefile.in	(revision 53312)
@@ -90,7 +90,6 @@ POSTLINK = @POSTLINK@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L90
 
 RUBY_BASE_NAME=@RUBY_BASE_NAME@
 RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
-RUBY_RELEASE_DATE = $(RUBY_RELEASE_YEAR)-$(RUBY_RELEASE_MONTH)-$(RUBY_RELEASE_DAY)
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
 EXEEXT = @EXEEXT@

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]