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
Must Uppercase.
[perl5.git] / win32 / Makefile
diff --git a/win32/Makefile b/win32/Makefile
index d1776e5..93f8cb2 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -31,7 +31,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.7.1
+#INST_VER = \5.7.2
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -79,17 +79,6 @@ USE_PERLIO   = 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
-
-#
 # uncomment one of the following lines if you are using either
 # Visual C++ 2.x or Visual C++ 6.x (aka Visual Studio 98)
 #
@@ -206,13 +195,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
@@ -233,10 +215,6 @@ PERL_MALLOC        = undef
 USE_MULTI      = undef
 !ENDIF
 
-!IF "$(USE_OBJECT)" == ""
-USE_OBJECT     = undef
-!ENDIF
-
 !IF "$(USE_ITHREADS)" == ""
 USE_ITHREADS   = undef
 !ENDIF
@@ -253,16 +231,16 @@ USE_PERLIO        = 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
 
@@ -274,9 +252,6 @@ BUILDOPT    = $(BUILDOPT) -DPERL_IMPLICIT_SYS
 PROCESSOR_ARCHITECTURE = x86
 !ENDIF
 
-!IF "$(USE_OBJECT)" == "define"
-ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-object
-!ELSE
 !IF "$(USE_5005THREADS)" == "define"
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 !ELSE
@@ -290,7 +265,6 @@ ARCHNAME    = MSWin32-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
 !ENDIF
 !ENDIF
-!ENDIF
 
 !IF "$(USE_PERLIO)" == "define"
 BUILDOPT       = $(BUILDOPT) -DUSE_PERLIO
@@ -368,11 +342,6 @@ OPTIMIZE   = -O1 -MD -DNDEBUG
 LINK_DBG       = -release
 !ENDIF
 
-!IF "$(USE_OBJECT)" == "define"
-OPTIMIZE       = $(OPTIMIZE) $(CXX_FLAG)
-BUILDOPT       = $(BUILDOPT) -DPERL_OBJECT
-!ENDIF
-
 !IF "$(USE_PERLCRT)" != "define"
 BUILDOPT       = $(BUILDOPT) -DPERL_MSVCRT_READFIX
 !ENDIF
@@ -457,6 +426,8 @@ UTILS               =                       \
                ..\utils\h2xs           \
                ..\utils\perldoc        \
                ..\utils\perlcc         \
+               ..\utils\perlivp        \
+               ..\utils\libnetcfg      \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
@@ -467,6 +438,7 @@ UTILS               =                       \
                ..\pod\podselect        \
                ..\x2p\find2perl        \
                ..\x2p\s2p              \
+               ..\lib\ExtUtils\xsubpp  \
                bin\exetype.pl          \
                bin\runperl.pl          \
                bin\pl2bat.pl           \
@@ -484,7 +456,7 @@ RCOPY               = xcopy /f /r /i /e /d
 NOOP           = @echo
 NULL           =
 
-DEL            = bin\mdelete.bat
+DEL            = del
 
 #
 # filenames given to xsubpp must have forward slashes (since it puts
@@ -501,7 +473,9 @@ MICROCORE_SRC       =               \
                ..\globals.c    \
                ..\gv.c         \
                ..\hv.c         \
+               ..\locale.c     \
                ..\mg.c         \
+               ..\numeric.c    \
                ..\op.c         \
                ..\perl.c       \
                ..\perlapi.c    \
@@ -509,11 +483,13 @@ MICROCORE_SRC     =               \
                ..\pp.c         \
                ..\pp_ctl.c     \
                ..\pp_hot.c     \
+               ..\pp_pack.c    \
                ..\pp_sys.c     \
                ..\regcomp.c    \
                ..\regexec.c    \
                ..\run.c        \
                ..\scope.c      \
+               ..\sharedsv.c   \
                ..\sv.c         \
                ..\taint.c      \
                ..\toke.c       \
@@ -528,15 +504,17 @@ EXTRACORE_SRC     = $(EXTRACORE_SRC) perllib.c
 EXTRACORE_SRC  = $(EXTRACORE_SRC) ..\malloc.c
 !ENDIF
 
-!IF "$(USE_OBJECT)" != "define"
 EXTRACORE_SRC  = $(EXTRACORE_SRC) ..\perlio.c
-!ENDIF
 
 WIN32_SRC      =               \
                .\win32.c       \
                .\win32sck.c    \
                .\win32thread.c
 
+!IF "$(USE_PERLIO)" == "define"
+WIN32_SRC      = $(WIN32_SRC) .\win32io.c
+!ENDIF
+
 !IF "$(CRYPT_SRC)" != ""
 WIN32_SRC      = $(WIN32_SRC) .\$(CRYPT_SRC)
 !ENDIF
@@ -574,6 +552,7 @@ CORE_NOCFG_H        =               \
                ..\proto.h      \
                ..\regexp.h     \
                ..\scope.h      \
+               ..\sharedsv.h   \
                ..\sv.h         \
                ..\thread.h     \
                ..\unixish.h    \
@@ -598,7 +577,7 @@ WIN32_OBJ   = $(WIN32_SRC:.c=.obj)
 MINICORE_OBJ   = $(MICROCORE_OBJ:..\=.\mini\)  \
                  $(MINIDIR)\miniperlmain$(o)   \
                  $(MINIDIR)\perlio$(o)
-MINIWIN32_OBJ  = $(WIN32_OBJ:.\=.\mini\)
+MINIWIN32_OBJ  = $(WIN32_OBJ:.\=.\mini\) $(MINIDIR)\win32io$(o)
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
 DLL_OBJ                = $(DLL_SRC:.c=.obj)
 X2P_OBJ                = $(X2P_SRC:.c=.obj)
@@ -638,7 +617,6 @@ MD5         = $(EXTDIR)\Digest\MD5\MD5
 PERLIOSCALAR   = $(EXTDIR)\PerlIO\Scalar\Scalar
 MIMEBASE64     = $(EXTDIR)\MIME\Base64\Base64
 TIMEHIRES      = $(EXTDIR)\Time\HiRes\HiRes
-TIMEPIECE      = $(EXTDIR)\Time\Piece\Piece
 CWD            = $(EXTDIR)\Cwd\Cwd
 LISTUTIL       = $(EXTDIR)\List\Util\Util
 PERLIOVIA      = $(EXTDIR)\PerlIO\Via\Via
@@ -667,7 +645,6 @@ MD5_DLL             = $(AUTODIR)\Digest\MD5\MD5.dll
 PERLIOSCALAR_DLL= $(AUTODIR)\PerlIO\Scalar\Scalar.dll
 MIMEBASE64_DLL = $(AUTODIR)\MIME\Base64\Base64.dll
 TIMEHIRES_DLL  = $(AUTODIR)\Time\HiRes\HiRes.dll
-TIMEPIECE_DLL  = $(AUTODIR)\Time\Piece\Piece.dll
 CWD_DLL                = $(AUTODIR)\Cwd\Cwd.dll
 LISTUTIL_DLL   = $(AUTODIR)\List\Util\Util.dll
 PERLIOVIA_DLL  = $(AUTODIR)\PerlIO\Via\Via.dll
@@ -697,7 +674,6 @@ EXTENSION_C =               \
                $(PERLIOSCALAR).c       \
                $(MIMEBASE64).c \
                $(TIMEHIRES).c  \
-               $(TIMEPIECE).c  \
                $(CWD).c        \
                $(LISTUTIL).c   \
                $(PERLIOVIA).c  \
@@ -727,7 +703,6 @@ EXTENSION_DLL       =               \
                $(PERLIOSCALAR_DLL) \
                $(MIMEBASE64_DLL) \
                $(TIMEHIRES_DLL)  \
-               $(TIMEPIECE_DLL)  \
                $(CWD_DLL)      \
                $(LISTUTIL_DLL) \
                $(PERLIOVIA_DLL)        \
@@ -834,7 +809,7 @@ $(MINIWIN32_OBJ) : $(CORE_NOCFG_H)
 
 # -DPERL_IMPLICIT_SYS needs C++ for perllib.c
 # This is the only file that depends on perlhost.h, vmem.h, and vdir.h
-!IF "$(USE_IMP_SYS)$(USE_OBJECT)" == "defineundef"
+!IF "$(USE_IMP_SYS)" == "define"
 perllib$(o)    : perllib.c .\perlhost.h .\vdir.h .\vmem.h
        $(CC) -c -I. $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c
 !ENDIF
@@ -934,17 +909,28 @@ utils: $(PERLEXE) $(X2P)
        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.hurd     .\perlhurd.pod
        copy ..\README.hpux     .\perlhpux.pod
        copy ..\README.machten  .\perlmachten.pod
        copy ..\README.macos    .\perlmacos.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.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
@@ -981,8 +967,6 @@ distclean: clean
        -del /f $(LIBDIR)\List\Util.pm
        -del /f $(LIBDIR)\Scalar\Util.pm
        -del /f $(LIBDIR)\Time\HiRes.pm
-       -del /f $(LIBDIR)\Time\Piece.pm
-       -del /f $(LIBDIR)\Cwd.pm
        -del /f $(LIBDIR)\XS\Typemap.pm
        -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
        -rmdir /s $(LIBDIR)\IO
@@ -1005,14 +989,18 @@ distclean: clean
        -rmdir /s $(LIBDIR)\XS
        cd $(PODDIR)
        -del /f *.html *.bat checkpods \
-           perlaix.pod perlamiga.pod perlbs2000.pod perlcygwin.pod \
-           perldos.pod perlepoc.pod perlhpux.pod perlmachten.pod \
-           perlmacos.pod perlmpeix.pod perlos2.pod perlos390.pod \
-           perlsolaris.pod perlvmesa.pod perlvms.pod perlvos.pod \
+           perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \
+           perlbs2000.pod perlce.pod perlcygwin.pod perldgux.pod \
+           perldos.pod perlepoc.pod perlhurd.pod \
+           perlhpux.pod perlmachten.pod \
+           perlmacos.pod perlmint.pod perlmpeix.pod perlnetware.pod \
+           perlos2.pod perlos390.pod perlplan9.pod perlqnx.pod \
+           perlsolaris.pod perltru64.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 h2xs perldoc dprofpp
+       -del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc perlivp dprofpp
        -del /f *.bat
        cd ..\win32
        cd ..\x2p
Unnamed repository; edit this file 'description' to name the repository.