Change 33349 by [EMAIL PROTECTED] on 2008/02/22 18:10:36
Fix-up Win32's regen_config_h targets for semi-automatic updating of
the win32/config_H.* files
Affected files ...
... //depot/perl/win32/Makefile#352 edit
... //depot/perl/win32/makefile.mk#392 edit
Differences ...
==== //depot/perl/win32/Makefile#352 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile#351~32714~ 2007-12-22 18:15:30.000000000 -0800
+++ perl/win32/Makefile 2008-02-22 10:10:36.000000000 -0800
@@ -881,18 +881,22 @@
..\config.sh : config.w32 $(MINIPERL) config_sh.PL
$(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) config.w32 > ..\config.sh
-# this target is for when changes to the main config.sh happen
-# edit config.{b,v,g}c and make this target once for each supported
-# compiler (e.g. `nmake CCTYPE=BORLAND regen_config_h`)
+# this target is for when changes to the main config.sh happen.
+# edit config.vc, then make perl in a minimal configuration (i.e. with MULTI,
+# ITHREADS, IMP_SYS, LARGE_FILES, PERLIO and CRYPT off), then make this target
+# to regenerate config_H.vc.
+# repeat for config.vc64 and config_H.vc64 if you have a suitable build
+# environment, otherwise hand-edit them to maintain the same differences with
+# config.vc and config_H.vc as before.
+# unfortunately, some further manual editing is also then required to restore
all
+# the special __GNUC__ handling that is otherwise lost.
regen_config_h:
- perl config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh
+ $(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) >
..\config.sh
cd ..
- -del /f perl.exe perl*.dll
- perl configpm
+ miniperl configpm
cd win32
-del /f $(CFGH_TMPL)
- -mkdir $(COREDIR)
- -perl config_h.PL "INST_VER=$(INST_VER)"
+ -$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)"
rename config.h $(CFGH_TMPL)
$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
==== //depot/perl/win32/makefile.mk#392 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#391~33292~ 2008-02-12 06:58:50.000000000 -0800
+++ perl/win32/makefile.mk 2008-02-22 10:10:36.000000000 -0800
@@ -1130,18 +1130,20 @@
$(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file \
$(mktmp $(CFG_VARS)) config.w32 > ..\config.sh
-# this target is for when changes to the main config.sh happen
-# edit config.{b,v,g}c and make this target once for each supported
-# compiler (e.g. `dmake CCTYPE=BORLAND regen_config_h`)
+# this target is for when changes to the main config.sh happen.
+# edit config.gc, then make perl using GCC in a minimal configuration (i.e.
+# with MULTI, ITHREADS, IMP_SYS, LARGE_FILES, PERLIO and CRYPT off), then make
+# this target to regenerate config_H.gc.
+# unfortunately, some further manual editing is also then required to restore
all
+# the special _MSC_VER handling that is otherwise lost.
+# repeat for config.bc and config_H.bc (using BORLAND), except that there is no
+# _MSC_VER stuff in that case.
regen_config_h:
- perl config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \
+ $(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file $(mktmp
$(CFG_VARS)) \
$(CFGSH_TMPL) > ..\config.sh
- -cd .. && del /f perl.exe
- -cd .. && del /f perl*.dll
- cd .. && perl configpm
+ cd .. && miniperl configpm
-del /f $(CFGH_TMPL)
- -mkdir $(COREDIR)
- -perl config_h.PL "INST_VER=$(INST_VER)"
+ -$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)"
rename config.h $(CFGH_TMPL)
$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
End of Patch.
