diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 00:23:04 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 00:23:04 +0000 |
commit | 05c5f21f0e1cda33c4d463c2a0334b91ca8c9937 (patch) | |
tree | f17f91b6d6d17ac5bd1845f368fba8dffaa47301 | |
parent | 6f122aa27874c57e147199bd2d0887f3e0bffecc (diff) | |
download | ruby-05c5f21f0e1cda33c4d463c2a0334b91ca8c9937.tar.gz |
RUBY_RELEASE_DATE in verconf.mk
* win32/setup.mak (verconf.mk): extract RUBY_RELEASE_DATE without
quotation marks.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | version.h | 6 | ||||
-rw-r--r-- | win32/setup.mak | 18 |
2 files changed, 11 insertions, 13 deletions
@@ -12,15 +12,15 @@ #define TOKEN_PASTE(x,y) x##y #endif #define ONLY_ONE_DIGIT(x) TOKEN_PASTE(10,x) < 1000 -#define ZERO_STR "0" +#define WITH_ZERO_PADDING(x) TOKEN_PASTE(0,x) #define RUBY_RELEASE_YEAR_STR STRINGIZE(RUBY_RELEASE_YEAR) #if ONLY_ONE_DIGIT(RUBY_RELEASE_MONTH) -#define RUBY_RELEASE_MONTH_STR ZERO_STR STRINGIZE(RUBY_RELEASE_MONTH) +#define RUBY_RELEASE_MONTH_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_MONTH)) #else #define RUBY_RELEASE_MONTH_STR STRINGIZE(RUBY_RELEASE_MONTH) #endif #if ONLY_ONE_DIGIT(RUBY_RELEASE_DAY) -#define RUBY_RELEASE_DAY_STR ZERO_STR STRINGIZE(RUBY_RELEASE_DAY) +#define RUBY_RELEASE_DAY_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_DAY)) #else #define RUBY_RELEASE_DAY_STR STRINGIZE(RUBY_RELEASE_DAY) #endif diff --git a/win32/setup.mak b/win32/setup.mak index 143c218d38..8c00710f44 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -128,18 +128,16 @@ MSC_VER = _MSC_VER << verconf.mk: nul - @$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(@)" | findstr "=" >$(@) + @$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(@)" > $(*F).bat && cmd /c $(*F).bat > $(@) +@echo off #define RUBY_REVISION 0 +#define STRINGIZE0(expr) #expr +#define STRINGIZE(x) STRINGIZE0(x) #include "version.h" -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) +for %%I in (RUBY_RELEASE_DATE) do set ruby_release_date=%%~I +#undef RUBY_RELEASE_DATE +echo RUBY_RELEASE_DATE = %ruby_release_date:""=% +del %0 & exit << -program-name-: |