From a9964f40a1e9646363a16efaa463a05e17174f8d Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Fri, 9 Nov 2001 00:23:40 +0000 Subject: Upgrade to Unicode::Normalize 0.10, now in XS. The CPAN distribution has both pm and XS implementations, and for performance reasons we choose the XS. Another reason to choose the XS is that it doesn't require Lingua::KO::Hangul::Util, which means that we can delete that-- which in turn means that Unicode::UCD cannot expect that: support it, but don't expect. Ditto Unicode::Collate. Note that Unicode::Normalize Makefile.PL and Normalize.xs have been modified from the CPAN 0.10 versions: the first one to be simpler (no pm) and clean up the generated unf*.h files, the second one to quench compiler grumblings. Must notify Sadahiro about these changes. p4raw-id: //depot/perl@12909 --- NetWare/Makefile | 90 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 39 deletions(-) (limited to 'NetWare') diff --git a/NetWare/Makefile b/NetWare/Makefile index ec06f7c395..ff879e9b93 100644 --- a/NetWare/Makefile +++ b/NetWare/Makefile @@ -258,26 +258,27 @@ NW_CFG_VARS = \ NW_CFGSH_TMPL = config.wc NW_CFGH_TMPL = config_H.wc -SOCKET_NLP = $(AUTODIR)\Socket\Socket.nlp -FCNTL_NLP = $(AUTODIR)\Fcntl\Fcntl.nlp -IO_NLP = $(AUTODIR)\IO\IO.nlp -OPCODE_NLP = $(AUTODIR)\Opcode\Opcode.nlp -SDBM_FILE_NLP = $(AUTODIR)\SDBM_File\SDBM_File.nlp -POSIX_NLP = $(AUTODIR)\POSIX\POSIX.nlp -ATTRS_NLP = $(AUTODIR)\attrs\attrs.nlp -THREAD_NLP = $(AUTODIR)\Thread\Thread.nlp -B_NLP = $(AUTODIR)\B\B.nlp -DUMPER_NLP = $(AUTODIR)\Data\Dumper\Dumper.nlp -PEEK_NLP = $(AUTODIR)\Devel\Peek\Peek.nlp -RE_NLP = $(AUTODIR)\re\re.nlp -BYTELOADER_NLP = $(AUTODIR)\ByteLoader\ByteLoader.nlp -DPROF_NLP = $(AUTODIR)\Devel\DProf\DProf.nlp -GLOB_NLP = $(AUTODIR)\File\Glob\Glob.nlp -CWD_NLP = $(AUTODIR)\Cwd\Cwd.nlp -STORABLE_NLP = $(AUTODIR)\Storable\Storable.nlp -LISTUTIL_NLP = $(AUTODIR)\List\Util\Util.nlp -MIMEBASE64_NLP = $(AUTODIR)\MIME\Base64\Base64.nlp -XSTYPEMAP_NLP = $(AUTODIR)\XS\Typemap\Typemap.nlp +SOCKET_NLP = $(AUTODIR)\Socket\Socket.nlp +FCNTL_NLP = $(AUTODIR)\Fcntl\Fcntl.nlp +IO_NLP = $(AUTODIR)\IO\IO.nlp +OPCODE_NLP = $(AUTODIR)\Opcode\Opcode.nlp +SDBM_FILE_NLP = $(AUTODIR)\SDBM_File\SDBM_File.nlp +POSIX_NLP = $(AUTODIR)\POSIX\POSIX.nlp +ATTRS_NLP = $(AUTODIR)\attrs\attrs.nlp +THREAD_NLP = $(AUTODIR)\Thread\Thread.nlp +B_NLP = $(AUTODIR)\B\B.nlp +DUMPER_NLP = $(AUTODIR)\Data\Dumper\Dumper.nlp +PEEK_NLP = $(AUTODIR)\Devel\Peek\Peek.nlp +RE_NLP = $(AUTODIR)\re\re.nlp +BYTELOADER_NLP = $(AUTODIR)\ByteLoader\ByteLoader.nlp +DPROF_NLP = $(AUTODIR)\Devel\DProf\DProf.nlp +GLOB_NLP = $(AUTODIR)\File\Glob\Glob.nlp +CWD_NLP = $(AUTODIR)\Cwd\Cwd.nlp +STORABLE_NLP = $(AUTODIR)\Storable\Storable.nlp +LISTUTIL_NLP = $(AUTODIR)\List\Util\Util.nlp +MIMEBASE64_NLP = $(AUTODIR)\MIME\Base64\Base64.nlp +XSTYPEMAP_NLP = $(AUTODIR)\XS\Typemap\Typemap.nlp +UNICODENORMALIZE_NLP = $(AUTODIR)\XS\Typemap\Typemap.nlp EXTENSION_NLP = \ $(FCNTL_NLP) \ @@ -299,6 +300,7 @@ EXTENSION_NLP = \ $(LISTUTIL_NLP) \ $(MIMEBASE64_NLP) \ $(XSTYPEMAP_NLP) \ + $(UNICODENORMALIZE_NLP) \ # $(CWD_NLP) \ # cwd.pm needs to be modifed for NetWare. @@ -764,33 +766,35 @@ X2P_OBJ = $(X2P_SRC:.c=.obj) DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \ Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \ - Storable/Storable List/Util MIME/Base64/Base64 XS/Typemap/Typemap + Storable/Storable List/Util MIME/Base64/Base64 \ + XS/Typemap/Typemap Unicode/Normalize/Normalize STATIC_EXT = DynaLoader NONXS_EXT = Errno -DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader -SOCKET = $(EXTDIR)\Socket\Socket -FCNTL = $(EXTDIR)\Fcntl\Fcntl -OPCODE = $(EXTDIR)\Opcode\Opcode -SDBM_FILE = $(EXTDIR)\SDBM_File\SDBM_File +DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader +SOCKET = $(EXTDIR)\Socket\Socket +FCNTL = $(EXTDIR)\Fcntl\Fcntl +OPCODE = $(EXTDIR)\Opcode\Opcode +SDBM_FILE = $(EXTDIR)\SDBM_File\SDBM_File IO = $(EXTDIR)\IO\IO -POSIX = $(EXTDIR)\POSIX\POSIX -ATTRS = $(EXTDIR)\attrs\attrs -THREAD = $(EXTDIR)\Thread\Thread +POSIX = $(EXTDIR)\POSIX\POSIX +ATTRS = $(EXTDIR)\attrs\attrs +THREAD = $(EXTDIR)\Thread\Thread B = $(EXTDIR)\B\B RE = $(EXTDIR)\re\re -DUMPER = $(EXTDIR)\Data\Dumper\Dumper -ERRNO = $(EXTDIR)\Errno\Errno -PEEK = $(EXTDIR)\Devel\Peek\Peek -BYTELOADER = $(EXTDIR)\ByteLoader\ByteLoader -DPROF = $(EXTDIR)\Devel\DProf\DProf -GLOB = $(EXTDIR)\File\Glob\Glob +DUMPER = $(EXTDIR)\Data\Dumper\Dumper +ERRNO = $(EXTDIR)\Errno\Errno +PEEK = $(EXTDIR)\Devel\Peek\Peek +BYTELOADER = $(EXTDIR)\ByteLoader\ByteLoader +DPROF = $(EXTDIR)\Devel\DProf\DProf +GLOB = $(EXTDIR)\File\Glob\Glob CWD = $(EXTDIR)\Cwd\Cwd -STORABLE = $(EXTDIR)\Storable\Storable -LISTUTIL = $(EXTDIR)\List\Util -MIMEBASE64 = $(EXTDIR)\MIME\Base64\Base64 -XSTYPEMAP = $(EXTDIR)\XS\Typemap\Typemap +STORABLE = $(EXTDIR)\Storable\Storable +LISTUTIL = $(EXTDIR)\List\Util +MIMEBASE64 = $(EXTDIR)\MIME\Base64\Base64 +XSTYPEMAP = $(EXTDIR)\XS\Typemap\Typemap +UNICODENORMALIZE = $(EXTDIR)\Unicode\Normalize\Normalize EXTENSION_C = \ $(SOCKET).c \ @@ -813,6 +817,7 @@ EXTENSION_C = \ $(LISTUTIL).c \ $(MIMEBASE64).c \ $(XSTYPEMAP).c \ + $(UNICODENORMALIZE).c \ POD2HTML = $(PODDIR)\pod2html POD2MAN = $(PODDIR)\pod2man @@ -1285,6 +1290,12 @@ $(XSTYPEMAP_NLP): $(MAKE) cd ..\..\..\netware +$(UNICODENORMALIZE_NLP): + cd $(EXTDIR)\Unicode\$(*B) + ..\..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl + $(MAKE) + cd ..\..\..\netware + $(ERRNO_PM_NW): cd $(EXTDIR)\$(*B) ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl @@ -1425,6 +1436,7 @@ distclean: clean nwclean -del /f $(LIBDIR)\Data\Dumper.pm $(LIBDIR)\ByteLoader.pm -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm -del /f $(LIBDIR)\File\Glob.pm + -del /f $(LIBDIR)\Unicode\Normalize.pm -rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO -rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread -rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B -- cgit v1.2.1