From 5c0877fa4ac0c984dacb09510945d56f7fc60add Mon Sep 17 00:00:00 2001 From: "Craig A. Berry" Date: Sun, 10 Jun 2012 14:04:36 -0500 Subject: [PATCH] Install all include files on VMS. On most platforms, installperl copies *.h from the top-level source directory to an appropriate installed location. On VMS, we stage everything to an archcore directory first and installperl copies them from there. Whether this is a good way to be doing things in this day and age is questionable, but the more immediate problem is that we have been (badly) maintaining our own list of what should get staged in the archcore directory. By my count, 5.16.0 shipped with 18 of 69 include files missing.[1] Ouch. So this commit abolishes the separately-maintained, explicitly-named list of include files and just copies all of them to the staging directory, where installperl will pick them up. [1] For folks counting at home, we have vmsish.h, which no one else has, so that's why there are 69, not 68. --- vms/descrip_mms.template | 182 ++--------------------------------------------- 1 file changed, 5 insertions(+), 177 deletions(-) diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index 827a667..3590102 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -259,27 +259,8 @@ h6 = sv.h thread.h utf8.h util.h vmsish.h warnings.h h7 = xsub.h $(THREADH) h = $(h0) $(h1) $(h2) $(h3) $(h4) $(h5) $(h6) $(h7) -ac0 = $(ARCHCORE)av.h -ac1 = $(ARCHCORE)config.h $(ARCHCORE)cop.h $(ARCHCORE)cv.h $(ARCHCORE)embed.h -ac2 = $(ARCHCORE)embedvar.h $(ARCHCORE)EXTERN.h $(ARCHCORE)fakethr.h -ac3 = $(ARCHCORE)form.h $(ARCHCORE)git_version.h $(ARCHCORE)gv.h $(ARCHCORE)handy.h $(ARCHCORE)hv.h -ac4 = $(ARCHCORE)l1_char_class_tab.h $(ARCHCORE)INTERN.h $(ARCHCORE)intrpvar.h $(ARCHCORE)iperlsys.h -ac5 = $(ARCHCORE)keywords.h $(ARCHCORE)mydtrace.h $(ARCHCORE)mg.h $(ARCHCORE)mg_vtable.h $(ARCHCORE)nostdio.h -ac6 = $(ARCHCORE)op_reg_common.h $(ARCHCORE)op.h $(ARCHCORE)opcode.h $(ARCHCORE)opnames.h -ac7 = $(ARCHCORE)overload.h $(ARCHCORE)pad.h $(ARCHCORE)parser.h $(ARCHCORE)patchlevel.h -ac8 = $(ARCHCORE)perl.h $(ARCHCORE)perlapi.h $(ARCHCORE)perlio.h $(ARCHCORE)perlsdio.h -ac9 = $(ARCHCORE)perlsfio.h $(ARCHCORE)perlvars.h $(ARCHCORE)perly.h $(ARCHCORE)pp.h -.ifdef THREADED -ac10 = $(ARCHCORE)pp_proto.h $(ARCHCORE)proto.h $(ARCHCORE)reentr.h $(ARCHCORE)regcomp.h -.else -ac10 = $(ARCHCORE)pp_proto.h $(ARCHCORE)proto.h $(ARCHCORE)regcomp.h -.endif -ac11 = $(ARCHCORE)regexp.h $(ARCHCORE)regnodes.h $(ARCHCORE)scope.h -ac12 = $(ARCHCORE)sv.h -ac13 = $(ARCHCORE)thread.h $(ARCHCORE)utf8.h $(ARCHCORE)util.h -ac14 = $(ARCHCORE)vmsish.h $(ARCHCORE)warnings.h $(ARCHCORE)xsub.h acopt = $(ARCHCORE)perlshr_attr.opt $(ARCHCORE)$(DBG)perlshr_bld.opt -ac = $(ac0) $(ac1) $(ac2) $(ac3) $(ac4) $(ac5) $(ac6) $(ac7) $(ac8) $(ac9) $(ac10) $(ac11) $(ac12) $(ac13) $(ac14) $(acopt) +ac = archcore_includes.ts $(acopt) generated_headers = uudmap.h bitcount.h mg_data.h @@ -679,164 +660,11 @@ archify : all @ Write Sys$Output " 2. Delete Miniperl$(E)" # CORE subset for MakeMaker, so we can build Perl without sources -$(ARCHCORE)av.h : av.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)config.h : config.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)cop.h : cop.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)cv.h : cv.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)embed.h : embed.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)embedvar.h : embedvar.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)EXTERN.h : EXTERN.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)fakethr.h : fakethr.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)form.h : form.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)git_version.h : git_version.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)gv.h : gv.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)handy.h : handy.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)hv.h : hv.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)l1_char_class_tab.h : l1_char_class_tab.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)INTERN.h : INTERN.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)intrpvar.h : intrpvar.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)iperlsys.h : iperlsys.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)keywords.h : keywords.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)mydtrace.h : mydtrace.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)mg.h : mg.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)mg_vtable.h : mg_vtable.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)nostdio.h : nostdio.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)op_reg_common.h : op_reg_common.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)op.h : op.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)opcode.h : opcode.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)opnames.h : opnames.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)overload.h : overload.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)pad.h : pad.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)parser.h : parser.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)patchlevel.h : patchlevel.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)perl.h : perl.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)perlapi.h : perlapi.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)perlio.h : perlio.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)perlsdio.h : perlsdio.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)perlsfio.h : perlsfio.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)perlvars.h : perlvars.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)perly.h : perly.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)pp.h : pp.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)pp_proto.h : pp_proto.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)proto.h : proto.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -.ifdef THREADED -$(ARCHCORE)reentr.h : reentr.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -.endif -$(ARCHCORE)regcomp.h : regcomp.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)regexp.h : regexp.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)regnodes.h : regnodes.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)scope.h : scope.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)sv.h : sv.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)thread.h : thread.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)utf8.h : utf8.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)util.h : util.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)vmsish.h : vmsish.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)warnings.h : warnings.h - @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -$(ARCHCORE)xsub.h : xsub.h + +archcore_includes.ts : @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) - Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) + Copy/NoConfirm/Log *.h $(ARCHCORE) + @ Copy _NLA0: $(MMS$TARGET) $(ARCHCORE)$(DBG)libperl$(OLB) : $(DBG)libperl$(OLB) $(DBG)perlshr_xtras.ts @ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE) Copy/NoConfirm/Log $(MMS$SOURCE) $(ARCHCORE) -- 1.8.3.1