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

* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:

add extout option.

* bcc32/setup.mak: make configuration variables overridable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-04-19 22:28:28 +00:00
parent 98cc039220
commit 7f530ef4e1
7 changed files with 62 additions and 2 deletions

View file

@ -1,3 +1,10 @@
Wed Apr 20 07:27:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
add extout option.
* bcc32/setup.mak: make configuration variables overridable.
Tue Apr 19 23:37:09 2005 WATANABE Hirofumi <eban@ruby-lang.org>
* lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.

View file

@ -20,6 +20,7 @@ if "%1" == "--program-suffix" goto :suffix
if "%1" == "--program-name" goto :progname
if "%1" == "--enable-install-doc" goto :enable-rdoc
if "%1" == "--disable-install-doc" goto :disable-rdoc
if "%1" == "--extout" goto :extout
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
echo>> ~tmp~.mak "%1" \
@ -67,6 +68,11 @@ goto :loop
echo>> ~tmp~.mak -D"RDOCTARGET=install-nodoc" \
shift
goto :loop
:extout
echo>> ~tmp~.mak "EXTOUT=%2" \
shift
shift
goto :loop
:help
echo Configuration:
echo --help display this help

View file

@ -14,7 +14,7 @@ prefix = /usr
!endif
OS = bccwin32
RT = $(OS)
INCLUDE = !include
BANG = !
APPEND = echo>>$(MAKEFILE)
!ifdef MAKEFILE
MAKE = $(MAKE) -f $(MAKEFILE)
@ -34,11 +34,24 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
@echo Creating $(MAKEFILE)
@type > $(MAKEFILE) &&|
\#\#\# Makefile for ruby $(OS) \#\#\#
$(BANG)ifndef srcdir
srcdir = $(srcdir:\=/)
$(BANG)endif
$(BANG)ifndef prefix
prefix = $(prefix:\=/)
$(BANG)endif
$(BANG)ifndef EXTSTATIC
EXTSTATIC = $(EXTSTATIC)
$(BANG)endif
!if defined(RDOCTARGET)
$(BANG)ifndef RDOCTARGET
RDOCTARGET = $(RDOCTARGET)
$(BANG)endif
!endif
!if defined(EXTOUT)
$(BANG)ifndef EXTOUT
EXTOUT = $(EXTOUT)
$(BANG)endif
!endif
|
@cpp32 -I$(srcdir) -P- -DRUBY_EXTERN="//" -o$(MAKEFILE) > nul &&|
@ -54,28 +67,44 @@ TEENY = RUBY_VERSION_TEENY
!if defined(PROCESSOR_ARCHITECTURE) || defined(PROCESSOR_LEVEL)
@type >> $(MAKEFILE) &&|
!if defined(PROCESSOR_ARCHITECTURE)
$(BANG)ifndef PROCESSOR_ARCHITECTURE
PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
$(BANG)endif
!endif
!if defined(PROCESSOR_LEVEL)
$(BANG)ifndef PROCESSOR_LEVEL
PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
$(BANG)endif
!endif
|
!endif
-alpha-: nul
@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
@$(APPEND) !endif
-ix86-: nul
@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
@$(APPEND) PROCESSOR_ARCHITECTURE = x86
@$(APPEND) !endif
-i386-: -ix86-
@$(APPEND) !ifndef PROCESSOR_LEVEL
@$(APPEND) PROCESSOR_LEVEL = 3
@$(APPEND) !endif
-i486-: -ix86-
@$(APPEND) !ifndef PROCESSOR_LEVEL
@$(APPEND) PROCESSOR_LEVEL = 4
@$(APPEND) !endif
-i586-: -ix86-
@$(APPEND) !ifndef PROCESSOR_LEVEL
@$(APPEND) PROCESSOR_LEVEL = 5
@$(APPEND) !endif
-i686-: -ix86-
@$(APPEND) !ifndef PROCESSOR_LEVEL
@$(APPEND) PROCESSOR_LEVEL = 6
@$(APPEND) !endif
-epilogue-: nul
@type >> $(MAKEFILE) &&|
@ -90,7 +119,7 @@ PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
\# LDFLAGS = -S:$$(STACK)
\# RFLAGS = $$(iconinc)
\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
$(INCLUDE) $$(srcdir)bcc32/Makefile.sub
$(BANG)include $$(srcdir)bcc32/Makefile.sub
|
@$(srcdir:/=\)\win32\rm.bat config.h config.status
@echo type "`$(MAKE)'" to make ruby for $(OS).

View file

@ -20,6 +20,7 @@ if "%1" == "--program-suffix" goto :suffix
if "%1" == "--program-name" goto :progname
if "%1" == "--enable-install-doc" goto :enable-rdoc
if "%1" == "--disable-install-doc" goto :disable-rdoc
if "%1" == "--extout" goto :extout
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
echo>> ~tmp~.mak "%1" \
@ -67,6 +68,11 @@ goto :loop
echo>> ~tmp~.mak "RDOCTARGET=install-nodoc" \
shift
goto :loop
:extout
echo>> ~tmp~.mak "EXTOUT=%2" \
shift
shift
goto :loop
:help
echo Configuration:
echo --help display this help

View file

@ -43,6 +43,9 @@ EXTSTATIC = $(EXTSTATIC)
!if defined(RDOCTARGET)
RDOCTARGET = $(RDOCTARGET)
!endif
!if defined(EXTOUT)
EXTOUT = $(EXTOUT)
!endif
<<
-system-vars-: -osname- -runtime-

View file

@ -20,6 +20,7 @@ if "%1" == "--program-suffix" goto :suffix
if "%1" == "--program-name" goto :progname
if "%1" == "--enable-install-doc" goto :enable-rdoc
if "%1" == "--disable-install-doc" goto :disable-rdoc
if "%1" == "--extout" goto :extout
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
if "%1" == "CC" goto :define
@ -77,6 +78,11 @@ goto :loop
echo>> ~tmp~.mak "RDOCTARGET=install-nodoc" \
shift
goto :loop
:extout
echo>> ~tmp~.mak "EXTOUT=%2" \
shift
shift
goto :loop
:help
echo Configuration:
echo --help display this help

View file

@ -55,6 +55,9 @@ EXTSTATIC = $(EXTSTATIC)
!if defined(RDOCTARGET)
RDOCTARGET = $(RDOCTARGET)
!endif
!if defined(EXTOUT)
EXTOUT = $(EXTOUT)
!endif
<<
@$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
#include "version.h"