kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32/setup.mak: separate verconf.mk

Browse source 
* 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
This commit is contained in:
nobu 2014-06-10 08:30:01 +00:00
parent 5c99f241a0
commit 2e2ccab110
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
win32/Makefile.sub
View file

@ -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)

10
win32/setup.mak
View file

@ -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