This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
https://perl5.git.perl.org / perl5.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
integrate cfgperl contents into mainline; merge conflicts
[perl5.git] / win32 / Makefile
diff --git a/win32/Makefile b/win32/Makefile
index 82a72ec..f742080 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -29,7 +29,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.00557
+INST_VER       = \5.00562
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -141,6 +141,11 @@ CCLIBDIR   = $(CCHOME)\lib
 #BUILDOPT      = $(BUILDOPT) -DPERL_POLLUTE
 
 #
+# enable this to test the File::Glob implementation of CORE::glob
+#
+#BUILDOPT      = $(BUILDOPT) -DPERL_INTERNAL_GLOB
+
+#
 # specify semicolon-separated list of extra directories that modules will
 # look for libraries (spaces in path names need not be quoted)
 #
@@ -183,7 +188,11 @@ USE_THREADS        = undef
 USE_MULTI      = undef
 !ENDIF
 
-!IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != ""
+!IF "$(USE_OBJECT)" == ""
+USE_OBJECT     = undef
+!ENDIF
+
+!IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != "undefundefundef"
 BUILDOPT       = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -219,15 +228,29 @@ CFG               = Optimize
 !ENDIF
 !ENDIF
 
+ARCHDIR                = ..\lib\$(ARCHNAME)
 COREDIR                = ..\lib\CORE
 AUTODIR                = ..\lib\auto
+LIBDIR         = ..\lib
+EXTDIR         = ..\ext
+PODDIR         = ..\pod
+EXTUTILSDIR    = $(LIBDIR)\ExtUtils
+
+#
+INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
+INST_BIN       = $(INST_SCRIPT)$(INST_ARCH)
+INST_LIB       = $(INST_TOP)$(INST_VER)\lib
+INST_ARCHLIB   = $(INST_LIB)$(INST_ARCH)
+INST_COREDIR   = $(INST_ARCHLIB)\CORE
+INST_POD       = $(INST_LIB)\pod
+INST_HTML      = $(INST_POD)\html
 
 #
 # Programs to compile, build .lib files and link
 #
 
-CC             = cl.exe
-LINK32         = link.exe
+CC             = cl
+LINK32         = link
 LIB32          = $(LINK32) -lib
 
 #
@@ -296,7 +319,9 @@ LIBFILES    = $(LIBBASEFILES) $(LIBC)
 
 CFLAGS         = -nologo -Gf -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS     = -nologo -nodefaultlib $(LINK_DBG) -machine:$(PROCESSOR_ARCHITECTURE)
+LINK_FLAGS     = -nologo -nodefaultlib $(LINK_DBG) \
+               -libpath:"$(INST_COREDIR)" \
+               -machine:$(PROCESSOR_ARCHITECTURE)
 OBJOUT_FLAG    = -Fo
 EXEOUT_FLAG    = -Fe
 
@@ -324,21 +349,10 @@ $(o).dll:
            -out:$@ $(LINK_FLAGS) $(LIBFILES) $< $(LIBPERL)  
 
 #
-INST_BIN       = $(INST_TOP)$(INST_VER)\bin$(INST_ARCH)
-INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
-INST_LIB       = $(INST_TOP)$(INST_VER)\lib
-INST_POD       = $(INST_LIB)\pod
-INST_HTML      = $(INST_POD)\html
-LIBDIR         = ..\lib
-EXTDIR         = ..\ext
-PODDIR         = ..\pod
-EXTUTILSDIR    = $(LIBDIR)\extutils
-
-#
 # various targets
 !IF "$(USE_OBJECT)" == "define"
-PERLIMPLIB     = ..\perlcore.lib
-PERLDLL                = ..\perlcore.dll
+PERLIMPLIB     = ..\perl56.lib
+PERLDLL                = ..\perl56.dll
 !ELSE
 PERLIMPLIB     = ..\perl.lib
 PERLDLL                = ..\perl.dll
@@ -358,6 +372,7 @@ GLOBBAT             = bin\perlglob.bat
 UTILS          =                       \
                ..\utils\h2ph           \
                ..\utils\splain         \
+               ..\utils\dprofpp        \
                ..\utils\perlbug        \
                ..\utils\pl2pm          \
                ..\utils\c2ph           \
@@ -427,7 +442,8 @@ MICROCORE_SRC       =               \
                ..\toke.c       \
                ..\universal.c  \
                ..\utf8.c       \
-               ..\util.c
+               ..\util.c       \
+               ..\xsutils.c
 
 EXTRACORE_SRC  = $(EXTRACORE_SRC) perllib.c
 
@@ -498,7 +514,7 @@ CORE_NOCFG_H        =               \
                ..\unixish.h    \
                ..\utf8.h       \
                ..\util.h       \
-               ..\warning.h    \
+               ..\warnings.h   \
                ..\XSUB.h       \
                ..\EXTERN.h     \
                ..\perlvars.h   \
@@ -535,7 +551,7 @@ SETARGV_OBJ = setargv$(o)
 !ENDIF
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
-               Data/Dumper Devel/Peek ByteLoader
+               Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -554,6 +570,8 @@ 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
 
 SOCKET_DLL     = $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL      = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -568,6 +586,8 @@ DUMPER_DLL  = $(AUTODIR)\Data\Dumper\Dumper.dll
 PEEK_DLL       = $(AUTODIR)\Devel\Peek\Peek.dll
 RE_DLL         = $(AUTODIR)\re\re.dll
 BYTELOADER_DLL = $(AUTODIR)\ByteLoader\ByteLoader.dll
+DPROF_DLL      = $(AUTODIR)\Devel\DProf\DProf.dll
+GLOB_DLL       = $(AUTODIR)\File\Glob\Glob.dll
 
 ERRNO_PM       = $(LIBDIR)\Errno.pm
 
@@ -584,7 +604,9 @@ EXTENSION_C =               \
                $(DUMPER).c     \
                $(PEEK).c       \
                $(B).c          \
-               $(BYTELOADER).c
+               $(BYTELOADER).c \
+               $(DPROF).c      \
+               $(GLOB).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -599,7 +621,9 @@ EXTENSION_DLL       =               \
                $(B_DLL)        \
                $(RE_DLL)       \
                $(THREAD_DLL)   \
-               $(BYTELOADER_DLL)
+               $(BYTELOADER_DLL)       \
+               $(DPROF_DLL)    \
+               $(GLOB_DLL)
 
 EXTENSION_PM   =               \
                $(ERRNO_PM)
@@ -709,8 +733,8 @@ $(DLL_OBJ)  : $(CORE_H)
 $(PERL95_OBJ)  : $(CORE_H)
 $(X2P_OBJ)     : $(CORE_H)
 
-perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym makedef.pl
-       $(MINIPERL) -w makedef.pl $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \
+perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl
+       $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \
            CCTYPE=$(CCTYPE) > perldll.def
 
 $(PERLDLL): perldll.def $(PERLDLL_OBJ)
@@ -802,6 +826,18 @@ $(DUMPER_DLL): $(PERLEXE) $(DUMPER).xs
        $(MAKE)
        cd ..\..\..\win32
 
+$(DPROF_DLL): $(PERLEXE) $(DPROF).xs
+       cd $(EXTDIR)\Devel\$(*B)
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\..\win32
+
+$(GLOB_DLL): $(PERLEXE) $(GLOB).xs
+       cd $(EXTDIR)\File\$(*B)
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\..\win32
+
 $(PEEK_DLL): $(PERLEXE) $(PEEK).xs
        cd $(EXTDIR)\Devel\$(*B)
        ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -907,7 +943,8 @@ distclean: clean
        -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
+       -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm
+       -del /f $(LIBDIR)\File\Glob.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
@@ -915,7 +952,7 @@ distclean: clean
        -del /f $(PODDIR)\*.html
        -del /f $(PODDIR)\*.bat
        cd ..\utils
-       -del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc pstruct
+       -del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc pstruct dprofpp
        -del /f *.bat
        cd ..\win32
        cd ..\x2p
Unnamed repository; edit this file 'description' to name the repository.