summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-06-01 04:44:45 +0000
committeruema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-06-01 04:44:45 +0000
commitdc13952417e5c918de9bd51f504db7a289ddabed (patch)
treefd6ab49ddda8377a46ac13f04417e773785e3add
parent9f6f32c7378fd933af37ea1ddedca133bf4431e9 (diff)
* wince/string_wce.c: add strpbrk() for hpcpro support.
* wince/setup.mak: add hpcpro(CE2.11) & armv4t(CE.NET) support. * wince/resource.rb: ditto. * wince/Makefile.sub: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
-rw-r--r--wince/Makefile.sub18
-rw-r--r--wince/resource.rb7
-rw-r--r--wince/setup.mak16
-rw-r--r--wince/string_wce.c20
5 files changed, 57 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 70cd4b2..d0faa38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Jun 01 13:33:49 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+
+ * wince/string_wce.c: add strpbrk() for hpcpro support.
+
+ * wince/setup.mak: add hpcpro(CE2.11) & armv4t(CE.NET) support.
+
+ * wince/resource.rb: ditto.
+
+ * wince/Makefile.sub: ditto.
+
Sun Jun 1 10:38:28 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* variable.c (rb_autoload_load): autoloaded constants under a module
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index abc86bd..d4b058b 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -182,7 +182,6 @@ OBJS = array.obj \
all: ext minirubyce$(EXEEXT) rbconfig.rb \
$(LIBRUBY) $(MISCLIBS)
-# @$(MINIRUBY) $(srcdir)/ext/extmk.rb --extstatic=$(EXTSTATIC) --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)"
@miniruby$(EXEEXT) $(srcdir)/ext/extmk.rb --extstatic=$(EXTSTATIC) --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)"
ext:
@@ -298,6 +297,20 @@ $(BANG)endif
#define read _read
#define write _write
#define lseek _lseek
+
+#if _WIN32_WCE < 300
+ #define isascii(c) ( (c>=0x00&&c<=0x7f)?1:0 )
+ #define isspace(c) ( ((c>=0x09&&c<=0x0d)||c==0x20)?1:0 )
+ #define isdigit(c) ( (c>=0x00&&c<=0x09)?1:0 )
+ #define isupper(c) ( (c>='A'&&c<='Z')?1:0 )
+ #define isalpha(c) ( ((c>='A'&&c<='Z')||(c>='a'&&c<='z'))?1:0 )
+ #define isprint(c) ( (c>=0x20&&c<=0x7e)?1:0 )
+ #define isalnum(c) ( (isalpha(c)||isdigit(c))?1:0 )
+ #define iscntrl(c) ( ((c>=0x00&&c<=0x1f)||c==0x7f)?1:0 )
+ #define islower(c) ( (c>='a'&&c<='z')?1:0 )
+ #define ispunct(c) ( !(isalnum(c)||isspace(c))?1:0 )
+ #define isxdigit(c) ( ((c>=0&&c<=9)||(c>='A'&&c<='F')||(c>='a'&&c<='f'))?1:0 )
+#endif
<<KEEP
config.status: Makefile $(srcdir)/wince/Makefile.sub
@@ -434,8 +447,6 @@ $(RUBYDEF): $(LIBRUBY_A) minirubyce$(EXEEXT)
$(AR) $(ARFLAGS)$@ -def:$<
install: rbconfig.rb
-# miniruby$(EXEEXT) $(srcdir)/instruby.rb -$(MFLAGS)$(MAKEFLAGS) $(DESTDIR)
-# miniruby$(EXEEXT) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install
miniruby$(EXEEXT) $(srcdir)/instruby.rb \
"--dest-dir=$(DESTDIR)" "--make=nmake"
miniruby$(EXEEXT) $(srcdir)/ext/extmk.rb \
@@ -508,6 +519,7 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
-ruby_name=$(RUBY_INSTALL_NAME) \
-rubyw_name=$(RUBYW_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) \
+ -wce_ver=$(SUBSYSVERSION) \
. $(icondirs) $(srcdir)/wince
{$(srcdir)/missing}.c.obj:
diff --git a/wince/resource.rb b/wince/resource.rb
index 4b3d1af..f407266 100644
--- a/wince/resource.rb
+++ b/wince/resource.rb
@@ -54,11 +54,10 @@ end
open(base + '.rc', "w") { |f|
f.binmode if /mingw/ =~ RUBY_PLATFORM
+ f.print("#include <windows.h>\n")
+ f.print("#include <winver.h>\n") if $wce_ver=="2.11"
+
f.print <<EOF
-#include <windows.h>
-#if _WIN32_WCE > 400
- #include <winver.h>
-#endif
#{icons}
VS_VERSION_INFO VERSIONINFO
diff --git a/wince/setup.mak b/wince/setup.mak
index 49d4309..316d0f3 100644
--- a/wince/setup.mak
+++ b/wince/setup.mak
@@ -40,6 +40,7 @@ sh3-ppc-wince: -prologue- -sh3- -ppc- -epilogue-
sh3-hpcpro-wince: -prologue- -sh3- -hpcpro2- -epilogue-
sh4-hpcpro-wince: -prologue- -sh4- -hpcpro2- -epilogue-
armv4-.net41-wince: -prologue- -armv4- -.net41- -epilogue-
+armv4t-.net41-wince: -prologue- -armv4t- -.net41- -epilogue-
-prologue-: nul
@type << > $(MAKEFILE)
@@ -87,10 +88,9 @@ $(CPU) = $(PROCESSOR_LEVEL)
@$(APPEND) CC = cl$(@:-=)
-sh3- -sh4-::
@$(APPEND) CC = shcl
--armv4-::
+-armv4- -armv4t-::
@$(APPEND) CC = clarm
- @$(APPEND) ARCHFOLDER = armv4
- @$(APPEND) $(ARCH) = arm
+ @$(APPEND) ARCHFOLDER = $(@:-=)
-arm-::
@@ -103,6 +103,10 @@ $(CPU) = $(PROCESSOR_LEVEL)
@$(APPEND) CECPUDEF = -DSHx -DSH4 -D_SH4_
-armv4-::
@$(APPEND) CECPUDEF = -DARM -D_ARM_ -DARMV4
+ @$(APPEND) $(ARCH) = ARM
+-armv4t-::
+ @$(APPEND) CECPUDEF = -DARM -D_ARM_ -DARMV4T
+ @$(APPEND) $(ARCH) = THUMB
-hpc2k-: -hpc2000-
@@ -176,16 +180,14 @@ LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS Pocket PC/lib/$$(PROCESSOR_ARC
"-MS HPC Pro--":
@type << >>$(MAKEFILE)
-INCLUDE = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/$(@:-=)/include
-LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/$(@:-=)/lib
+INCLUDE = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS HPC Pro/include
+LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS HPC Pro/lib/$$(PROCESSOR_ARCHITECTURE)
<<
-.net41-:
@type << >>$(MAKEFILE)
INCLUDE = $$(CE_TOOLS4_DIR)/wce400/STANDARDSDK/include/$$(ARCHFOLDER)
LIB = $$(CE_TOOLS4_DIR)/wce400/STANDARDSDK/lib/$$(ARCHFOLDER)
-#INCLUDE = $$(CE_TOOLS4_DIR)/wce400/STANDARDSDK/include/$$(PROCESSOR_ARCHITECTURE)
-#LIB = $$(CE_TOOLS4_DIR)/wce400/STANDARDSDK/lib/$$(PROCESSOR_ARCHITECTURE)
<<
diff --git a/wince/string_wce.c b/wince/string_wce.c
index 2a55149..a1ee075 100644
--- a/wince/string_wce.c
+++ b/wince/string_wce.c
@@ -66,4 +66,24 @@ int stricmp( const char *s1, const char *s2 )
return n;
}
+
+char *strpbrk(const char *str, const char *cs)
+{
+ wchar_t *wstr, *wcs, *w;
+ char *s = NULL;
+
+ wstr = wce_mbtowc(str);
+ wcs = wce_mbtowc(cs);
+
+ w = wcspbrk(wstr, wcs);
+
+ if( w!=NULL )
+ s = str + (wcs-wstr)/sizeof(wchar_t);
+
+ free(wstr);
+ free(wcs);
+
+ return s;
+}
+
#endif