ruby-changes:14229
From: usa <ko1@a...>
Date: Tue, 8 Dec 2009 23:54:16 +0900 (JST)
Subject: [ruby-changes:14229] Ruby:r26051 (trunk): * win32/configure.bat: now recognize --with-*-{dir,include,lib} options
usa 2009-12-08 23:53:55 +0900 (Tue, 08 Dec 2009) New Revision: 26051 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26051 Log: * 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. Modified files: trunk/ChangeLog trunk/win32/configure.bat trunk/win32/setup.mak Index: ChangeLog =================================================================== --- ChangeLog (revision 26050) +++ ChangeLog (revision 26051) @@ -1,3 +1,14 @@ +Tue Dec 8 23:41:34 2009 NAKAMURA Usaku <usa@r...> + + * 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@r...> * numeric.c (flo_eq): supress a warning on VC++ for x64. Index: win32/configure.bat =================================================================== --- win32/configure.bat (revision 26050) +++ win32/configure.bat (revision 26051) @@ -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" == "--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 @@ shift shift goto :loop +:withdir + echo>>confargs.tmp %1=%2 \ + shift + shift +goto :loop :help echo Configuration: echo --help display this help Index: win32/setup.mak =================================================================== --- win32/setup.mak (revision 26050) +++ win32/setup.mak (revision 26051) @@ -53,7 +53,7 @@ EXTOUT = $(EXTOUT) !endif !if defined(BASERUBY) -BASERUBY = $(BASERUBY) +BASERUBY = $(BASERUBY:/=\) !endif !if defined(NTVER) NTVER = $(NTVER) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/