* wince/ : files removed.

           (config, dll.mak, exe.mak, mswince-ruby17.def,
            io.c, process.c, signal.c, string.c, time.c)

* wince/ : files added.
         (assert.c, Makefile.sub, mkexports.rb, io_wce.c,
            process_wce.c, signal_wce.c, string_wce.c,
            time_wce.c)

* wince/configure.bat : like mswin32 style.

* wince/direct.c : remove "static" at _currentdir.

* wince/io.h : change definition.

* wince/stdio.c : _fdopen -> fdopen.

* wince/process.h : add_P_OVERLAY.

* wince/time.h : change definition.

* wince/wincemain.c : add wce_SetCurrentDir.

* wince/wince.c : add wce_SetCurrentDir and wce_fopen.
	                  fix GetModuleFileNameA to return correct "lpFileName".

* wince/wince.h : remove #ifdef.

* wince/sys/utime.h, utime.c : rename _utime to utime.

* wince/sys/stat.c : expand relative directory in stat.


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

1 files changed, 55 insertions, 131 deletions

diff --git a/wince/configure.bat b/wince/configure.bat
index 9c0054a088..6240a3cee8 100644
--- a/wince/configure.bat
+++ b/wince/configure.bat
@@ -1,133 +1,57 @@
 @echo off
-
-if "%1"==""     goto error
-if "%2"==""     goto error
-
-if exist make.bat @del make.bat
-
-if "%1"=="MIPS" goto mips
-if "%1"=="ARM"  goto arm
-if "%1"=="SH3"  goto sh3
-if "%1"=="SH4"  goto sh4
-
-:mips
-
-copy config config.h
-echo #define RUBY_PLATFORM "mips-mswince" >> config.h
-echo #define RUBY_ARCHLIB "/lib/ruby/1.8/mips-mswince" >> config.h
-echo #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.8/mips-mswince" >> config.h
-
-if "%2"=="HPC2K"  goto mipshpc2k
-if "%2"=="PPC"    goto mipsppc
-if "%2"=="HPCPRO" goto mipshpcpro
-
-:mipshpc2k
-  echo nmake /f "dll.mak" CFG=MIPS >> make.bat
-  echo nmake /f "exe.mak" CFG=MIPS >> make.bat
-  set path=c:\program files\microsoft embedded tools\common\evc\bin;C:\Program Files\Microsoft eMbedded Tools\EVC\WCE300\BIN
-  set include=c:\windows ce tools\wce300\hpc2000\include
-  set lib=C:\Windows CE Tools\wce300\hpc2000\lib\mips
-  goto normalend
-:mipsppc
-  echo nmake /f "dll.mak" CFG=MIPS >> make.bat
-  echo nmake /f "exe.mak" CFG=MIPS >> make.bat
-  set path=c:\program files\microsoft embedded tools\common\evc\bin;C:\Program Files\Microsoft eMbedded Tools\EVC\WCE300\BIN
-  set include=c:\windows ce tools\wce300\MS Pocket PC\include
-  set lib=c:\windows ce tools\wce300\MS Pocket PC\lib\mips
-  goto normalend
-:mipshpcpro
-  echo nmake /f "dll.mak" CFG=MIPS CESubsystem=windowsce,2.11 CEVersion=211 >> make.bat
-  echo nmake /f "exe.mak" CFG=MIPS CESubsystem=windowsce,2.11 CEVersion=211 >> make.bat
-  set path=c:\program files\microsoft embedded tools\common\evc\bin;C:\Program Files\Microsoft eMbedded Tools\EVC\WCE211\BIN
-  set include=C:\Windows CE Tools\wce211\MS HPC Pro\include
-  set lib=C:\Windows CE Tools\wce211\MS HPC Pro\lib\mips
-  goto normalend
-
-:arm
-
-copy config config.h
-echo #define RUBY_PLATFORM "arm-mswince" >> config.h
-echo #define RUBY_ARCHLIB "/lib/ruby/1.8/arm-mswince" >> config.h
-echo #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.8/arm-mswince" >> config.h
-
-if "%2"=="HPC2K"  goto armhpc2k
-if "%2"=="PPC"    goto armppc
-if "%2"=="HPCPRO" goto armhpcpro
-
-:armhpc2k
-  echo nmake /f "dll.mak" CFG=ARM >> make.bat
-  echo nmake /f "exe.mak" CFG=ARM >> make.bat
-  set path=c:\program files\microsoft embedded tools\common\evc\bin;C:\Program Files\Microsoft eMbedded Tools\EVC\WCE300\BIN
-  set include=c:\windows ce tools\wce300\hpc2000\include
-  set lib=C:\Windows CE Tools\wce300\hpc2000\lib\arm
-  goto normalend
-:armppc
-  echo nmake /f "dll.mak" CFG=ARM >> make.bat
-  echo nmake /f "exe.mak" CFG=ARM >> make.bat
-  set path=c:\program files\microsoft embedded tools\common\evc\bin;C:\Program Files\Microsoft eMbedded Tools\EVC\WCE300\BIN
-  set include=c:\windows ce tools\wce300\MS Pocket PC\include
-  set lib=c:\windows ce tools\wce300\MS Pocket PC\lib\arm
-  goto normalend
-:armhpcpro
-  echo nmake /f "dll.mak" CFG=ARM CESubsystem=windowsce,2.11 CEVersion=211 >> make.bat
-  echo nmake /f "exe.mak" CFG=ARM CESubsystem=windowsce,2.11 CEVersion=211 >> make.bat
-  set path=c:\program files\microsoft embedded tools\common\evc\bin;C:\Program Files\Microsoft eMbedded Tools\EVC\WCE211\BIN
-  set include=C:\Windows CE Tools\wce211\MS HPC Pro\include
-  set lib=C:\Windows CE Tools\wce211\MS HPC Pro\lib\arm
-  goto normalend
-
-:sh3
-
-copy config config.h
-echo #define RUBY_PLATFORM "sh3-mswince" >> config.h
-echo #define RUBY_ARCHLIB "/lib/ruby/1.8/sh3-mswince" >> config.h
-echo #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.8/sh3-mswince" >> config.h
-
-if "%2"=="HPC2K"  goto error
-if "%2"=="PPC"    goto sh3ppc
-if "%2"=="HPCPRO" goto sh3hpcpro
-
-:sh3ppc
-  echo nmake /f "dll.mak" CFG=SH3 >> make.bat
-  echo nmake /f "exe.mak" CFG=SH3 >> make.bat
-  set path=c:\program files\microsoft embedded tools\common\evc\bin;C:\Program Files\Microsoft eMbedded Tools\EVC\WCE300\BIN
-  set include=c:\windows ce tools\wce300\MS Pocket PC\include
-  set lib=c:\windows ce tools\wce300\MS Pocket PC\lib\sh3
-  goto normalend
-:sh3hpcpro
-  echo nmake /f "dll.mak" CFG=SH3 CESubsystem=windowsce,2.11 CEVersion=211 >> make.bat
-  echo nmake /f "exe.mak" CFG=SH3 CESubsystem=windowsce,2.11 CEVersion=211 >> make.bat
-  set path=c:\program files\microsoft embedded tools\common\evc\bin;C:\Program Files\Microsoft eMbedded Tools\EVC\WCE211\BIN
-  set include=C:\Windows CE Tools\wce211\MS HPC Pro\include
-  set lib=C:\Windows CE Tools\wce211\MS HPC Pro\lib\sh3
-  goto normalend
-
-:sh4
-
-copy config config.h
-echo #define RUBY_PLATFORM "sh4-mswince" >> config.h
-echo #define RUBY_ARCHLIB "/lib/ruby/1.8/sh4-mswince" >> config.h
-echo #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.8/sh4-mswince" >> config.h
-
-if "%2"=="HPC2K"  goto error
-if "%2"=="PPC"    goto error
-if "%2"=="HPCPRO" goto sh4hpcpro
-
-:sh4hpcpro
-  echo nmake /f "dll.mak" CFG=SH4 CESubsystem=windowsce,2.11 CEVersion=211 >> make.bat
-  echo nmake /f "exe.mak" CFG=SH4 CESubsystem=windowsce,2.11 CEVersion=211 >> make.bat
-  set path=c:\program files\microsoft embedded tools\common\evc\bin;C:\Program Files\Microsoft eMbedded Tools\EVC\WCE211\BIN
-  set include=C:\Windows CE Tools\wce211\MS HPC Pro\include
-  set lib=C:\Windows CE Tools\wce211\MS HPC Pro\lib\sh4
-  goto normalend
-
-
-:error
-echo ERROR. Please check arguments.
-goto end
-
-:normalend
-echo configure OK. Please type ".\make.bat".
-goto end
-
+::: Don't set environment variable in batch file other than autoexec.bat
+::: to avoid "Out of environment space" problem on Windows 95/98.
+::: set TMPMAKE=~tmp~.mak
+
+echo> ~tmp~.mak ####
+echo>> ~tmp~.mak conf = %0
+echo>> ~tmp~.mak $(conf:\=/): nul
+echo>> ~tmp~.mak 	@del ~tmp~.mak
+echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.mak \
+:loop
+if "%1" == "" goto :end
+if "%1" == "--srcdir" goto :srcdir
+if "%1" == "srcdir" goto :srcdir
+if "%1" == "--target" goto :target
+if "%1" == "target" goto :target
+if "%1" == "--program-suffix" goto :suffix
+if "%1" == "--program-name" goto :progname
+if "%1" == "CC" goto :define
+if "%1" == "EMBEDDED_TOOLS_DIR" goto :define
+if "%1" == "CE_TOOLS_DIR" goto :define
+  echo>> ~tmp~.mak 	"%1" \
+  shift
+goto :loop
+:srcdir
+  echo>> ~tmp~.mak 	"srcdir=%2" \
+  shift
+  shift
+goto :loop
+:suffix
+  echo>> ~tmp~.mak 	"RUBY_SUFFIX=%2" \
+  shift
+  shift
+goto :loop
+:installname
+  echo>> ~tmp~.mak 	"RUBY_INSTALL_NAME=%2" \
+  shift
+  shift
+goto :loop
+:soname
+  echo>> ~tmp~.mak 	"RUBY_SO_NAME=%2" \
+  shift
+  shift
+goto :loop
+:define
+  echo>> ~tmp~.mak 	"%1=%2" \
+  shift
+  shift
+goto :loop
+:target
+  echo>> ~tmp~.mak 	"%2" \
+  shift
+  shift
+goto :loop
 :end
+echo>> ~tmp~.mak 	WIN32DIR=$(@D)
+nmake -alf ~tmp~.mak