projects / p5sagit/p5-mst-13.2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
more testsuite smarts (many of them courtesy Ilya)
[p5sagit/p5-mst-13.2.git] / win32 / makefile.mk
diff --git a/win32/makefile.mk b/win32/makefile.mk
index e74dc68..7f2b515 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -33,7 +33,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.00553
+INST_VER       *= \5.00556
 
 #
 # uncomment to enable threads-capabilities
@@ -122,7 +122,8 @@ CCTYPE              *= BORLAND
 # set the install locations of the compiler include/libraries
 # Running VCVARS32.BAT is *required* when using Visual C.
 # Some versions of Visual C don't define MSVCDIR in the environment,
-# so you may have to set CCHOME explicitly.
+# so you may have to set CCHOME explicitly (spaces in the path name should
+# not be quoted)
 #
 CCHOME         *= C:\bc5
 #CCHOME                *= $(MSVCDIR)
@@ -131,7 +132,19 @@ CCINCDIR   *= $(CCHOME)\include
 CCLIBDIR       *= $(CCHOME)\lib
 
 #
-# specify space-separated list of extra directories to look for libraries
+# additional compiler flags can be specified here.
+#
+# Adding -DPERL_POLLUTE enables support for old symbols, at the expense of
+# extreme pollution. You most probably want this if you're compiling modules
+# from CPAN, or other such serious uses of this experimental perl release.
+# We don't enable this by default because we want the modules to get fixed
+# instead of clinging to shortcuts like this one.
+#
+#BUILDOPT      *= -DPERL_POLLUTE
+
+#
+# specify semicolon-separated list of extra directories that modules will
+# look for libraries (spaces in path names need not be quoted)
 #
 EXTRALIBDIRS   *=
 
@@ -171,9 +184,6 @@ PERL_MALLOC *= undef
 USE_THREADS    *= undef
 USE_MULTI      *= undef
 
-#BUILDOPT      *= -DPERL_GLOBAL_STRUCT
-# -DUSE_PERLIO -D__STDC__=1 -DUSE_SFIO -DI_SFIO -I\sfio97\include
-
 .IMPORT .IGNORE : PROCESSOR_ARCHITECTURE
 
 PROCESSOR_ARCHITECTURE *= x86
@@ -207,7 +217,7 @@ IMPLIB              = implib -c
 # Options
 #
 RUNTIME                = -D_RTLDLL
-INCLUDES       = -I$(COREDIR) -I.\include -I. -I.. -I$(CCINCDIR)
+INCLUDES       = -I$(COREDIR) -I.\include -I. -I.. -I"$(CCINCDIR)"
 #PCHFLAGS      = -H -Hc -H=c:\temp\bcmoduls.pch 
 DEFINES                = -DWIN32 $(BUILDOPT) $(CRYPT_FLAG)
 LOCDEFS                = -DPERLDLL -DPERL_CORE
@@ -227,7 +237,7 @@ LINK_DBG    =
 
 CFLAGS         = -w -g0 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS     = $(LINK_DBG) -L$(CCLIBDIR) $(EXTRALIBDIRS:^"-L")
+LINK_FLAGS     = $(LINK_DBG) -L"$(CCLIBDIR)"
 OBJOUT_FLAG    = -o
 EXEOUT_FLAG    = -e
 LIBOUT_FLAG    = 
@@ -265,7 +275,7 @@ LINK_DBG    =
 .ENDIF
 
 CFLAGS         = $(INCLUDES) $(DEFINES) $(LOCDEFS) $(OPTIMIZE)
-LINK_FLAGS     = $(LINK_DBG) -L$(CCLIBDIR) $(EXTRALIBDIRS:^"-L")
+LINK_FLAGS     = $(LINK_DBG) -L"$(CCLIBDIR)"
 OBJOUT_FLAG    = -o
 EXEOUT_FLAG    = -o
 LIBOUT_FLAG    = 
@@ -419,6 +429,9 @@ UTILS               =                       \
                ..\pod\pod2latex        \
                ..\pod\pod2man          \
                ..\pod\pod2text         \
+               ..\pod\pod2usage        \
+               ..\pod\podchecker       \
+               ..\pod\podselect        \
                ..\x2p\find2perl        \
                ..\x2p\s2p              \
                bin\runperl.pl          \
@@ -611,7 +624,7 @@ SETARGV_OBJ = setargv$(o)
 .ENDIF
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
-               Data/Dumper Devel/Peek
+               Data/Dumper Devel/Peek ByteLoader
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -629,6 +642,7 @@ RE          = $(EXTDIR)\re\re
 DUMPER         = $(EXTDIR)\Data\Dumper\Dumper
 ERRNO          = $(EXTDIR)\Errno\Errno
 PEEK           = $(EXTDIR)\Devel\Peek\Peek
+BYTELOADER     = $(EXTDIR)\ByteLoader\ByteLoader
 
 SOCKET_DLL     = $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL      = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -642,6 +656,7 @@ B_DLL               = $(AUTODIR)\B\B.dll
 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
 
 ERRNO_PM       = $(LIBDIR)\Errno.pm
 
@@ -657,7 +672,8 @@ EXTENSION_C =               \
                $(RE).c         \
                $(DUMPER).c     \
                $(PEEK).c       \
-               $(B).c
+               $(B).c          \
+               $(BYTELOADER).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -669,7 +685,8 @@ EXTENSION_DLL       =               \
                $(ATTRS_DLL)    \
                $(DUMPER_DLL)   \
                $(PEEK_DLL)     \
-               $(B_DLL)
+               $(B_DLL)        \
+               $(BYTELOADER_DLL)
 
 EXTENSION_PM   =               \
                $(ERRNO_PM)
@@ -692,14 +709,14 @@ CFG_VARS  =                                       \
                "INST_VER=$(INST_VER)"                  \
                "archname=$(ARCHNAME)"                  \
                "cc=$(CC)"                              \
-               "ccflags=$(OPTIMIZE) $(DEFINES) $(OBJECT)"      \
+               "ccflags=$(OPTIMIZE:s/"/\"/) $(DEFINES) $(OBJECT)"      \
                "cf_email=$(EMAIL)"                     \
                "d_crypt=$(D_CRYPT)"                    \
                "d_mymalloc=$(PERL_MALLOC)"             \
                "libs=$(LIBFILES:f)"                    \
-               "incpath=$(CCINCDIR)"                   \
+               "incpath=$(CCINCDIR:s/"/\"/)"           \
                "libperl=$(PERLIMPLIB:f)"               \
-               "libpth=$(strip $(CCLIBDIR) $(EXTRALIBDIRS) $(LIBFILES:d))" \
+               "libpth=$(CCLIBDIR:s/"/\"/);$(EXTRALIBDIRS:s/"/\"/)"    \
                "libc=$(LIBC)"                          \
                "make=dmake"                            \
                "_o=$(o)" "obj_ext=$(o)"                \
@@ -709,8 +726,8 @@ CFG_VARS    =                                       \
                "nonxs_ext=$(NONXS_EXT)"                \
                "usethreads=$(USE_THREADS)"             \
                "usemultiplicity=$(USE_MULTI)"          \
-               "LINK_FLAGS=$(LINK_FLAGS)"              \
-               "optimize=$(OPTIMIZE)"
+               "LINK_FLAGS=$(LINK_FLAGS:s/"/\"/)"              \
+               "optimize=$(OPTIMIZE:s/"/\"/)"
 
 #
 # Top targets
@@ -725,9 +742,9 @@ $(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
 
 $(GLOBEXE) : perlglob$(o)
 .IF "$(CCTYPE)" == "BORLAND"
-       $(CC) -c -w -v -tWM -I$(CCINCDIR) perlglob.c
+       $(CC) -c -w -v -tWM -I"$(CCINCDIR)" perlglob.c
        $(LINK32) -Tpe -ap $(LINK_FLAGS) c0x32$(o) perlglob$(o) \
-           $(CCLIBDIR)\32BIT\wildargs$(o),$@,,import32.lib cw32mt.lib,
+           "$(CCLIBDIR)\32BIT\wildargs$(o)",$@,,import32.lib cw32mt.lib,
 .ELIF "$(CCTYPE)" == "GCC"
        $(LINK32) $(LINK_FLAGS) -o $@ perlglob$(o) $(LIBFILES)
 .ELSE
@@ -755,7 +772,7 @@ regen_config_h:
        -cd .. && del /f perl.exe
        cd .. && perl configpm
        -del /f $(CFGH_TMPL)
-       -mkdir ..\lib\CORE
+       -mkdir $(COREDIR)
        -perl -I..\lib config_h.PL "INST_VER=$(INST_VER)"
        rename config.h $(CFGH_TMPL)
 
@@ -1011,6 +1028,11 @@ $(SOCKET_DLL): $(PERLEXE) $(SOCKET).xs
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
        cd $(EXTDIR)\$(*B) && $(MAKE)
 
+$(BYTELOADER_DLL): $(PERLEXE) $(BYTELOADER).xs
+       cd $(EXTDIR)\$(*B) && \
+       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       cd $(EXTDIR)\$(*B) && $(MAKE)
+
 $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
        cd $(EXTDIR)\$(*B) && \
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -1039,7 +1061,7 @@ distclean: clean
        -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm $(LIBDIR)\Thread.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
+       -del /f $(LIBDIR)\Data\Dumper.pm $(LIBDIR)\ByteLoader.pm
        -del /f $(LIBDIR)\Devel\Peek.pm
        -rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO
        -rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread
Unnamed repository; edit this file to name it for gitweb.