From e0006c665daa215810ab7f50bf1881b9f02b011f Mon Sep 17 00:00:00 2001 From: uema2 Date: Fri, 27 Dec 2002 08:55:31 +0000 Subject: * wince/config, wince/configure.bat: replace 1.7 with 1.8 in macros. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- wince/config | 10 +- wince/configure.bat | 266 ++++++++++++++++++++++++++-------------------------- 2 files changed, 135 insertions(+), 141 deletions(-) (limited to 'wince') diff --git a/wince/config b/wince/config index a3982c8ee8..910259a9e2 100644 --- a/wince/config +++ b/wince/config @@ -75,18 +75,12 @@ #define SETPGRP_VOID 1 #define inline __inline #define RSHIFT(x,y) ((x)>>(int)y) -/*#define FILE_COUNT _cnt*/ -/*#define FILE_READPTR _ptr*/ #define DEFAULT_KCODE KCODE_NONE #define DLEXT ".so" #define DLEXT2 ".dll" -/*#define NT 1*/ -#define RUBY_LIB "/lib/ruby/1.7" +#define RUBY_LIB "/lib/ruby/1.8" #define RUBY_SITE_LIB "/lib/ruby/site_ruby" -#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/1.7" -/*#define RUBY_PLATFORM "mips-mswince"*/ -/*#define RUBY_ARCHLIB "/lib/ruby/1.7/mips-mswince"*/ -/*#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/mips-mswince"*/ +#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/1.8" /* below wince's original definition. */ diff --git a/wince/configure.bat b/wince/configure.bat index 6f79e69e51..9c0054a088 100644 --- a/wince/configure.bat +++ b/wince/configure.bat @@ -1,133 +1,133 @@ -@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.7/mips-mswince" >> config.h -echo #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/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.7/arm-mswince" >> config.h -echo #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/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.7/sh3-mswince" >> config.h -echo #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/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.7/sh4-mswince" >> config.h -echo #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/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 - -:end +@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 + +:end -- cgit v1.2.3