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: reorder

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-02-01 04:54:03 +00:00
parent af078b93d8
commit e704fc8280
1 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
win32/setup.mak
View file

@ -24,19 +24,16 @@ CC = cl -nologo
CPP = $(CC) -EP CPP = $(CC) -EP
all: -prologue- -generic- -epilogue- all: -prologue- -generic- -epilogue-
i386-mswin32: -prologue32- -i386- -epilogue- i386-mswin32: -prologue- -i386- -epilogue-
i486-mswin32: -prologue32- -i486- -epilogue- i486-mswin32: -prologue- -i486- -epilogue-
i586-mswin32: -prologue32- -i586- -epilogue- i586-mswin32: -prologue- -i586- -epilogue-
i686-mswin32: -prologue32- -i686- -epilogue- i686-mswin32: -prologue- -i686- -epilogue-
alpha-mswin32: -prologue32- -alpha- -epilogue- alpha-mswin32: -prologue- -alpha- -epilogue-
x64-mswin64: -prologue64- -x64- -epilogue- x64-mswin64: -prologue- -x64- -epilogue-
ia64-mswin64: -prologue64- -ia64- -epilogue- ia64-mswin64: -prologue- -ia64- -epilogue-
-prologue-: -basic-vars- -system-vars- -version- -program-name- -prologue-: -basic-vars-
-generic-: -osname-
-prologue32-: -basic-vars- -system-vars32- -version- -program-name-
-prologue64-: -basic-vars- -system-vars64- -version- -program-name-
-basic-vars-: nul -basic-vars-: nul
@type << > $(MAKEFILE) @type << > $(MAKEFILE)
@ -79,19 +76,17 @@ USE_RUBYGEMS = $(USE_RUBYGEMS)
@echo HAVE_BASERUBY = no>> $(MAKEFILE) @echo HAVE_BASERUBY = no>> $(MAKEFILE)
!endif !endif
-system-vars-: -osname- -runtime- -headers- -osname-section-:
@$(APPEND)
@echo # TARGET>>$(MAKEFILE)
-system-vars32-: -osname32- -runtime- -headers- -osname32-: -osname-section-
-system-vars64-: -osname64- -runtime- -headers-
-osname32-: nul
@echo TARGET_OS = mswin32>>$(MAKEFILE) @echo TARGET_OS = mswin32>>$(MAKEFILE)
-osname64-: nul -osname64-: -osname-section-
@echo TARGET_OS = mswin64>>$(MAKEFILE) @echo TARGET_OS = mswin64>>$(MAKEFILE)
-osname-: nul -osname-: -osname-section-
@echo !ifndef TARGET_OS>>$(MAKEFILE) @echo !ifndef TARGET_OS>>$(MAKEFILE)
@($(CC) -c <<conftest.c > nul && (echo TARGET_OS = mswin32) || (echo TARGET_OS = mswin64)) >>$(MAKEFILE) @($(CC) -c <<conftest.c > nul && (echo TARGET_OS = mswin32) || (echo TARGET_OS = mswin64)) >>$(MAKEFILE)
#ifdef _WIN64 #ifdef _WIN64
@ -101,6 +96,12 @@ USE_RUBYGEMS = $(USE_RUBYGEMS)
@echo !endif>>$(MAKEFILE) @echo !endif>>$(MAKEFILE)
@$(WIN32DIR:/=\)\rm.bat conftest.* @$(WIN32DIR:/=\)\rm.bat conftest.*
-compiler-: -compiler-section- -version- -runtime- -headers-
-compiler-section-:
@$(APPEND)
@echo # COMPILER>>$(MAKEFILE)
-runtime-: nul -runtime-: nul
@$(CC) -MD <<conftest.c user32.lib -link > nul @$(CC) -MD <<conftest.c user32.lib -link > nul
#include <stdio.h> #include <stdio.h>
@ -119,7 +120,6 @@ int main(void) {return (EnumProcesses(NULL,0,NULL) ? 0 : 1);}
<< <<
-version-: nul verconf.mk -version-: nul verconf.mk
@$(APPEND)
@$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE) @$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE)
MSC_VER = _MSC_VER MSC_VER = _MSC_VER
<< <<
@ -150,6 +150,8 @@ del %0 & exit
-program-name-: -program-name-:
@type << >>$(MAKEFILE) @type << >>$(MAKEFILE)
# PROGRAM-NAME
!ifdef PROGRAM_PREFIX !ifdef PROGRAM_PREFIX
PROGRAM_PREFIX = $(PROGRAM_PREFIX) PROGRAM_PREFIX = $(PROGRAM_PREFIX)
!endif !endif
@ -177,15 +179,14 @@ MACHINE = x86
!if defined($(CPU)) !if defined($(CPU))
@echo>>$(MAKEFILE) $(CPU) = $(PROCESSOR_LEVEL) @echo>>$(MAKEFILE) $(CPU) = $(PROCESSOR_LEVEL)
!endif !endif
@$(APPEND)
-alpha-: nul -alpha-: -osname32-
@echo MACHINE = alpha>>$(MAKEFILE) @echo MACHINE = alpha>>$(MAKEFILE)
-x64-: nul -x64-: -osname64-
@echo MACHINE = x64>>$(MAKEFILE) @echo MACHINE = x64>>$(MAKEFILE)
-ia64-: nul -ia64-: -osname64-
@echo MACHINE = ia64>>$(MAKEFILE) @echo MACHINE = ia64>>$(MAKEFILE)
-ix86-: nul -ix86-: -osname32-
@echo MACHINE = x86>>$(MAKEFILE) @echo MACHINE = x86>>$(MAKEFILE)
-i386-: -ix86- -i386-: -ix86-
@ -197,9 +198,11 @@ MACHINE = x86
-i686-: -ix86- -i686-: -ix86-
@echo $(CPU) = 6>>$(MAKEFILE) @echo $(CPU) = 6>>$(MAKEFILE)
-epilogue-: -encs- -epilogue-: -compiler- -program-name- -encs-
-encs-: nul -encs-: nul
@$(APPEND)
@echo # ENCODING>>$(MAKEFILE)
@$(MAKE) -l -f $(srcdir)/win32/enc-setup.mak srcdir="$(srcdir)" MAKEFILE=$(MAKEFILE) @$(MAKE) -l -f $(srcdir)/win32/enc-setup.mak srcdir="$(srcdir)" MAKEFILE=$(MAKEFILE)
-epilogue-: nul -epilogue-: nul