Retract #17331, something broke (e.g. t/io/utf8.t became unhappy)

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 5c81d6e..cc360f8 100644 (file)
--- 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.7.3
+#INST_VER = \5.8.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -47,12 +47,12 @@ INST_TOP    = $(INST_DRV)\perl
 
 #
 # uncomment to enable multiple interpreters.  This is need for fork()
-# emulation.
+# emulation and for thread support.
 #
 USE_MULTI = define
 
 #
-# Beginnings of interpreter cloning/threads; still very incomplete.
+# Beginnings of interpreter cloning/threads; now reasonably complete.
 # This should be enabled to get the fork() emulation.  This needs
 # USE_MULTI as well.
 #
@@ -66,7 +66,11 @@ USE_ITHREADS = define
 USE_IMP_SYS = define
 
 #
-# uncomment to enable the experimental PerlIO I/O subsystem.
+# Comment out next assign to disable perl's I/O subsystem and use compiler's 
+# stdio for IO - depending on your compiler vendor and run time library you may 
+# then get a number of fails from make test i.e. bugs - complain to them not us ;-). 
+# You will also be unable to take full advantage of perl5.8's support for multiple 
+# encodings and may see lower IO performance. You have been warned.
 USE_PERLIO     = define
 
 #
@@ -88,6 +92,8 @@ USE_PERLIO    = define
 
 #
 # uncomment next line if you want debug version of perl (big,slow)
+# If not enabled, we automatically try to use maximum optimization
+# with all compilers that are known to have a working optimizer.
 #
 #CFG           = Debug
 
@@ -551,9 +557,11 @@ WIN32_SRC  =               \
                .\win32sck.c    \
                .\win32thread.c
 
-!IF "$(USE_PERLIO)" == "define"
+# We need this for miniperl build unless we override canned 
+# config.h #define building mini\*
+#!IF "$(USE_PERLIO)" == "define"
 WIN32_SRC      = $(WIN32_SRC) .\win32io.c
-!ENDIF
+#!ENDIF
 
 !IF "$(CRYPT_SRC)" != ""
 WIN32_SRC      = $(WIN32_SRC) .\$(CRYPT_SRC)
@@ -659,6 +667,7 @@ TIMEHIRES           = $(EXTDIR)\Time\HiRes\HiRes
 CWD                    = $(EXTDIR)\Cwd\Cwd
 LISTUTIL               = $(EXTDIR)\List\Util\Util
 PERLIOVIA              = $(EXTDIR)\PerlIO\Via\Via
+XSAPITEST              = $(EXTDIR)\XS\APItest\APItest
 XSTYPEMAP              = $(EXTDIR)\XS\Typemap\Typemap
 UNICODENORMALIZE       = $(EXTDIR)\Unicode\Normalize\Normalize
 
@@ -688,6 +697,7 @@ TIMEHIRES_DLL               = $(AUTODIR)\Time\HiRes\HiRes.dll
 CWD_DLL                        = $(AUTODIR)\Cwd\Cwd.dll
 LISTUTIL_DLL           = $(AUTODIR)\List\Util\Util.dll
 PERLIOVIA_DLL          = $(AUTODIR)\PerlIO\Via\Via.dll
+XSAPITEST_DLL          = $(AUTODIR)\XS\APItest\APItest.dll
 XSTYPEMAP_DLL          = $(AUTODIR)\XS\Typemap\Typemap.dll
 UNICODENORMALIZE_DLL   = $(AUTODIR)\Unicode\Normalize\Normalize.dll
 
@@ -718,6 +728,7 @@ EXTENSION_C =               \
                $(CWD).c        \
                $(LISTUTIL).c   \
                $(PERLIOVIA).c  \
+               $(XSAPITEST).c  \
                $(XSTYPEMAP).c  \
                $(UNICODENORMALIZE).c
 
@@ -748,6 +759,7 @@ EXTENSION_DLL       =               \
                $(CWD_DLL)      \
                $(LISTUTIL_DLL) \
                $(PERLIOVIA_DLL)        \
+               $(XSAPITEST_DLL)        \
                $(XSTYPEMAP_DLL)        \
                $(UNICODENORMALIZE_DLL)
 
@@ -816,12 +828,12 @@ config.w32 : $(CFGSH_TMPL)
 regen_config_h:
        perl config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh
        cd ..
-       -del /f perl.exe
+       -del /f perl.exe perl*.dll
        perl configpm
        cd win32
        -del /f $(CFGH_TMPL)
        -mkdir $(COREDIR)
-       -perl -I..\lib config_h.PL "INST_VER=$(INST_VER)"
+       -perl config_h.PL "INST_VER=$(INST_VER)"
        rename config.h $(CFGH_TMPL)
 
 $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
@@ -960,8 +972,10 @@ utils: $(PERLEXE) $(X2P)
        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.mint     .\perlmint.pod
@@ -1010,12 +1024,11 @@ distclean: clean
        -del /f $(LIBDIR)\List\Util.pm
        -del /f $(LIBDIR)\Scalar\Util.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
        -rmdir /s $(LIBDIR)\IO
-       -if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread
-       -rmdir /s $(LIBDIR)\Thread
        -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B
        -rmdir /s $(LIBDIR)\B
        -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data
@@ -1035,8 +1048,8 @@ distclean: clean
        -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 perlhurd.pod \
-           perlhpux.pod perlmachten.pod \
+           perldos.pod perlepoc.pod perlfreebsd.pod perlhurd.pod \
+           perlhpux.pod perlirix.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 \