From 2e2ccab1104c01a2e944eab2a4f5e338a26155d7 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 10 Jun 2014 08:30:01 +0000
Subject: win32/setup.mak: separate verconf.mk

* win32/setup.mak (verconf.mk): separate RUBY_RELEASE_DATE from
  Makefile so that build would not stop everyday.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/Makefile.sub | 10 ++++++++--
 win32/setup.mak    | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'win32')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index da26584671..60a03a7ae6 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -3,7 +3,7 @@
 SHELL = $(COMSPEC)
 ECHO1 = $(V:1=@:)
 RUNCMD = $(COMSPEC) /c
-MKFILES = Makefile
+MKFILES = Makefile verconf.mk
 NULL = nul
 CHDIR = cd
 PATH_SEPARATOR = ;
@@ -403,6 +403,9 @@ MINIPRELUDE_C = miniprelude.c
 RBCONFIG      = ./.rbconfig.time
 
 !include $(srcdir)/common.mk
+!if exist(verconf.mk)
+! include verconf.mk
+!endif
 
 !ifdef SCRIPTPROGRAMS
 !else if [echo>scriptbin.mk SCRIPTPROGRAMS = \]
@@ -456,7 +459,10 @@ test-rubyspec-precheck:
 	@exit 1
 !endif
 
-$(MKFILES): $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/common.mk $(srcdir)/enc/Makefile.in
+$(MKFILES): $(srcdir)/common.mk $(srcdir)/version.h \
+	    $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat \
+	    $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak \
+	    $(srcdir)/enc/Makefile.in
 	$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
 	@fc Makefile Makefile.old > nul && echo Makefile unchanged || \
 	(echo $(MKFILES) was updated, re-run $(MAKE). & exit 1)
diff --git a/win32/setup.mak b/win32/setup.mak
index b6358e5dd5..3b70d0ac1a 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -109,7 +109,7 @@ check-psapi.h: nul
 int main(void) {return (EnumProcesses(NULL,0,NULL) ? 0 : 1);}
 <<
 
--version-: nul
+-version-: nul verconf.mk
 	@$(APPEND)
 	@$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE)
 #define RUBY_REVISION 0
@@ -118,10 +118,16 @@ MAJOR = RUBY_API_VERSION_MAJOR
 MINOR = RUBY_API_VERSION_MINOR
 TEENY = RUBY_API_VERSION_TEENY
 RUBY_PROGRAM_VERSION = RUBY_VERSION
-RUBY_PROGRAM_RELEASE_DATE = RUBY_RELEASE_DATE
 MSC_VER = _MSC_VER
 <<
 
+verconf.mk: nul
+	@$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(@)" | findstr "=" >$(@)
+#define RUBY_REVISION 0
+#include "version.h"
+RUBY_PROGRAM_RELEASE_DATE = RUBY_RELEASE_DATE
+<<
+
 -program-name-:
 	@type << >>$(MAKEFILE)
 !ifdef PROGRAM_PREFIX
-- 
cgit v1.2.3