diff options
Diffstat (limited to 'wince')
| -rw-r--r-- | wince/Makefile.ce | 31 | ||||
| -rw-r--r-- | wince/config_h.PL | 3 | ||||
| -rw-r--r-- | wince/config_sh.PL | 4 |
3 files changed, 22 insertions, 16 deletions
diff --git a/wince/Makefile.ce b/wince/Makefile.ce index 10b80a245f..8c9f96959c 100644 --- a/wince/Makefile.ce +++ b/wince/Makefile.ce @@ -534,6 +534,16 @@ PERLEXE = $(MACHINE)\perl.exe CONFIGPM = ..\xlib\$(CROSS_NAME)\Config.pm MINIMOD = ..\lib\ExtUtils\Miniperl.pm +# Unicode data files generated by mktables +UNIDATAFILES = ..\lib\unicore\Canonical.pl ..\lib\unicore\Exact.pl \ + ..\lib\unicore\Properties ..\lib\unicore\Decomposition.pl \ + ..\lib\unicore\CombiningClass.pl ..\lib\unicore\Name.pl \ + ..\lib\unicore\PVA.pl + +# Directories of Unicode data files generated by mktables +UNIDATADIR1 = ..\lib\unicore\To +UNIDATADIR2 = ..\lib\unicore\lib + # Nominate a target which causes extensions to be re-built # This used to be $(PERLEXE), but at worst it is the .dll that they depend # on and really only the interface - i.e. the .def file used to export symbols @@ -717,7 +727,7 @@ CFG_VARS = \ # Top targets # -all: hostminiperl $(MINIMOD) $(CONFIGPM) $(PERLEXE) Extensions +all: hostminiperl $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) Extensions $(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c @@ -730,8 +740,7 @@ $(CONFIGPM): .\config.h ..\config.sh ..\minimod.pl $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.* $(RCOPY) include $(XCOREDIR)\*.* $(XCOPY) ..\win32\include $(XCOREDIR)\*.* - -$(HPERL) -I..\lib -MCross=$(CROSS_NAME) config_h.PL "INST_VER=$(INST_VER)" "CORE_DIR=$(XCOREDIR)" - if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM) + $(HPERL) -I..\lib -MCross=$(CROSS_NAME) config_h.PL "INST_VER=$(INST_VER)" "CORE_DIR=$(XCOREDIR)" .\config.h: -del /f config.h @@ -770,9 +779,11 @@ NOT_COMPILE_EXT = $(NOT_COMPILE_EXT) !XS/Typemap NOT_COMPILE_EXT = $(NOT_COMPILE_EXT) !XS/Typemap !endif +#!Devel/PPPort TODO + Extensions: ..\win32\buildext.pl $(PERLDEP) $(CONFIGPM) $(HPERL) -I..\lib -I..\win32 -MCross=$(CROSS_NAME) ..\win32\buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) \ - !POSIX $(NOT_COMPILE_EXT) + !POSIX !Devel/PPPort $(NOT_COMPILE_EXT) Extensions_clean: -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean @@ -918,13 +929,6 @@ makedist: all dlls mv perl-$(MACHINE).tar.gz h:/freenet/new cd .. -!if "$(MACHINE)" == "wince-arm-hpc-wce300" -install: all - $(CECOPY) pc:$(MACHINE)/perl.exe ce:$(INSTALL_ROOT)/bin - $(CECOPY) pc:$(MACHINE)/perl$(PV).dll ce:$(INSTALL_ROOT)/bin -install_dlls: dlls - $(CECOPY) pc:../lib/auto/IO/io.dll ce:$(INSTALL_ROOT)/lib/auto/IO/io.dll -!else install: all -cemkdir "$(INSTALL_ROOT)" -cemkdir "$(INSTALL_ROOT)\bin" @@ -932,7 +936,10 @@ install: all $(CECOPY) "pc:$(MACHINE)/perl.exe" "ce:$(INSTALL_ROOT)/bin" $(CECOPY) "pc:$(MACHINE)/perl$(PV).dll" "ce:$(INSTALL_ROOT)/bin" $(CECOPY) "pc:../xlib/$(CROSS_NAME)/Config.pm" "ce:$(INSTALL_ROOT)/lib" -!endif + +$(UNIDATAFILES) : $(HPERL) $(CONFIGPM) ..\lib\unicore\mktables + cd ..\lib\unicore && \ + $(HPERL) -I.. mktables dist: all $(HPERL) -I..\lib -MCross=$(CROSS_NAME) makedist.pl --distdir=dist-$(CROSS_NAME) --cross-name=$(CROSS_NAME) diff --git a/wince/config_h.PL b/wince/config_h.PL index 9446cdc8bc..9a23252323 100644 --- a/wince/config_h.PL +++ b/wince/config_h.PL @@ -18,7 +18,6 @@ while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/) } $opt{CONFIG_H} ||= 'config.h'; -$opt{CORE_DIR} ||= '../lib/CORE'; warn "Writing $opt{CONFIG_H}\n"; @@ -53,7 +52,7 @@ eval $str; die "$str:$@" if $@; open(H,">$file.new") || die "Cannot open $file.new:$!"; -binmode H; # no CRs (which cause a spurious rebuild) +#binmode H; # no CRs (which cause a spurious rebuild) while (<SH>) { last if /^$term$/o; diff --git a/wince/config_sh.PL b/wince/config_sh.PL index 0bcc77df5d..3314832e3b 100644 --- a/wince/config_sh.PL +++ b/wince/config_sh.PL @@ -44,8 +44,8 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) { shift(@{$optref}); } -my @dynamic = FindExt::dynamic_extensions(); -my @noxs = FindExt::noxs_extensions(); +my @dynamic = FindExt::dynamic_ext(); +my @noxs = FindExt::nonxs_ext(); my @known = sort(@dynamic,split(/\s+/,$opt{'staticext'}),@noxs); $opt{'known_extensions'} = join(' ',@known); |