X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/34bb3ecc65bf9da6ed214f1422d097bed2e040f6..58534900c38f976129529850bd5168d61c39a495:/win32/Makefile diff --git a/win32/Makefile b/win32/Makefile index b6b3da6..c06b377 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -5,7 +5,7 @@ # Windows SDK 64-bit compiler and tools # # This is set up to build a perl.exe that runs off a shared library -# (perl515.dll). Also makes individual DLLs for the XS extensions. +# (perl519.dll). Also makes individual DLLs for the XS extensions. # ## @@ -37,7 +37,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.15.8 +#INST_VER = \5.19.6 # # Comment this out if you DON'T want your perl installation to have @@ -93,28 +93,43 @@ USE_PERLIO = define USE_LARGE_FILES = define # +# Uncomment this if you're building a 32-bit perl and want 64-bit integers. +# (If you're building a 64-bit perl then you will have 64-bit integers whether +# or not this is uncommented.) +# Note: This option is not supported in 32-bit MSVC60 builds. +#USE_64_BIT_INT = define + +# # uncomment exactly one of the following # # Visual C++ 6.x (aka Visual C++ 98) CCTYPE = MSVC60 +# Visual C++ .NET 2002/2003 (aka Visual C++ 7.x) (full version) +#CCTYPE = MSVC70 # Visual C++ Toolkit 2003 (aka Visual C++ 7.x) (free command-line tools) #CCTYPE = MSVC70FREE -# Visual C++ .NET 2003 (aka Visual C++ 7.x) (full version) -#CCTYPE = MSVC70 # Windows Server 2003 SP1 Platform SDK (April 2005) #CCTYPE = SDK2003SP1 -# Visual C++ 2005 Express Edition (aka Visual C++ 8.x) (free version) -#CCTYPE = MSVC80FREE # Visual C++ 2005 (aka Visual C++ 8.x) (full version) #CCTYPE = MSVC80 -# Visual C++ 2008 Express Edition (aka Visual C++ 9.x) (free version) -#CCTYPE = MSVC90FREE +# Visual C++ 2005 Express Edition (aka Visual C++ 8.x) (free version) +#CCTYPE = MSVC80FREE # Visual C++ 2008 (aka Visual C++ 9.x) (full version) #CCTYPE = MSVC90 -# Visual C++ 2010 Express Edition (aka Visual C++ 10.x) (free version) -#CCTYPE = MSVC100FREE +# Visual C++ 2008 Express Edition (aka Visual C++ 9.x) (free version) +#CCTYPE = MSVC90FREE # Visual C++ 2010 (aka Visual C++ 10.x) (full version) #CCTYPE = MSVC100 +# Visual C++ 2010 Express Edition (aka Visual C++ 10.x) (free version) +#CCTYPE = MSVC100FREE +# Visual C++ 2012 (aka Visual C++ 11.x) (full version) +#CCTYPE = MSVC110 +# Visual C++ 2012 Express Edition (aka Visual C++ 11.x) (free version) +#CCTYPE = MSVC110FREE +# Visual C++ 2013 (aka Visual C++ 12.x) (full version) +#CCTYPE = MSVC120 +# Visual C++ 2013 Express Edition (aka Visual C++ 12.x) (free version) +#CCTYPE = MSVC120FREE # # uncomment next line if you want debug version of perl (big,slow) @@ -152,7 +167,7 @@ CCTYPE = MSVC60 # set this to additionally provide a statically linked perl-static.exe. # Note that dynamic loading will not work with this perl, so you must # include required modules statically using the STATIC_EXT or ALL_STATIC -# variables below. A static library perl515s.lib will also be created. +# variables below. A static library perl519s.lib will also be created. # Ordinary perl.exe is not affected by this option. # #BUILD_STATIC = define @@ -261,6 +276,10 @@ USE_PERLIO = undef USE_LARGE_FILES = undef !ENDIF +!IF "$(USE_64_BIT_INT)" == "" +USE_64_BIT_INT = undef +!ENDIF + !IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef" USE_MULTI = define !ENDIF @@ -301,6 +320,10 @@ WIN64 = undef !ENDIF !ENDIF +!IF "$(WIN64)" == "define" +USE_64_BIT_INT = define +!ENDIF + # Treat 64-bit MSVC60 (doesn't really exist) as SDK2003SP1 because # both link against MSVCRT.dll (which is part of Windows itself) and # not against a compiler specific versioned runtime. @@ -308,6 +331,22 @@ WIN64 = undef CCTYPE = SDK2003SP1 !ENDIF +# Disable the 64-bit-int option for (32-bit) MSVC60 builds since that compiler +# does not support it. +!IF "$(CCTYPE)" == "MSVC60" +!UNDEF USE_64_BIT_INT +USE_64_BIT_INT = undef +!ENDIF + +# Most relevant compiler-specific options fall into two groups: +# either pre-MSVC80 or MSVC80 onwards, so define a macro for this. +!IF "$(CCTYPE)" == "MSVC60" || \ + "$(CCTYPE)" == "MSVC70" || "$(CCTYPE)" == "MSVC70FREE" +PREMSVC80 = define +!ELSE +PREMSVC80 = undef +!ENDIF + ARCHITECTURE = $(PROCESSOR_ARCHITECTURE) !IF "$(ARCHITECTURE)" == "AMD64" ARCHITECTURE = x64 @@ -334,14 +373,15 @@ BUILDOPT = $(BUILDOPT) -DUSE_PERLIO ARCHNAME = $(ARCHNAME)-thread !ENDIF -# Visual C++ 98, .NET 2003, 2005/2008/2010 specific. -# VC++ 6/7/8/9/10.x can load DLLs on demand. Makes the test suite run -# in about 10% less time. (The free version of 7.x can't do this, but the free -# versions of 8/9/10.x can.) -!IF "$(CCTYPE)" == "MSVC60" || "$(CCTYPE)" == "MSVC70" || \ - "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \ - "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" || \ - "$(CCTYPE)" == "MSVC100" || "$(CCTYPE)" == "MSVC100FREE" +!IF "$(WIN64)" != "define" +!IF "$(USE_64_BIT_INT)" == "define" +ARCHNAME = $(ARCHNAME)-64int +!ENDIF +!ENDIF + +# All but the free version of VC++ 7.x can load DLLs on demand. Makes the test +# suite run in about 10% less time. +!IF "$(CCTYPE)" != "MSVC70FREE" DELAYLOAD = -DELAYLOAD:ws2_32.dll delayimp.lib !ENDIF @@ -363,7 +403,6 @@ EXTDIR = ..\ext DISTDIR = ..\dist CPANDIR = ..\cpan PODDIR = ..\pod -EXTUTILSDIR = $(LIBDIR)\ExtUtils HTMLDIR = .\html # @@ -400,7 +439,8 @@ LIBC = msvcrt.lib OPTIMIZE = -Od -MD -Zi -DDEBUGGING LINK_DBG = -debug !ELSE -OPTIMIZE = -MD -Zi -DNDEBUG +# -O1 yields smaller code, which turns out to be faster than -O2 on x86 and x64 +OPTIMIZE = -O1 -MD -Zi -DNDEBUG # we enable debug symbols in release builds also LINK_DBG = -debug -opt:ref,icf # you may want to enable this if you want COFF symbols in the executables @@ -409,14 +449,11 @@ LINK_DBG = -debug -opt:ref,icf # installed to get better stack traces from just the PDB symbols, so we # avoid the bloat of COFF symbols by default. #LINK_DBG = $(LINK_DBG) -debugtype:both -! IF "$(WIN64)" == "define" +! IF "$(CCTYPE)" != "MSVC60" # enable Whole Program Optimizations (WPO) and Link Time Code Generation (LTCG) -OPTIMIZE = $(OPTIMIZE) -Ox -GL +OPTIMIZE = $(OPTIMIZE) -GL LINK_DBG = $(LINK_DBG) -ltcg -! ELSE -# -O1 yields smaller code, which turns out to be faster than -O2 on x86 -OPTIMIZE = $(OPTIMIZE) -O1 -#OPTIMIZE = $(OPTIMIZE) -O2 +LIB_FLAGS = -ltcg ! ENDIF !ENDIF @@ -425,11 +462,9 @@ DEFINES = $(DEFINES) -DWIN64 -DCONSERVATIVE OPTIMIZE = $(OPTIMIZE) -fp:precise !ENDIF -# For now, silence VC++ 8/9/10.x's warnings about "unsafe" CRT functions +# For now, silence warnings from VC++ 8.x onwards about "unsafe" CRT functions # and POSIX CRT function names being deprecated. -!IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \ - "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" || \ - "$(CCTYPE)" == "MSVC100" || "$(CCTYPE)" == "MSVC100FREE" +!IF "$(PREMSVC80)" == "undef" DEFINES = $(DEFINES) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE !ENDIF @@ -442,8 +477,7 @@ DEFINES = $(DEFINES) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE # Perl itself with e.g. VC6 but later installs an XS module using VC8 # the time_t types will still be compatible. !IF "$(WIN64)" == "undef" -! IF "$(CCTYPE)" == "MSVC60" || \ - "$(CCTYPE)" == "MSVC70" || "$(CCTYPE)" == "MSVC70FREE" +! IF "$(PREMSVC80)" == "define" BUILDOPT = $(BUILDOPT) -D_USE_32BIT_TIME_T ! ENDIF !ENDIF @@ -471,15 +505,13 @@ CFLAGS = $(EXTRACFLAGS) $(INCLUDES) $(DEFINES) $(LOCDEFS) \ LINK_FLAGS = -nologo -nodefaultlib $(LINK_DBG) \ -libpath:"$(INST_COREDIR)" \ -machine:$(PROCESSOR_ARCHITECTURE) -LIB_FLAGS = -nologo +LIB_FLAGS = $(LIB_FLAGS) -nologo OBJOUT_FLAG = -Fo EXEOUT_FLAG = -Fe CFLAGS_O = $(CFLAGS) $(BUILDOPT) -!IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \ - "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" || \ - "$(CCTYPE)" == "MSVC100" || "$(CCTYPE)" == "MSVC100FREE" +!IF "$(PREMSVC80)" == "undef" LINK_FLAGS = $(LINK_FLAGS) "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" !ELSE RSC_FLAGS = -DINCLUDE_MANIFEST @@ -500,6 +532,9 @@ o = .obj .c$(o): $(CC) -c -I$(>$@ + @echo #ifndef _config_h_footer_>>$@ + @echo #define _config_h_footer_>>$@ + @echo #undef PTRSIZE>>$@ + @echo #undef SSize_t>>$@ + @echo #undef HAS_ATOLL>>$@ + @echo #undef HAS_STRTOLL>>$@ + @echo #undef HAS_STRTOULL>>$@ + @echo #undef IVTYPE>>$@ + @echo #undef UVTYPE>>$@ + @echo #undef IVSIZE>>$@ + @echo #undef UVSIZE>>$@ + @echo #undef NV_PRESERVES_UV>>$@ + @echo #undef NV_PRESERVES_UV_BITS>>$@ + @echo #undef IVdf>>$@ + @echo #undef UVuf>>$@ + @echo #undef UVof>>$@ + @echo #undef UVxf>>$@ + @echo #undef UVXf>>$@ + @echo #undef USE_64_BIT_INT>>$@ + @echo #undef Size_t_size>>$@ +!IF "$(WIN64)"=="define" + @echo #define PTRSIZE ^8>>$@ + @echo #define SSize_t __int64>>$@ + @echo #define HAS_ATOLL>>$@ + @echo #define HAS_STRTOLL>>$@ + @echo #define HAS_STRTOULL>>$@ + @echo #define Size_t_size ^8>>$@ +!ELSE + @echo #define PTRSIZE ^4>>$@ + @echo #define SSize_t int>>$@ + @echo #undef HAS_ATOLL>>$@ + @echo #undef HAS_STRTOLL>>$@ + @echo #undef HAS_STRTOULL>>$@ + @echo #define Size_t_size ^4>>$@ +!ENDIF +!IF "$(USE_64_BIT_INT)"=="define" + @echo #define IVTYPE __int64>>$@ + @echo #define UVTYPE unsigned __int64>>$@ + @echo #define IVSIZE ^8>>$@ + @echo #define UVSIZE ^8>>$@ + @echo #undef NV_PRESERVES_UV>>$@ + @echo #define NV_PRESERVES_UV_BITS 53>>$@ + @echo #define IVdf "I64d">>$@ + @echo #define UVuf "I64u">>$@ + @echo #define UVof "I64o">>$@ + @echo #define UVxf "I64x">>$@ + @echo #define UVXf "I64X">>$@ + @echo #define USE_64_BIT_INT>>$@ +!ELSE + @echo #define IVTYPE long>>$@ + @echo #define UVTYPE unsigned long>>$@ + @echo #define IVSIZE ^4>>$@ + @echo #define UVSIZE ^4>>$@ + @echo #define NV_PRESERVES_UV>>$@ + @echo #define NV_PRESERVES_UV_BITS 32>>$@ + @echo #define IVdf "ld">>$@ + @echo #define UVuf "lu">>$@ + @echo #define UVof "lo">>$@ + @echo #define UVxf "lx">>$@ + @echo #define UVXf "lX">>$@ + @echo #undef USE_64_BIT_INT>>$@ +!ENDIF + @echo #endif>>$@ ..\git_version.h : $(MINIPERL) ..\make_patchnum.pl cd .. @@ -843,39 +943,35 @@ config.w32 : $(CFGSH_TMPL) ..\config.sh : config.w32 $(MINIPERL) config_sh.PL FindExt.pm $(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) config.w32 > ..\config.sh -# this target is for when changes to the main config.sh happen. -# edit config.vc, then make perl in a minimal configuration (i.e. with MULTI, +# This target is for when changes to the main config.sh happen. +# Edit config.vc, then make perl in a minimal configuration (i.e. with MULTI, # ITHREADS, IMP_SYS, LARGE_FILES and PERLIO off), then make this target # to regenerate config_H.vc. -# unfortunately, some further manual editing is also then required to restore all -# the special __GNUC__ handling that is otherwise lost. -# repeat for config.vc64 and config_H.vc64 if you have a suitable build -# environment, otherwise hand-edit them to maintain the same differences with -# config.vc and config_H.vc as before. regen_config_h: $(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh $(MINIPERL) -I..\lib ..\configpm --chdir=.. -del /f $(CFGH_TMPL) - -$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" + -$(MINIPERL) -I..\lib config_h.PL rename config.h $(CFGH_TMPL) -$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl +$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL $(MINIPERL) -I..\lib ..\configpm --chdir=.. if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL) $(XCOPY) ..\*.h $(COREDIR)\*.* $(XCOPY) *.h $(COREDIR)\*.* $(RCOPY) include $(COREDIR)\*.* - -$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" + -$(MINIPERL) -I..\lib config_h.PL if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM) -..\lib\buildcustomize.pl: $(MINIPERL) ..\write_buildcustomize.pl - $(MINIPERL) -I..\lib ..\write_buildcustomize.pl .. >..\lib\buildcustomize.pl +# See the comment in Makefile.SH explaining this seemingly cranky ordering +$(MINIPERL) : ..\lib\buildcustomize.pl -$(MINIPERL) : $(MINIDIR) $(MINI_OBJ) - $(LINK32) -subsystem:console -out:$@ @<< - $(LINK_FLAGS) $(LIBFILES) $(MINI_OBJ) +..\lib\buildcustomize.pl : $(MINIDIR) $(MINI_OBJ) ..\write_buildcustomize.pl + $(LINK32) -subsystem:console -out:$(MINIPERL) @<< + $(LINK_FLAGS) $(DELAYLOAD) $(LIBFILES) $(MINI_OBJ) << - $(EMBED_EXE_MANI) + $(EMBED_EXE_MANI:..\lib\buildcustomize.pl=..\miniperl.exe) + $(MINIPERL) -I..\lib -f ..\write_buildcustomize.pl .. $(MINIDIR) : if not exist "$(MINIDIR)" mkdir "$(MINIDIR)" @@ -884,7 +980,7 @@ $(MINICORE_OBJ) : $(CORE_NOCFG_H) $(CC) -c $(CFLAGS) -DPERL_EXTERNAL_GLOB -DPERL_IS_MINIPERL $(OBJOUT_FLAG)$@ ..\$(*F).c $(MINIWIN32_OBJ) : $(CORE_NOCFG_H) - $(CC) -c $(CFLAGS) $(OBJOUT_FLAG)$@ $(*F).c + $(CC) -c $(CFLAGS) -DPERL_IS_MINIPERL $(OBJOUT_FLAG)$@ $(*F).c # -DPERL_IMPLICIT_SYS needs C++ for perllib.c # This is the only file that depends on perlhost.h, vmem.h, and vdir.h @@ -923,11 +1019,6 @@ $(PERLSTATICLIB): Extensions_static $(PERLEXE_RES): perlexe.rc $(PERLEXE_MANIFEST) $(PERLEXE_ICO) -$(MINIMOD) : $(MINIPERL) ..\minimod.pl - cd .. - miniperl minimod.pl > lib\ExtUtils\Miniperl.pm - cd win32 - ..\x2p\a2p$(o) : ..\x2p\a2p.c $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\a2p.c @@ -980,19 +1071,18 @@ perlmainst$(o) : perlmainst.c $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) $(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) \ - $(LIBFILES) $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES) + $(PERLEXE_OBJ) $(PERLEXE_RES) $(PERLIMPLIB) $(LIBFILES) $(SETARGV_OBJ) $(EMBED_EXE_MANI) copy $(PERLEXE) $(WPERLEXE) $(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS $(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES) $(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) \ - @Extensions_static $(PERLSTATICLIB) /PDB:NONE \ - $(LIBFILES) $(PERLEXEST_OBJ) $(SETARGV_OBJ) $(PERLEXE_RES) + $(PERLEXEST_OBJ) $(PERLEXE_RES) $(PERLSTATICLIB) $(LIBFILES) $(SETARGV_OBJ) $(EMBED_EXE_MANI) MakePPPort: $(MINIPERL) $(CONFIGPM) Extensions_nonxs - $(MINIPERL) -I..\lib $(ICWD) ..\mkppport + $(MINIPERL) -I..\lib ..\mkppport #------------------------------------------------------------------------------- # There's no direct way to mark a dependency on @@ -1028,26 +1118,26 @@ Extensions_realclean: doc: $(PERLEXE) ..\pod\perltoc.pod $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \ - --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML::=|)" \ + --podpath=pod:lib:utils --htmlroot="file://$(INST_HTML::=|)" \ --recurse +..\utils\Makefile: $(CONFIGPM) ..\utils\Makefile.PL + $(MINIPERL) -I..\lib ..\utils\Makefile.PL .. + # 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) +utils: $(PERLEXE) $(X2P) ..\utils\Makefile cd ..\utils $(MAKE) PERL=$(MINIPERL) cd ..\pod copy ..\README.aix ..\pod\perlaix.pod copy ..\README.amiga ..\pod\perlamiga.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.haiku ..\pod\perlhaiku.pod copy ..\README.hpux ..\pod\perlhpux.pod @@ -1058,7 +1148,6 @@ utils: $(PERLEXE) $(X2P) copy ..\README.linux ..\pod\perllinux.pod copy ..\README.macos ..\pod\perlmacos.pod copy ..\README.macosx ..\pod\perlmacosx.pod - copy ..\README.mpeix ..\pod\perlmpeix.pod copy ..\README.netware ..\pod\perlnetware.pod copy ..\README.openbsd ..\pod\perlopenbsd.pod copy ..\README.os2 ..\pod\perlos2.pod @@ -1069,17 +1158,16 @@ utils: $(PERLEXE) $(X2P) copy ..\README.riscos ..\pod\perlriscos.pod copy ..\README.solaris ..\pod\perlsolaris.pod copy ..\README.symbian ..\pod\perlsymbian.pod + copy ..\README.synology ..\pod\perlsynology.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.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod - copy ..\pod\perldelta.pod ..\pod\perl5158delta.pod + copy ..\pod\perldelta.pod ..\pod\perl5196delta.pod cd ..\win32 $(PERLEXE) $(PL2BAT) $(UTILS) - $(PERLEXE) $(ICWD) ..\autodoc.pl .. - $(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q + $(MINIPERL) -I..\lib ..\autodoc.pl .. + $(MINIPERL) -I..\lib ..\pod\perlmodlib.PL -q .. ..\pod\perltoc.pod: $(PERLEXE) Extensions Extensions_nonxs $(PERLEXE) -f ..\pod\buildtoc -q @@ -1089,9 +1177,7 @@ utils: $(PERLEXE) $(X2P) distclean: realclean -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \ - $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD) \ - $(PERLEXESTATIC) $(PERLSTATICLIB) - -del /f *.def *.map + $(PERLIMPLIB) ..\miniperl.lib $(PERLEXESTATIC) $(PERLSTATICLIB) -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)\attributes.pm $(LIBDIR)\DynaLoader.pm @@ -1111,77 +1197,82 @@ distclean: realclean -del /f $(LIBDIR)\Win32API\File\cFile.pc -del /f $(LIBDIR)\buildcustomize.pl -del /f $(DISTDIR)\XSLoader\XSLoader.pm + -del /f *.def *.map -if exist $(LIBDIR)\App rmdir /s /q $(LIBDIR)\App -if exist $(LIBDIR)\Archive rmdir /s /q $(LIBDIR)\Archive -if exist $(LIBDIR)\Attribute rmdir /s /q $(LIBDIR)\Attribute -if exist $(LIBDIR)\autodie rmdir /s /q $(LIBDIR)\autodie - -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B + -if exist $(LIBDIR)\Carp rmdir /s /q $(LIBDIR)\Carp -if exist $(LIBDIR)\CGI rmdir /s /q $(LIBDIR)\CGI - -if exist $(LIBDIR)\CPAN rmdir /s /q $(LIBDIR)\CPAN - -if exist $(LIBDIR)\CPANPLUS rmdir /s /q $(LIBDIR)\CPANPLUS -if exist $(LIBDIR)\Compress rmdir /s /q $(LIBDIR)\Compress + -if exist $(LIBDIR)\Config\Perl rmdir /s /q $(LIBDIR)\Config\Perl + -if exist $(LIBDIR)\CPAN rmdir /s /q $(LIBDIR)\CPAN -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data -if exist $(LIBDIR)\Devel rmdir /s /q $(LIBDIR)\Devel -if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest -if exist $(LIBDIR)\Encode rmdir /s /q $(LIBDIR)\Encode -if exist $(LIBDIR)\encoding rmdir /s /q $(LIBDIR)\encoding + -if exist $(LIBDIR)\Exporter rmdir /s /q $(LIBDIR)\Exporter -if exist $(LIBDIR)\ExtUtils\CBuilder rmdir /s /q $(LIBDIR)\ExtUtils\CBuilder -if exist $(LIBDIR)\ExtUtils\Command rmdir /s /q $(LIBDIR)\ExtUtils\Command -if exist $(LIBDIR)\ExtUtils\Constant rmdir /s /q $(LIBDIR)\ExtUtils\Constant -if exist $(LIBDIR)\ExtUtils\Liblist rmdir /s /q $(LIBDIR)\ExtUtils\Liblist -if exist $(LIBDIR)\ExtUtils\MakeMaker rmdir /s /q $(LIBDIR)\ExtUtils\MakeMaker + -if exist $(LIBDIR)\ExtUtils\ParseXS rmdir /s /q $(LIBDIR)\ExtUtils\ParseXS + -if exist $(LIBDIR)\ExtUtils\Typemaps rmdir /s /q $(LIBDIR)\ExtUtils\Typemaps -if exist $(LIBDIR)\File\Spec rmdir /s /q $(LIBDIR)\File\Spec -if exist $(LIBDIR)\Filter rmdir /s /q $(LIBDIR)\Filter -if exist $(LIBDIR)\Hash rmdir /s /q $(LIBDIR)\Hash - -if exist $(LIBDIR)\I18N\LangTags rmdir /s /q $(LIBDIR)\I18N\LangTags + -if exist $(LIBDIR)\HTTP rmdir /s /q $(LIBDIR)\HTTP + -if exist $(LIBDIR)\I18N rmdir /s /q $(LIBDIR)\I18N -if exist $(LIBDIR)\inc rmdir /s /q $(LIBDIR)\inc - -if exist $(LIBDIR)\Module\Pluggable rmdir /s /q $(LIBDIR)\Module\Pluggable -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO -if exist $(LIBDIR)\IPC rmdir /s /q $(LIBDIR)\IPC + -if exist $(LIBDIR)\JSON rmdir /s /q $(LIBDIR)\JSON -if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List -if exist $(LIBDIR)\Locale rmdir /s /q $(LIBDIR)\Locale - -if exist $(LIBDIR)\Log rmdir /s /q $(LIBDIR)\Log -if exist $(LIBDIR)\Math rmdir /s /q $(LIBDIR)\Math -if exist $(LIBDIR)\Memoize rmdir /s /q $(LIBDIR)\Memoize -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME -if exist $(LIBDIR)\Module rmdir /s /q $(LIBDIR)\Module - -if exist $(LIBDIR)\mro rmdir /s /q $(LIBDIR)\mro -if exist $(LIBDIR)\Net\FTP rmdir /s /q $(LIBDIR)\Net\FTP - -if exist $(LIBDIR)\Object rmdir /s /q $(LIBDIR)\Object -if exist $(LIBDIR)\Package rmdir /s /q $(LIBDIR)\Package -if exist $(LIBDIR)\Params rmdir /s /q $(LIBDIR)\Params -if exist $(LIBDIR)\Parse rmdir /s /q $(LIBDIR)\Parse + -if exist $(LIBDIR)\Perl rmdir /s /q $(LIBDIR)\Perl -if exist $(LIBDIR)\PerlIO rmdir /s /q $(LIBDIR)\PerlIO -if exist $(LIBDIR)\Pod\Perldoc rmdir /s /q $(LIBDIR)\Pod\Perldoc -if exist $(LIBDIR)\Pod\Simple rmdir /s /q $(LIBDIR)\Pod\Simple -if exist $(LIBDIR)\Pod\Text rmdir /s /q $(LIBDIR)\Pod\Text - -if exist $(LIBDIR)\re rmdir /s /q $(LIBDIR)\re -if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar + -if exist $(LIBDIR)\Search rmdir /s /q $(LIBDIR)\Search -if exist $(LIBDIR)\Sys rmdir /s /q $(LIBDIR)\Sys -if exist $(LIBDIR)\TAP rmdir /s /q $(LIBDIR)\TAP - -if exist $(LIBDIR)\Term\UI rmdir /s /q $(LIBDIR)\Term\UI + -if exist $(LIBDIR)\Term rmdir /s /q $(LIBDIR)\Term -if exist $(LIBDIR)\Test rmdir /s /q $(LIBDIR)\Test + -if exist $(LIBDIR)\Text rmdir /s /q $(LIBDIR)\Text -if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread -if exist $(LIBDIR)\threads rmdir /s /q $(LIBDIR)\threads -if exist $(LIBDIR)\Tie\Hash rmdir /s /q $(LIBDIR)\Tie\Hash -if exist $(LIBDIR)\Unicode\Collate rmdir /s /q $(LIBDIR)\Unicode\Collate - -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS + -if exist $(LIBDIR)\Unicode\Collate\Locale rmdir /s /q $(LIBDIR)\Unicode\Collate\Locale + -if exist $(LIBDIR)\version rmdir /s /q $(LIBDIR)\version + -if exist $(LIBDIR)\VMS rmdir /s /q $(LIBDIR)\VMS -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API + -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS -cd $(PODDIR) && del /f *.html *.bat roffitall \ - perl5158delta.pod perlaix.pod perlamiga.pod perlapi.pod \ - perlbeos.pod perlbs2000.pod perlce.pod perlcn.pod \ - perlcygwin.pod perldgux.pod perldos.pod perlepoc.pod \ + perl5196delta.pod perlaix.pod perlamiga.pod perlapi.pod \ + perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod perldos.pod \ perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \ perlintern.pod perlirix.pod perljp.pod perlko.pod perllinux.pod \ - perlmacos.pod perlmacosx.pod perlmodlib.pod perlmpeix.pod \ - perlnetware.pod perlopenbsd.pod perlos2.pod perlos390.pod \ - perlos400.pod perlplan9.pod perlqnx.pod perlriscos.pod \ - perlsolaris.pod perlsymbian.pod perltoc.pod perltru64.pod \ - perltw.pod perluniprops.pod perluts.pod perlvmesa.pod \ - perlvos.pod perlwin32.pod + perlmacos.pod perlmacosx.pod perlmodlib.pod perlnetware.pod \ + perlopenbsd.pod perlos2.pod perlos390.pod perlos400.pod \ + perlplan9.pod perlqnx.pod perlriscos.pod perlsolaris.pod \ + perlsymbian.pod perlsynology.pod perltoc.pod perltru64.pod \ + perltw.pod perluniprops.pod perlvos.pod perlwin32.pod -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ perldoc perlivp libnetcfg enc2xs piconv cpan *.bat \ - xsubpp pod2html instmodsh json_pp prove ptar ptardiff ptargrep cpanp-run-perl cpanp cpan2dist shasum corelist config_data zipdetails + xsubpp pod2html instmodsh json_pp prove ptar ptardiff ptargrep shasum corelist config_data zipdetails -cd ..\x2p && del /f find2perl s2p psed *.bat -del /f ..\config.sh perlmain.c dlutils.c config.h.new \ perlmainst.c @@ -1194,6 +1285,7 @@ distclean: realclean -cd $(EXTDIR) && del /s *.def Makefile Makefile.old -cd $(DISTDIR) && del /s *.def Makefile Makefile.old -cd $(CPANDIR) && del /s *.def Makefile Makefile.old + -del /s ..\utils\Makefile -if exist $(AUTODIR) rmdir /s /q $(AUTODIR) -if exist $(COREDIR) rmdir /s /q $(COREDIR) -if exist pod2htmd.tmp del pod2htmd.tmp @@ -1228,7 +1320,7 @@ minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils $(UNIDATAFILES) $(XCOPY) $(GLOBEXE) ..\t\$(NULL) attrib -r ..\t\*.* cd ..\t && \ - $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t + $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t opbasic/*.t op/*.t pragma/*.t test-prep : all utils ../pod/perltoc.pod $(XCOPY) $(PERLEXE) ..\t\$(NULL)