replace the run time code in lib/utf8_pva.pl with data generated

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

diff --git a/win32/Makefile b/win32/Makefile
index 65f0fa5..6f3e6ce 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -357,8 +357,15 @@ OPTIMIZE   = -Od -MD -Zi -DDEBUGGING
 !  ENDIF
 LINK_DBG       = -debug
 !ELSE
-OPTIMIZE       = -MD -DNDEBUG
-LINK_DBG       = -release
+OPTIMIZE       = -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
+# in addition to the PDB symbols.  The default Dr. Watson that ships with
+# Windows can use the the former but not latter.  The free WinDbg can be
+# 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"
 # enable Whole Program Optimizations (WPO) and Link Time Code Generation (LTCG)
 OPTIMIZE       = $(OPTIMIZE) -Ox -GL
@@ -444,6 +451,15 @@ CONFIGPM   = ..\lib\Config.pm
 MINIMOD                = ..\lib\ExtUtils\Miniperl.pm
 X2P            = ..\x2p\a2p.exe
 
+# Unicode data files generated by mktables
+UNIDATAFILES    = ..\lib\unicore\Canonical.pl ..\lib\unicore\Exact.pl \
+                  ..\lib\unicore\Properties ..\lib\unicore\Decomposition.pl \
+                  ..\lib\unicore\CombiningClass.pl ..\lib\unicore\Name.pl \
+                  ..\lib\unicore\PVA.pl
+
+# Directories of Unicode data files generated by mktables
+UNIDATADIRS     = ..\lib\unicore\To ..\lib\unicore\lib
+
 PERLEXE_ICO    = .\perlexe.ico
 PERLEXE_RES    = .\perlexe.res
 PERLDLL_RES    =
@@ -811,7 +827,7 @@ CFG_VARS    =                                       \
 # Top targets
 #
 
-all : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(PERLEXE) \
+all : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
        $(X2P) Extensions
        @echo   Everything is up to date. '$(MAKE_BARE) test' to run test suite.
 
@@ -1113,7 +1129,7 @@ distclean: realclean
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
        -del /f $(CONFIGPM)
        -del /f bin\*.bat
-       -del /f $(PERLEXE_ICO)
+       -del /f $(PERLEXE_ICO) perl.base
        -cd .. && del /s *.lib *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib
        -cd $(EXTDIR) && del /s *.def Makefile Makefile.old
        -if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
@@ -1127,6 +1143,8 @@ installbare : utils
        $(PERLEXE) ..\installperl
        if exist $(WPERLEXE) $(XCOPY) $(WPERLEXE) $(INST_BIN)\*.*
        $(XCOPY) $(GLOBEXE) $(INST_BIN)\*.*
+       if exist ..\perl*.pdb $(XCOPY) ..\perl*.pdb $(INST_BIN)\*.*
+       if exist ..\x2p\a2p.pdb $(XCOPY) ..\x2p\a2p.pdb $(INST_BIN)\*.*
        $(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*
 
 installhtml : doc
@@ -1137,7 +1155,12 @@ inst_lib : $(CONFIGPM)
        $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
        $(RCOPY) ..\lib $(INST_LIB)\*.*
 
-minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils
+$(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables
+       cd ..\lib\unicore
+       ..\..\$(MINIPERL) -I..\..\lib mktables
+       cd ..\..\win32
+
+minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils $(UNIDATAFILES)
        $(XCOPY) $(MINIPERL) ..\t\$(NULL)
        if exist ..\t\perl.exe del /f ..\t\perl.exe
        rename ..\t\miniperl.exe perl.exe
@@ -1184,7 +1207,8 @@ _clean :
        -@$(DEL) $(CORE_OBJ)
        -if exist $(MINIDIR) rmdir /s /q $(MINIDIR)
        -if exist $(MINIDIR) rmdir /s $(MINIDIR)
-       -@$(DEL) $(WIN32_OBJ)
+       -if exist $(UNIDATADIRS) rmdir /s $(UNIDATADIRS)
+       -@$(DEL) $(UNIDATAFILES)
        -@$(DEL) $(DLL_OBJ)
        -@$(DEL) $(X2P_OBJ)
        -@$(DEL) ..\*$(o) ..\*.lib ..\*.exp *$(o) *.lib *.exp *.res