* bcc32/{Makefile.sub,configure.bat,setup.mak: configure_args

  support.

* bcc32/setup.mak: check runtime version.

* win32/win32.c (rb_w32_open_osfhandle): prototype has changed
  in bcc 5.82.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 82 insertions, 18 deletions

diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 6e32df6fc7..8cdfc64b03 100755
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -6,76 +6,120 @@
 echo> ~tmp~.mak ####

 echo>> ~tmp~.mak conf = %0

 echo>> ~tmp~.mak $(conf:\=/): nul

-echo>> ~tmp~.mak 	@del ~tmp~.mak

+echo>> ~tmp~.mak 	@del ~setup~.mak

 echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)setup.mak \

+if exist pathlist.tmp del pathlist.tmp

+if exist confargs.mk del confargs.mk

 :loop

 if "%1" == "" goto :end

 if "%1" == "--prefix" goto :prefix

+if "%1" == "prefix" goto :prefix

 if "%1" == "--srcdir" goto :srcdir

 if "%1" == "srcdir" goto :srcdir

 if "%1" == "--target" goto :target

 if "%1" == "target" goto :target

 if "%1" == "--with-static-linked-ext" goto :extstatic

 if "%1" == "--program-suffix" goto :suffix

-if "%1" == "--program-name" goto :progname

+if "%1" == "RUBY_SUFFIX" goto :suffix

+if "%1" == "--program-name" goto :installname

+if "%1" == "--install-name" goto :installname

+if "%1" == "RUBY_INSTALL_NAME" goto :installname

+if "%1" == "--so-name" goto :soname

+if "%1" == "RUBY_SO_NAME" goto :soname

 if "%1" == "--enable-install-doc" goto :enable-rdoc

 if "%1" == "--disable-install-doc" goto :disable-rdoc

 if "%1" == "--extout" goto :extout

+if "%1" == "EXTOUT" goto :extout

 if "%1" == "--with-baseruby" goto :baseruby

+if "%1" == "BASERUBY" goto :baseruby

+if "%1" == "--path" goto :path

 if "%1" == "-h" goto :help

 if "%1" == "--help" goto :help

-  echo>> ~tmp~.mak 	"%1" \

+  echo>>confargs.tmp 	%1 \

   shift

 goto :loop

 :srcdir

-  echo>> ~tmp~.mak 	-D"srcdir=%2" \

+  echo>> ~tmp~.mak 	-Dsrcdir=%2 \

+  echo>>confargs.tmp 	--srcdir=%2 \

   shift

   shift

 goto :loop

 :prefix

-  echo>> ~tmp~.mak 	-D"prefix=%2" \

+  echo>> ~tmp~.mak 	-Dprefix=%2 \

+  echo>>confargs.tmp 	%1=%2 \

   shift

   shift

 goto :loop

 :suffix

-  echo>> ~tmp~.mak 	-D"RUBY_SUFFIX=%2" \

+  echo>>confargs.mk !ifndef RUBY_SUFFIX

+  echo>>confargs.mk RUBY_SUFFIX = %2

+  echo>>confargs.mk !endif

+  echo>>confargs.tmp 	%1=%2 \

   shift

   shift

 goto :loop

 :installname

-  echo>> ~tmp~.mak 	-D"RUBY_INSTALL_NAME=%2" \

+  echo>>confargs.mk !ifndef RUBY_INSTALL_NAME

+  echo>>confargs.mk RUBY_INSTALL_NAME = %2

+  echo>>confargs.mk !endif

+  echo>>confargs.tmp 	%1=%2 \

   shift

   shift

 goto :loop

 :soname

-  echo>> ~tmp~.mak 	-D"RUBY_SO_NAME=%2" \

+  echo>>confargs.mk !ifndef RUBY_SO_NAME

+  echo>>confargs.mk RUBY_SO_NAME = %2

+  echo>>confargs.mk !endif

+  echo>>confargs.tmp 	%1=%2 \

   shift

   shift

 goto :loop

 :target

-  echo>> ~tmp~.mak 	"%2" \

+  echo>> ~tmp~.mak 	%2 \

+  echo>>confargs.tmp 	--target=%2 \

   shift

   shift

 goto :loop

 :extstatic

-  echo>> ~tmp~.mak 	-D"EXTSTATIC=static" \

+  echo>>confargs.mk !ifndef EXTSTATIC

+  echo>>confargs.mk EXTSTATIC = static

+  echo>>confargs.mk !endif

+  echo>>confargs.tmp 	%1 \

   shift

 goto :loop

 :enable-rdoc

-  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-doc" \

+  echo>>confargs.mk !ifndef RDOCTARGET

+  echo>>confargs.mk RDOCTARGET = install-doc

+  echo>>confargs.mk !endif

+  echo>>confargs.tmp 	%1 \

   shift

 goto :loop

 :disable-rdoc

-  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-nodoc" \

+  echo>>confargs.mk !ifndef RDOCTARGET

+  echo>>confargs.mk RDOCTARGET = install-nodoc

+  echo>>confargs.mk !endif

+  echo>>confargs.tmp 	%1 \

   shift

 goto :loop

 :extout

-  echo>> ~tmp~.mak 	-D"EXTOUT=%2" \

+  echo>>confargs.mk !ifndef EXTOUT

+  echo>>confargs.mk EXTOUT = %2

+  echo>>confargs.mk !endif

+  echo>>confargs.tmp 	%1=%2 \

   shift

   shift

 goto :loop

 :baseruby

-  echo>> ~tmp~.mak 	-D"BASERUBY=%2" \

+  echo>>confargs.mk !ifndef BASERUBY

+  echo>>confargs.mk BASERUBY = %2

+  echo>>confargs.mk !endif

+  echo>>confargs.tmp 	%1=%2 \

+  shift

+  shift

+goto :loop

+:path

+  echo>>pathlist.tmp %2;\

+  echo>>confargs.tmp 	%1=%2 \

   shift

   shift

 goto :loop

@@ -84,16 +128,36 @@ goto :loop
   echo   --help                  display this help

   echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']

   echo Installation directories:

-  echo   --prefix=PREFIX         install files in PREFIX [/usr]

+  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)

   echo System types:

   echo   --target=TARGET         configure for TARGET [i386-bccwin32]

   echo Optional Package:

   echo   --with-baseruby=RUBY    use RUBY as baseruby [ruby]

   echo   --with-static-linked-ext link external modules statically

-  echo   --disable-install-doc   do not install rdoc indexes during install

+  echo   --enable-install-doc    install rdoc indexes during install

+  del *.tmp

   del ~tmp~.mak

 goto :exit

 :end

-echo>> ~tmp~.mak 	-Dbcc32dir="$(@D)"

-make -s -f ~tmp~.mak

+echo>> ~tmp~.mak 	-Dbcc32dir=$(@D)

+if not exist confargs.tmp goto :noconfargs

+    echo>>confargs.mk configure_args = \

+    type>>confargs.mk confargs.tmp

+    echo.>>confargs.mk

+    echo>>confargs.mk ####

+:noconfargs

+if not exist pathlist.tmp goto :nopathlist

+    echo>>confargs.mk pathlist = \

+    type>>confargs.mk pathlist.tmp

+    echo.>>confargs.mk

+    echo>>confargs.mk ####

+    echo>>confargs.mk PATH = $(pathlist:;=/bin;)$(PATH)

+    echo>>confargs.mk INCLUDE = $(pathlist:;=/include;)

+    echo>>confargs.mk LIB = $(pathlist:;=/lib;)

+:nopathlist

+if exist confargs.mk copy confargs.mk ~setup~.mak > nul

+type>>~setup~.mak ~tmp~.mak

+del *.tmp > nul

+del ~tmp~.mak > nul

+make -s -f ~setup~.mak

 :exit