X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/4ace4afbd19e849a82971140e56f3f22f6d8a7c6..590d29db556974e9ffeb477a1a1932ff001d099f:/win32/Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 305c119..0d45d09 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -32,7 +32,7 @@ INST_TOP	= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-#INST_VER = \5.8.0
+#INST_VER = \5.9.1
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -349,9 +349,6 @@ LIBC	= msvcrt.lib
 LIBC	= PerlCRT.lib
 !ENDIF
 
-PERLEXE_RES	=
-PERLDLL_RES	=
-
 !IF  "$(CFG)" == "Debug"
 !  IF "$(CCTYPE)" == "MSVC20"
 OPTIMIZE	= -Od -MD -Z7 -DDEBUGGING
@@ -447,6 +444,10 @@ CONFIGPM	= ..\lib\Config.pm
 MINIMOD		= ..\lib\ExtUtils\Miniperl.pm
 X2P		= ..\x2p\a2p.exe
 
+PERLEXE_ICO	= .\perlexe.ico
+PERLEXE_RES	= .\perlexe.res
+PERLDLL_RES	=
+
 # 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
@@ -472,6 +473,9 @@ UTILS		=			\
 		..\utils\enc2xs		\
 		..\utils\piconv		\
 		..\utils\cpan		\
+		..\utils\xsubpp		\
+		..\utils\prove		\
+		..\utils\instmodsh	\
 		..\pod\checkpods	\
 		..\pod\pod2html		\
 		..\pod\pod2latex	\
@@ -483,7 +487,6 @@ UTILS		=			\
 		..\x2p\find2perl	\
 		..\x2p\psed		\
 		..\x2p\s2p		\
-		..\lib\ExtUtils\xsubpp	\
 		bin\exetype.pl		\
 		bin\runperl.pl		\
 		bin\pl2bat.pl		\
@@ -894,6 +897,11 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES)
 <<
 	$(XCOPY) $(PERLIMPLIB) $(COREDIR)
 
+$(PERLEXE_ICO): $(MINIPERL) makeico.pl
+	$(MINIPERL) makeico.pl > $@
+
+$(PERLEXE_RES): perlexe.rc $(PERLEXE_ICO)
+
 $(MINIMOD) : $(MINIPERL) ..\minimod.pl
 	cd ..
 	miniperl minimod.pl > lib\ExtUtils\Miniperl.pm
@@ -957,6 +965,9 @@ Extensions: buildext.pl $(PERLDEP) $(CONFIGPM)
 Extensions_clean: 
 	-if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
 
+Extensions_realclean: 
+	-if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean
+
 #----------------------------------------------------------------------------------
 
 doc: $(PERLEXE)
@@ -964,78 +975,92 @@ doc: $(PERLEXE)
 	    --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML::=|)" \
 	    --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
 
+# Note that this next section is parsed (and regenerated) by pod/buildtoc
+# so please check that script before making structural changes here
+
 utils: $(PERLEXE) $(X2P)
 	cd ..\utils
 	$(MAKE) PERL=$(MINIPERL)
 	cd ..\pod
-	copy ..\README.aix      .\perlaix.pod
-	copy ..\README.amiga    .\perlamiga.pod
-	copy ..\README.apollo   .\perlapollo.pod
-	copy ..\README.beos     .\perlbeos.pod
-	copy ..\README.bs2000   .\perlbs2000.pod
-	copy ..\README.ce	.\perlce.pod
-	copy ..\README.cygwin   .\perlcygwin.pod
-	copy ..\README.dgux     .\perldgux.pod
-	copy ..\README.dos      .\perldos.pod
-	copy ..\README.epoc     .\perlepoc.pod
-	copy ..\README.freebsd     .\perlfreebsd.pod
-	copy ..\README.hurd     .\perlhurd.pod
-	copy ..\README.hpux     .\perlhpux.pod
-	copy ..\README.irix     .\perlirix.pod
-	copy ..\README.machten  .\perlmachten.pod
-	copy ..\README.macos    .\perlmacos.pod
-	copy ..\README.macosx   .\perlmacosx.pod
-	copy ..\README.mint     .\perlmint.pod
-	copy ..\README.mpeix    .\perlmpeix.pod
-	copy ..\README.netware  .\perlnetware.pod
-	copy ..\README.os2      .\perlos2.pod
-	copy ..\README.os390    .\perlos390.pod
-	copy ..\README.os400    .\perlos400.pod
-	copy ..\README.plan9    .\perlplan9.pod
-	copy ..\README.qnx      .\perlqnx.pod
-	copy ..\README.solaris  .\perlsolaris.pod
-	copy ..\README.tru64    .\perltru64.pod
-	copy ..\README.uts      .\perluts.pod
-	copy ..\README.vmesa    .\perlvmesa.pod
 	copy ..\vms\perlvms.pod .\perlvms.pod
-	copy ..\README.vos      .\perlvos.pod
-	copy ..\README.win32    .\perlwin32.pod
+	copy ..\README.aix      ..\pod\perlaix.pod
+	copy ..\README.amiga    ..\pod\perlamiga.pod
+	copy ..\README.apollo   ..\pod\perlapollo.pod
+	copy ..\README.beos     ..\pod\perlbeos.pod
+	copy ..\README.bs2000   ..\pod\perlbs2000.pod
+	copy ..\README.ce       ..\pod\perlce.pod
+	copy ..\README.cn       ..\pod\perlcn.pod
+	copy ..\README.cygwin   ..\pod\perlcygwin.pod
+	copy ..\README.dgux     ..\pod\perldgux.pod
+	copy ..\README.dos      ..\pod\perldos.pod
+	copy ..\README.epoc     ..\pod\perlepoc.pod
+	copy ..\README.freebsd  ..\pod\perlfreebsd.pod
+	copy ..\README.hpux     ..\pod\perlhpux.pod
+	copy ..\README.hurd     ..\pod\perlhurd.pod
+	copy ..\README.irix     ..\pod\perlirix.pod
+	copy ..\README.jp       ..\pod\perljp.pod
+	copy ..\README.ko       ..\pod\perlko.pod
+	copy ..\README.machten  ..\pod\perlmachten.pod
+	copy ..\README.macos    ..\pod\perlmacos.pod
+	copy ..\README.macosx   ..\pod\perlmacosx.pod
+	copy ..\README.mint     ..\pod\perlmint.pod
+	copy ..\README.mpeix    ..\pod\perlmpeix.pod
+	copy ..\README.netware  ..\pod\perlnetware.pod
+	copy ..\README.os2      ..\pod\perlos2.pod
+	copy ..\README.os390    ..\pod\perlos390.pod
+	copy ..\README.os400    ..\pod\perlos400.pod
+	copy ..\README.plan9    ..\pod\perlplan9.pod
+	copy ..\README.qnx      ..\pod\perlqnx.pod
+	copy ..\README.solaris  ..\pod\perlsolaris.pod
+	copy ..\README.tru64    ..\pod\perltru64.pod
+	copy ..\README.tw       ..\pod\perltw.pod
+	copy ..\README.uts      ..\pod\perluts.pod
+	copy ..\README.vmesa    ..\pod\perlvmesa.pod
+	copy ..\README.vms      ..\pod\perlvms.pod
+	copy ..\README.vos      ..\pod\perlvos.pod
+	copy ..\README.win32    ..\pod\perlwin32.pod
+	copy ..\pod\perl591delta.pod ..\pod\perldelta.pod
 	$(MAKE) -f ..\win32\pod.mak converters
 	cd ..\lib
 	$(PERLEXE) lib_pm.PL
 	cd ..\win32
 	$(PERLEXE) $(PL2BAT) $(UTILS)
 
+# Note that the pod cleanup in this next section is parsed (and regenerated
+# by pod/buildtoc so please check that script before making changes here
+
 # the doubled rmdir calls are needed because older cmd shells
 # don't understand /q
-distclean: clean
+distclean: realclean
 	-del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \
 		$(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
 	-del /f *.def *.map
 	-del /f $(EXTENSION_DLL)
 	-del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm
 	-del /f $(EXTDIR)\DynaLoader\dl_win32.xs
+	-del /f $(EXTDIR)\DynaLoader\DynaLoader.pm
+	-del /f $(EXTDIR)\DynaLoader\XSLoader.pm
+	-del /f $(LIBDIR)\Encode.pm $(LIBDIR)\encoding.pm $(LIBDIR)\Errno.pm
+	-del /f $(LIBDIR)\Config.pod $(LIBDIR)\POSIX.pod $(LIBDIR)\threads.pm
 	-del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm
-	-del /f $(LIBDIR)\XSLoader.pm
+	-del /f $(LIBDIR)\XSLoader.pm $(LIBDIR)\lib.pm
 	-del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.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)\ByteLoader.pm
 	-del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm
+	-del /f $(LIBDIR)\Devel\PPPort.pm
 	-del /f $(LIBDIR)\File\Glob.pm
 	-del /f $(LIBDIR)\Storable.pm
-	-del /f $(LIBDIR)\Filter\Util\Call.pm
 	-del /f $(LIBDIR)\Digest\MD5.pm
+	-del /f $(LIBDIR)\PerlIO\encoding.pm
 	-del /f $(LIBDIR)\PerlIO\scalar.pm
 	-del /f $(LIBDIR)\PerlIO\via.pm
-	-del /f $(LIBDIR)\MIME\Base64.pm
-	-del /f $(LIBDIR)\MIME\QuotedPrint.pm
-	-del /f $(LIBDIR)\List\Util.pm
-	-del /f $(LIBDIR)\Scalar\Util.pm
+	-del /f $(LIBDIR)\Sys\Hostname.pm
+	-del /f $(LIBDIR)\Thread\Signal.pm $(LIBDIR)\Thread\Specific.pm
+	-del /f $(LIBDIR)\threads\shared.pm
 	-del /f $(LIBDIR)\Time\HiRes.pm
-	-del /f $(LIBDIR)\XS\APItest.pm
-	-del /f $(LIBDIR)\XS\Typemap.pm
 	-del /f $(LIBDIR)\Unicode\Normalize.pm
 	-if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
 	-if exist $(LIBDIR)\IO rmdir /s $(LIBDIR)\IO
@@ -1043,10 +1068,10 @@ distclean: clean
 	-if exist $(LIBDIR)\B rmdir /s $(LIBDIR)\B
 	-if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data
 	-if exist $(LIBDIR)\Data rmdir /s $(LIBDIR)\Data
+	-if exist $(LIBDIR)\Encode rmdir /s /q $(LIBDIR)\Encode
+	-if exist $(LIBDIR)\Encode rmdir /s $(LIBDIR)\Encode
 	-if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util
 	-if exist $(LIBDIR)\Filter\Util rmdir /s $(LIBDIR)\Filter\Util
-	-if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest
-	-if exist $(LIBDIR)\Digest rmdir /s $(LIBDIR)\Digest
 	-if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME
 	-if exist $(LIBDIR)\MIME rmdir /s $(LIBDIR)\MIME
 	-if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List
@@ -1055,36 +1080,28 @@ distclean: clean
 	-if exist $(LIBDIR)\Scalar rmdir /s $(LIBDIR)\Scalar
 	-if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
 	-if exist $(LIBDIR)\XS rmdir /s $(LIBDIR)\XS
-	cd $(PODDIR)
-	-del /f *.html *.bat checkpods \
+	-cd $(PODDIR) && del /f *.html *.bat checkpods \
 	    perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \
-	    perlbs2000.pod perlce.pod perlcygwin.pod perldgux.pod \
-	    perldos.pod perlepoc.pod perlfreebsd.pod perlhurd.pod \
-	    perlhpux.pod perlirix.pod perlmachten.pod \
-	    perlmacos.pod perlmint.pod perlmpeix.pod perlnetware.pod \
+	    perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \
+	    perldelta.pod perldgux.pod perldos.pod perlepoc.pod \
+	    perlfreebsd.pod perlhpux.pod perlhurd.pod perlirix.pod \
+	    perljp.pod perlko.pod perlmachten.pod perlmacos.pod \
+	    perlmacosx.pod perlmint.pod perlmpeix.pod perlnetware.pod \
 	    perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \
-	    perlqnx.pod perlsolaris.pod perltru64.pod perluts.pod \
-	    perlvmesa.pod perlvms.pod perlvos.pod \
-	    perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \
+	    perlqnx.pod perlsolaris.pod perltru64.pod perltw.pod \
+	    perluts.pod perlvmesa.pod perlvms.pod perlvos.pod perlwin32.pod \
+	    pod2html pod2latex pod2man pod2text pod2usage \
 	    podchecker podselect
-	cd ..\utils
-	-del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs perldoc perlivp \
-	    dprofpp perlcc libnetcfg enc2xs piconv cpan
-	-del /f *.bat
-	cd ..\win32
-	cd ..\x2p
-	-del /f find2perl s2p psed
-	-del /f *.bat
-	cd ..\win32
+	-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
+	    perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat \
+	    xsubpp instmodsh prove
+	-cd ..\x2p && del /f find2perl s2p psed *.bat
 	-del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
 	-del /f $(CONFIGPM)
 	-del /f bin\*.bat
-	cd ..
-	-del /s *.lib *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib
-	cd win32
-	cd $(EXTDIR)
-	-del /s *.def Makefile Makefile.old
-	cd ..\win32
+	-del /f $(PERLEXE_ICO)
+	-cd .. && del /s *.lib *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib
+	-cd $(EXTDIR) && del /s *.def Makefile Makefile.old
 	-if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
 	-if exist $(AUTODIR) rmdir /s $(AUTODIR)
 	-if exist $(COREDIR) rmdir /s /q $(COREDIR)
@@ -1107,13 +1124,13 @@ inst_lib : $(CONFIGPM)
 	$(RCOPY) ..\lib $(INST_LIB)\*.*
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils
-	$(XCOPY) $(MINIPERL) ..\t\perl.exe
+	$(XCOPY) $(MINIPERL) ..\t\$(NULL)
+	if exist ..\t\perl.exe del /f ..\t\perl.exe
+	rename ..\t\miniperl.exe perl.exe
 	$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
 	attrib -r ..\t\*.*
-	copy test ..\t
-	cd ..\t
-	$(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
-	cd ..\win32
+	cd ..\t && \
+	$(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
 
 test-prep : all utils
 	$(XCOPY) $(PERLEXE) ..\t\$(NULL)
@@ -1131,19 +1148,6 @@ test-notty : test-prep
 	$(PERLEXE) -I..\lib harness
 	cd ..\win32
 
-test-wide : test-prep
-	set HARNESS_PERL_SWITCHES=-C
-	cd ..\t
-	$(PERLEXE) -I..\lib harness
-	cd ..\win32
-
-test-wide-notty : test-prep
-	set PERL_SKIP_TTY_TEST=1
-	set HARNESS_PERL_SWITCHES=-C
-	cd ..\t
-	$(PERLEXE) -I..\lib harness
-	cd ..\win32
-
 _test : 
        $(XCOPY) $(PERLEXE) ..\t\$(NULL)
        $(XCOPY) $(PERLDLL) ..\t\$(NULL)
@@ -1152,7 +1156,7 @@ _test :
        $(PERLEXE) -I..\lib harness
        cd ..\win32
 
-clean : Extensions_clean
+_clean :
 	-@$(DEL) miniperlmain$(o)
 	-@$(DEL) $(MINIPERL)
 	-@$(DEL) perlglob$(o)
@@ -1175,6 +1179,10 @@ clean : Extensions_clean
 	-@$(DEL) *.ilk
 	-@$(DEL) *.pdb
 
+clean : Extensions_clean _clean
+
+realclean : Extensions_realclean _clean
+
 # Handy way to run perlbug -ok without having to install and run the
 # installed perlbug. We don't re-run the tests here - we trust the user.
 # Please *don't* use this unless all tests pass.