X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/9219c8ded06600040fa6d862a60325b5afc73df4..95d5be9e084881614c83fcb2812a47fe116fb0e6:/NetWare/Makefile

diff --git a/NetWare/Makefile b/NetWare/Makefile
index 10b3d23..d71cd47 100644
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -258,28 +258,30 @@ 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
-
-EXTENSION_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
+HOSTNAME_NLP		= $(AUTODIR)\Sys\Hostname\Hostname.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)	\
 		$(BYTELOADER_NLP)	\
 		$(IO_NLP)		\
@@ -295,10 +297,12 @@ EXTENSION_NLP	= 		\
 		$(PEEK_NLP)		\
 		$(RE_NLP)	\
 		$(DPROF_NLP)	\
+		$(HOSTNAME_NLP) \
 		$(STORABLE_NLP)	\
 		$(LISTUTIL_NLP)	\
 		$(MIMEBASE64_NLP) \
 		$(XSTYPEMAP_NLP)	\
+		$(UNICODENORMALIZE_NLP)	\
 #		$(CWD_NLP)	\
 # cwd.pm needs to be modifed for NetWare.
 
@@ -327,11 +331,6 @@ TEST_NLMS	=	\
 			$(ECHO_NLM)	\
 			$(TYPE_NLM)	\
 
-ERRNO_PM_NW	= $(LIBDIR)\Errno.pm
-
-EXTENSION_NPM =	\
-		$(ERRNO_PM_NW)	\
-
 
 !ifndef SCREEN
 SCREEN          = 'none'
@@ -463,17 +462,6 @@ USE_IMP_SYS	= define
 #
 #USE_5005THREADS= define
 
-#
-# WARNING! This option is deprecated and will eventually go away (enable
-# USE_MULTI instead).
-#
-# uncomment next line if you want to use the PERL_OBJECT build option.
-# DO NOT ENABLE unless you have legacy code that relies on the C++
-# CPerlObj class that was available in 5.005.  This cannot be enabled
-# if you ask for USE_5005THREADS above.
-#
-#USE_OBJECT	= define
-
 # For now let this be here
 #
 #CRYPT_SRC	= fcrypt.c
@@ -510,13 +498,6 @@ D_CRYPT		= define
 CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 !ENDIF
 
-!IF "$(USE_OBJECT)" == "define"
-PERL_MALLOC	= undef
-USE_5005THREADS	= undef
-USE_MULTI	= undef
-USE_IMP_SYS	= define
-!ENDIF
-
 !IF "$(PERL_MALLOC)" == ""
 PERL_MALLOC	= undef
 !ENDIF
@@ -537,10 +518,6 @@ PERL_MALLOC	= undef
 USE_MULTI	= undef
 !ENDIF
 
-!IF "$(USE_OBJECT)" == ""
-USE_OBJECT	= undef
-!ENDIF
-
 !IF "$(USE_ITHREADS)" == ""
 USE_ITHREADS	= undef
 !ENDIF
@@ -553,16 +530,16 @@ USE_IMP_SYS	= undef
 USE_PERLCRT	= undef
 !ENDIF
 
-!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" == "defineundefundefundef"
+!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef"
 USE_MULTI	= define
 !ENDIF
 
-!IF "$(USE_ITHREADS)$(USE_MULTI)$(USE_OBJECT)" == "defineundefundef"
+!IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef"
 USE_MULTI	= define
 USE_5005THREADS	= undef
 !ENDIF
 
-!IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
+!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
 BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -574,9 +551,6 @@ BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_SYS
 PROCESSOR_ARCHITECTURE	= x86
 !ENDIF
 
-!IF "$(USE_OBJECT)" == "define"
-ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)-object
-!ELSE
 !IF "$(USE_5005THREADS)" == "define"
 ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)-thread
 !ELSE
@@ -586,9 +560,8 @@ ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)-multi
 ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
 !ENDIF
-!ENDIF
 
-!IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
+!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
 ADD_BUILDOPT	= $(ADD_BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -630,11 +603,6 @@ INST_HTML	= $(INST_POD)\html
 # Options
 #
 
-!IF "$(USE_OBJECT)" == "define"
-OPTIMIZE	= $(OPTIMIZE) $(CXX_FLAG)
-BUILDOPT	= $(BUILDOPT) -DPERL_OBJECT
-!ENDIF
-
 OBJOUT_FLAG	= -Fo
 EXEOUT_FLAG	= -Fe
 
@@ -716,11 +684,13 @@ MICROCORE_SRC	=		\
 		..\pp_ctl.c	\
 		..\pp_hot.c	\
 		..\pp_pack.c	\
+		..\pp_sort.c	\
 		..\pp_sys.c	\
 		..\regcomp.c	\
 		..\regexec.c	\
 		..\run.c	\
 		..\scope.c	\
+		..\sharedsv.c	\
 		..\sv.c		\
 		..\taint.c	\
 		..\toke.c	\
@@ -735,9 +705,7 @@ MICROCORE_SRC	=		\
 EXTRACORE_SRC	= $(EXTRACORE_SRC) ..\malloc.c
 !ENDIF
 
-#!IF "$(USE_OBJECT)" != "define"
 #EXTRACORE_SRC	= $(EXTRACORE_SRC) ..\perlio.c
-#!ENDIF
 
 !IF "$(CRYPT_SRC)" != ""
 NW_SRC	= $(NW_SRC) .\$(CRYPT_SRC)
@@ -776,6 +744,7 @@ CORE_NOCFG_H	=		\
 		..\proto.h	\
 		..\regexp.h	\
 		..\scope.h	\
+		..\sharedsv.h	\
 		..\sv.h		\
 		..\thread.h	\
 		..\unixish.h	\
@@ -786,8 +755,8 @@ CORE_NOCFG_H	=		\
 		..\EXTERN.h	\
 		..\perlvars.h	\
 		..\intrpvar.h	\
-		..\thrdvar.h	\
-		
+		..\thrdvar.h
+
 CORE_H		= $(CORE_NOCFG_H) .\config.h
 
 DLL_OBJ		= $(DLL_SRC:.c=.obj)
@@ -795,35 +764,41 @@ 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 Sys/Hostnamees
+
 
 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
+HOSTNAME		= $(EXTDIR)\Sys\Hostname\Hostname
 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	= 		\
+ERRNO_PM_NW	= $(LIBDIR)\Errno.pm
+
+EXTENSION_C	=		\
 		$(SOCKET).c	\
 		$(FCNTL).c	\
 		$(OPCODE).c	\
@@ -839,11 +814,16 @@ EXTENSION_C	= 		\
 		$(BYTELOADER).c	\
 		$(DPROF).c	\
 		$(GLOB).c	\
+		$(HOSTNAME).c \
 		$(CWD).c	\
 		$(STORABLE).c	\
 		$(LISTUTIL).c	\
 		$(MIMEBASE64).c	\
 		$(XSTYPEMAP).c	\
+		$(UNICODENORMALIZE).c	\
+
+EXTENSION_NPM =	\
+		$(ERRNO_PM_NW)	\
 
 POD2HTML	= $(PODDIR)\pod2html
 POD2MAN		= $(PODDIR)\pod2man
@@ -1202,6 +1182,12 @@ $(SOCKET_NLP): $(NLM_NAME) $(SOCKET).xs
 	$(MAKE)
 	cd ..\..\netware
 
+$(HOSTNAME_NLP): $(NLM_NAME) $(HOSTNAME).xs
+	cd $(EXTDIR)\Sys\$(*B)
+	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+	$(MAKE)
+	cd ..\..\..\netware
+
 $(FCNTL_NLP):
 	cd $(EXTDIR)\$(*B)
 	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -1316,6 +1302,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
@@ -1445,17 +1437,19 @@ utils: $(BLDDIR)\$(NLM_NAME8).$(NLM_EXT) $(X2P)
 distclean: clean nwclean
 	-del /f $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
 	-del /f *.def *.map
+	-del /f $(EXTENSION_NPM)
 	-del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm
 	-del /f $(EXTDIR)\DynaLoader\dl_netware.xs
 	-del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm
 	-del /f $(LIBDIR)\XSLoader.pm
 	-del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
-	-del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm $(LIBDIR)\Thread.pm
+	-del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm
 	-del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm
 	-del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm
 	-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