summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-25 15:02:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-25 15:02:14 +0000
commit00a47cf6787af8fe89f55f721a54cbfef5b7d4a4 (patch)
treeaf71640e7d96ca0b3824c923ce02bc2a749d743c
parent59fc8426011e574c34b44565c30d7284d54b12e7 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in1
-rw-r--r--common.mk1
-rw-r--r--win32/setup.mak16
3 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index 4e9288d569..76b61f5581 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,7 +90,6 @@ POSTLINK = @POSTLINK@
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@
diff --git a/common.mk b/common.mk
index 232d278b3c..eb681bbb9c 100644
--- a/common.mk
+++ b/common.mk
@@ -13,6 +13,7 @@ ECHO = @$(ECHO0)
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
diff --git a/win32/setup.mak b/win32/setup.mak
index db5d4581d5..143c218d38 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -129,15 +129,17 @@ MSC_VER = _MSC_VER
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-: