mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/configure.bat: now recognize --with-*-{dir,include,lib} options
and pass them to mkmf. * win32/configure.bat: general conversion from ``/'' to ``\'' of configure_args is not necessary any longer. * win32/setup.mak: BASERUBY is used as command, so always need to convert ``/'' to ``\'' within it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
dd00d45244
commit
0f406d278f
3 changed files with 25 additions and 3 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
Tue Dec 8 23:41:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* win32/configure.bat: now recognize --with-*-{dir,include,lib} options
|
||||
and pass them to mkmf.
|
||||
|
||||
* win32/configure.bat: general conversion from ``/'' to ``\'' of
|
||||
configure_args is not necessary any longer.
|
||||
|
||||
* win32/setup.mak: BASERUBY is used as command, so always need to
|
||||
convert ``/'' to ``\'' within it.
|
||||
|
||||
Tue Dec 8 23:39:52 2009 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* numeric.c (flo_eq): supress a warning on VC++ for x64.
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
echo> ~tmp~.mak ####
|
||||
echo>> ~tmp~.mak conf = %0
|
||||
echo>> ~tmp~.mak $(conf:\=/): nul
|
||||
echo>> ~tmp~.mak $(conf): nul
|
||||
echo>> ~tmp~.mak @del ~setup~.mak
|
||||
echo>> ~tmp~.mak @-$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.mak \
|
||||
if exist pathlist.tmp del pathlist.tmp
|
||||
|
@ -30,9 +30,15 @@ if "%1" == "--disable-win95" goto :disable-win95
|
|||
if "%1" == "--extout" goto :extout
|
||||
if "%1" == "--path" goto :path
|
||||
if "%1" == "--with-baseruby" goto :baseruby
|
||||
if "%1" == "--with-ntver" goto :ntver
|
||||
echo %1| findstr "^--with-.*-dir$" > nul
|
||||
if not errorlevel 1 goto :withdir
|
||||
echo %1| findstr "^--with-.*-include$" > nul
|
||||
if not errorlevel 1 goto :withdir
|
||||
echo %1| findstr "^--with-.*-lib$" > nul
|
||||
if not errorlevel 1 goto :withdir
|
||||
if "%1" == "-h" goto :help
|
||||
if "%1" == "--help" goto :help
|
||||
if "%1" == "--with-ntver" goto :ntver
|
||||
echo>>confargs.tmp %1 \
|
||||
shift
|
||||
goto :loop
|
||||
|
@ -132,6 +138,11 @@ goto :loop
|
|||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:withdir
|
||||
echo>>confargs.tmp %1=%2 \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:help
|
||||
echo Configuration:
|
||||
echo --help display this help
|
||||
|
|
|
@ -53,7 +53,7 @@ RDOCTARGET = $(RDOCTARGET)
|
|||
EXTOUT = $(EXTOUT)
|
||||
!endif
|
||||
!if defined(BASERUBY)
|
||||
BASERUBY = $(BASERUBY)
|
||||
BASERUBY = $(BASERUBY:/=\)
|
||||
!endif
|
||||
!if defined(NTVER)
|
||||
NTVER = $(NTVER)
|
||||
|
|
Loading…
Reference in a new issue