From 483d4e680bd2a6db14835b1b4d65be33488d532b Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 24 May 2001 18:26:20 +0000 Subject: stock perl 5.6.1 --- gnu/usr.bin/perl/vms/descrip_mms.template | 84 ++++++++++++++++++++++++++----- gnu/usr.bin/perl/vms/munchconfig.c | 3 +- gnu/usr.bin/perl/vms/vmspipe.com | 20 ++++++++ 3 files changed, 92 insertions(+), 15 deletions(-) create mode 100644 gnu/usr.bin/perl/vms/vmspipe.com (limited to 'gnu/usr.bin/perl/vms') diff --git a/gnu/usr.bin/perl/vms/descrip_mms.template b/gnu/usr.bin/perl/vms/descrip_mms.template index 77772c95eff..12c776add9f 100644 --- a/gnu/usr.bin/perl/vms/descrip_mms.template +++ b/gnu/usr.bin/perl/vms/descrip_mms.template @@ -22,6 +22,7 @@ #### Start of system configuration section. #### ~DECC~ +~DECCXX~ ~GNUC~ ~ARCH-TYPE~ = 1 ~THREAD~ @@ -131,7 +132,11 @@ DBGSPECFLAGS = /Show=All @ If F$TrnLnm("Sys").eqs."" .and. F$TrnLnm("DECC$System_Include").eqs."" Then Define/NoLog SYS DECC$Library_Include .endif +.ifdef DECCXX +XTRACCFLAGS = /Include=[]/Standard=ANSI/Prefix=All/Obj=$(OBJVAL) +.else XTRACCFLAGS = /Include=[]/Standard=Relaxed_ANSI/Prefix=All/Obj=$(OBJVAL) +.endif XTRADEF = POSIX = POSIX .endif @@ -218,6 +223,7 @@ NOOP = continue # are built using these macros should depend on $(MINIPERL_EXE) MINIPERL_EXE = Sys$Disk:[]miniperl$(E) MINIPERL = MCR $(MINIPERL_EXE) "-I[.lib]" +MINIPERLQ = MCR $(MINIPERL_EXE) ""-I[.lib]"" XSUBPP = $(MINIPERL) "-I[.ext.re]" [.lib.extutils]xsubpp -noprototypes # Macro to invoke a preexisting copy of Perl. This is used to regenerate # some header files when rebuilding Perl, but premade versions are provided @@ -266,13 +272,13 @@ FULLLIBS2 = $(LIBS2)|$(THRLIBS1)|$(THRLIBS2) #### End of system configuration section. #### c0 = $(MALLOC_C) $(SOCKC) av.c deb.c doio.c doop.c dump.c globals.c gv.c -c1 = hv.c mg.c miniperlmain.c op.c perl.c perlio.c perly.c pp.c pp_ctl.c +c1 = hv.c mg.c miniperlmain.c op.c perl.c perlapi.c perlio.c perly.c pp.c pp_ctl.c c2 = pp_hot.c pp_sys.c regcomp.c regexec.c run.c scope.c sv.c taint.c c3 = toke.c universal.c utf8.c util.c vms.c xsutils.c c = $(c0) $(c1) $(c2) $(c3) obj0 = $(MALLOC_O) $(SOCKO) av$(O) deb$(O) doio$(O) doop$(O) dump$(O) -obj1 = globals$(O) gv$(O) hv$(O) mg$(O) miniperlmain$(O) op$(O) perl$(O) +obj1 = globals$(O) gv$(O) hv$(O) mg$(O) miniperlmain$(O) op$(O) perl$(O) perlapi$(O) obj2 = perlio$(O) perly$(O) pp$(O) pp_ctl$(O) pp_hot$(O) pp_sys$(O) regcomp$(O) obj3 = regexec$(O) run$(O) scope$(O) sv$(O) taint$(O) toke$(O) universal$(O) obj4 = utf8$(O) util$(O) vms$(O) xsutils$(O) @@ -299,7 +305,11 @@ ac8 = $(ARCHCORE)perlapi.h $(ARCHCORE)perlio.h $(ARCHCORE)perlsdio.h ac9 = $(ARCHCORE)perlvars.h $(ARCHCORE)perly.h $(ARCHCORE)pp.h ac10 = $(ARCHCORE)pp_proto.h $(ARCHCORE)proto.h $(ARCHCORE)regcomp.h ac11 = $(ARCHCORE)regexp.h $(ARCHCORE)regnodes.h $(ARCHCORE)scope.h +.ifdef SOCKARCH ac12 = $(ARCHCORE)sv.h $(ARCHCORE)thrdvar.h $(SOCKARCH) +.else +ac12 = $(ARCHCORE)sv.h $(ARCHCORE)thrdvar.h +.endif 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 @@ -327,21 +337,23 @@ CRTLOPTS =,$(CRTL)/Options .endif # Modules which must be installed before we can build extensions -LIBPREREQ = $(ARCHDIR)Config.pm [.lib]DynaLoader.pm [.lib]XSLoader.pm [.lib]vmsish.pm [.lib.VMS]Filespec.pm [.lib.ExtUtils]XSSymSet.pm +LIBPREREQ = $(ARCHDIR)Config.pm [.lib.VMS]Filespec.pm [.lib]DynaLoader.pm [.lib]XSLoader.pm [.lib]vmsish.pm [.lib.ExtUtils]XSSymSet.pm $(ARCHDIR)vmspipe.com [.lib]re.pm utils1 = [.lib.pod]perldoc.com [.lib.ExtUtils]Miniperl.pm [.utils]c2ph.com [.utils]h2ph.com [.utils]h2xs.com [.lib]perlbug.com [.lib]perlcc.com [.utils]dprofpp.com utils2 = [.lib]splain.com [.utils]pl2pm.com .ifdef NOX2P all : base extras archcorefiles preplibrary perlpods - @ $(NOOP) + @ write sys$output " " + @ write sys$output " Everything is up to date. '$(MMS)$(MMSQUALIFIERS) test' to run test suite." .else all : base extras x2p archcorefiles preplibrary perlpods - @ $(NOOP) + @ write sys$output " " + @ write sys$output " Everything is up to date. '$(MMS)$(MMSQUALIFIERS) test' to run test suite." .endif base : miniperl perl @ $(NOOP) -extras : dynext libmods utils podxform +extras : dynext libmods utils podxform extra.pods @ $(NOOP) libmods : $(LIBPREREQ) @ $(NOOP) @@ -351,6 +363,8 @@ podxform : [.lib.pod]pod2text.com [.lib.pod]pod2html.com [.lib.pod]pod2latex.com @ $(NOOP) x2p : [.x2p]a2p$(E) [.x2p]s2p.com [.x2p]find2perl.com @ $(NOOP) +extra.pods : miniperl + @ @extra_pods.com pod0 = [.lib.pod]perl.pod [.lib.pod]perl5004delta.pod [.lib.pod]perl5005delta.pod pod1 = [.lib.pod]perlapi.pod [.lib.pod]perlapio.pod [.lib.pod]perlbook.pod @@ -382,7 +396,13 @@ perlpods : $(pod) archcorefiles : $(ac) $(acth) $(ARCHAUTO)time.stamp @ $(NOOP) -miniperl : $(DBG)miniperl$(E) +[.lib]re.pm : [.ext.re]re.pm + copy/log $(MMS$SOURCE) $(MMS$TARGET) + +vmspipe.com : [.vms]vmspipe.com + copy/log $(MMS$SOURCE) $(MMS$TARGET) + +miniperl : $(DBG)miniperl$(E) vmspipe.com @ Continue $(MINIPERL_EXE) : miniperlmain$(O), $(DBG)libperl$(OLB) $(CRTL) Link $(LINKFLAGS)/NoDebug/Trace/NoMap/NoFull/NoCross/Exe=$(MMS$TARGET) miniperlmain$(O), $(DBG)libperl$(OLB)/Library/Include=globals $(CRTLOPTS) @@ -449,6 +469,9 @@ $(ARCHDIR)config.pm : [.lib]config.pm [.lib]config.pm : config.h $(MINIPERL_EXE) $(MINIPERL) ConfigPM. +$(ARCHDIR)vmspipe.com : vmspipe.com + Copy $(MMS$SOURCE) $(MMS$TARGET) + [.ext.dynaloader]dl_vms.c : [.ext.dynaloader]dl_vms.xs $(ARCHDIR)Config.pm [.lib.ExtUtils]XSSymSet.pm $(MINIPERL_EXE) $(XSUBPP) $(MMS$SOURCE) >$(MMS$TARGET) @@ -474,7 +497,7 @@ $(ARCHDIR)config.pm : [.lib]config.pm @ Rename/Log xsloader.pm [.ext.dynaloader] dynext : $(LIBPREREQ) $(DBG)perlshr$(E) - @build_ext "$(dynamic_ext)" "$(MINIPERL_EXE)" "$(MMS)" + @make_ext "$(dynamic_ext)" "$(MINIPERL_EXE)" "$(MMS)" [.lib]vmsish.pm : [.vms.ext]vmsish.pm Copy/Log/NoConfirm $(MMS$SOURCE) $(MMS$TARGET) @@ -792,7 +815,7 @@ preplibrary : $(MINIPERL_EXE) $(LIBPREREQ) $(SOCKPM) [.lib.pod]perlxstut.pod : [.pod]perlxstut.pod @ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod] Copy/Log $(MMS$SOURCE) $(MMS$TARGET) -[.lib.pod]win32.pod : [.pod]win32.pod +[.lib.pod]win32.pod : [.lib]win32.pod @ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod] Copy/Log $(MMS$SOURCE) $(MMS$TARGET) [.lib.pod]perlvms.pod : [.vms]perlvms.pod @@ -876,8 +899,12 @@ perly$(O) : perly.c, perly.h, $(h) [.t.lib]vmsish.t : [.vms.ext]vmsish.t Copy/Log/NoConfirm $(MMS$SOURCE) $(MMS$TARGET) +check : test + @ Continue + test : all [.t.lib]vmsfspec.t [.t.lib]vmsish.t - @[.VMS]Test.Com "$(E)" "$(__DEBUG__)" + @ $(MINIPERL) -e "print ""Ran tests"";" > [.t]rantests. # install ought not need a source, but it doesn't work if one's not # there. Go figure... @@ -1083,6 +1110,8 @@ gv$(O) : gv.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsy $(CC) $(CORECFLAGS) $(MMS$SOURCE) hv$(O) : hv.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h $(CC) $(CORECFLAGS) $(MMS$SOURCE) +malloc$(O) : malloc.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h + $(CC) $(CORECFLAGS) $(MMS$SOURCE) mg$(O) : mg.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h $(CC) $(CORECFLAGS) $(MMS$SOURCE) miniperlmain$(O) : miniperlmain.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h @@ -1091,6 +1120,8 @@ op$(O) : op.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsy $(CC) $(CORECFLAGS) $(MMS$SOURCE) perl$(O) : perl.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h patchlevel.h intrpvar.h thrdvar.h $(CC) $(CORECFLAGS) $(MMS$SOURCE) +perlapi$(O) : perlapi.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h patchlevel.h intrpvar.h thrdvar.h + $(CC) $(CORECFLAGS) $(MMS$SOURCE) perlio$(O) : perlio.c config.h extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h $(CC) $(CORECFLAGS) $(MMS$SOURCE) perlmain$(O) : perlmain.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h @@ -1155,11 +1186,35 @@ $(CRTL) : $(MAKEFILE) @ @[.vms]genopt "$(CRTL)/Write" "|" "$(LIBS1)|$(FULLLIBS2)|$(SOCKLIB)" +ok : $(utils) + $(MINIPERL) lib/perlbug.com -ok -s "(UNINSTALLED)" + +okfile : $(utils) + $(MINIPERL) lib/perlbug.com -ok -s "(UNINSTALLED)" "-F" perl.ok + +nok : $(utils) + @ write sys$output " " + @ write sys$output " Please type the command:" + @ write sys$output " " + @ write sys$output "$(MINIPERLQ) lib/perlbug.com -nok -s ""(UNINSTALLED)""" + +nokfile : $(utils) + @ write sys$output " " + @ write sys$output " Please type the command:" + @ write sys$output " " + @ write sys$output "$(MINIPERLQ) lib/perlbug.com -nok -s ""(UNINSTALLED)"" ""-F"" perl.nok" + + cleanlis : - If F$Search("*.Lis").nes."" Then Delete/NoConfirm/Log *.Lis;* - If F$Search("*.CPP").nes."" Then Delete/NoConfirm/Log *.CPP;* - If F$Search("*.Map").nes."" Then Delete/NoConfirm/Log *.Map;* +cleantest : + - If F$Search("[.t]Perl.").nes."" Then Delete/NoConfirm/Log [.t]Perl.;* + - If F$Search("[.t]VMSPIPE.COM").nes."" Then Delete/NoConfirm/Log [.t]VMSPIPE.COM;* + - If F$Search("[.t]Echo.exe").nes."" Then Delete/NoConfirm/Log [.t]Echo.exe;* + tidy : cleanlis - If F$Search("[...]*.Opt;-1").nes."" Then Purge/NoConfirm/Log [...]*.Opt - If F$Search("[...]*$(O);-1").nes."" Then Purge/NoConfirm/Log [...]*$(O) @@ -1196,8 +1251,8 @@ tidy : cleanlis - If F$Search("[.x2p]*.com;-1").nes."" Then Purge/NoConfirm/Log [.x2p]*.com - If F$Search("[.lib.pod]*.com;-1").nes."" Then Purge/NoConfirm/Log [.lib.pod]*.com -clean : tidy - - @build_ext "$(dynamic_ext)" "$(MINIPERL_EXE)" "$(MMS)" clean +clean : tidy cleantest + - @make_ext "$(dynamic_ext)" "$(MINIPERL_EXE)" "$(MMS)" clean - If F$Search("*.Opt").nes."" Then Delete/NoConfirm/Log *.Opt;*/Exclude=PerlShr_*.Opt - If F$Search("[...]*$(O);*") .nes."" Then Delete/NoConfirm/Log [...]*$(O);* - If F$Search(F$Parse("Sys$Disk:[]","$(SOCKH)")).nes."" Then Delete/NoConfirm/Log $(SOCKH);* @@ -1220,16 +1275,18 @@ clean : tidy - If F$Search("[.VMS.Ext...]*.C").nes."" Then Delete/NoConfirm/Log [.VMS.Ext...]*.C;* - If F$Search("[.VMS.Ext...]*$(O)").nes."" Then Delete/NoConfirm/Log [.VMS.Ext...]*$(O);* - If F$Search("[.pod]*.com").nes."" Then Delete/NoConfirm/Log [.pod]*.com;* + - @extra_pods CLEAN realclean : clean - - @build_ext "$(dynamic_ext)" "$(MINIPERL_EXE)" "$(MMS)" realclean + - @make_ext "$(dynamic_ext)" "$(MINIPERL_EXE)" "$(MMS)" realclean - If F$Search("*$(OLB)").nes."" Then Delete/NoConfirm/Log *$(OLB);* - If F$Search("*.Opt").nes."" Then Delete/NoConfirm/Log *.Opt;* - If F$Search("Config.H").nes."" Then Delete/NoConfirm/Log Config.H;* - If F$Search("Config.SH").nes."" Then Delete/NoConfirm/Log Config.SH;* - $(MINIPERL) -e "use File::Path; rmtree(\@ARGV,1,0);" config - If F$Search("Descrip.MMS").nes."" Then Delete/NoConfirm/Log Descrip.MMS;* - - If F$Search("Build_Ext.Com").nes."" Then Delete/NoConfirm/Log Build_Ext.Com;* + - If F$Search("make_ext.Com").nes."" Then Delete/NoConfirm/Log make_ext.Com;* + - If F$Search("extra_pods.Com").nes."" Then Delete/NoConfirm/Log extra_pods.Com;* - $(MINIPERL) -e "use File::Path; rmtree(['lib/auto','lib/VMS','lib/$(ARCH)'],1,0);" - If F$Search("*.TS").nes."" Then Delete/NoConfirm/Log *.TS;* - If F$Search("[.Lib]DynaLoader.pm").nes."" Then Delete/NoConfirm/Log [.Lib]DynaLoader.pm;* @@ -1249,6 +1306,7 @@ realclean : clean - If F$Search("[.t.lib]vms*.t").nes."" Then Delete/NoConfirm/Log [.t.lib]vms*.t;* - If F$Search("[...]*$(E)").nes."" Then Delete/NoConfirm/Log [...]*$(E);* - If F$Search("[.vms]Perl_Setup.Com").nes."" Then Delete/NoConfirm/Log [.vms]Perl_Setup.Com;* + - If F$Search("[.t]rantests.").nes."" Then Delete/NoConfirm/Log [.t]rantests.;* cleansrc : clean !GROK!THIS! diff --git a/gnu/usr.bin/perl/vms/munchconfig.c b/gnu/usr.bin/perl/vms/munchconfig.c index 158de3caf5d..82768db12ce 100644 --- a/gnu/usr.bin/perl/vms/munchconfig.c +++ b/gnu/usr.bin/perl/vms/munchconfig.c @@ -345,8 +345,7 @@ tilde_sub(char LineBuffer[], Translate TildeSub[], int TildeSubCount) } else { /* 'Kay, not a tilde. Is it a word character? */ - if (isalnum(LineBuffer[TildeLoop]) || (LineBuffer[TildeLoop] = - '-') || + if (isalnum(LineBuffer[TildeLoop]) || (LineBuffer[TildeLoop] == '-')) { TempTilde[TildeBufferLength++] = LineBuffer[TildeLoop]; } else { diff --git a/gnu/usr.bin/perl/vms/vmspipe.com b/gnu/usr.bin/perl/vms/vmspipe.com new file mode 100644 index 00000000000..28caa745e73 --- /dev/null +++ b/gnu/usr.bin/perl/vms/vmspipe.com @@ -0,0 +1,20 @@ +$! 'f$verify(0) +$! --- protect against nonstandard definitions --- +$ perl_define = "define/nolog" +$ perl_on = "on error then exit $STATUS" +$ perl_exit = "exit" +$ perl_del = "delete" +$ pif = "if" +$! --- define i/o redirection (sys$output set by lib$spawn) +$ pif perl_popen_in .nes. "" then perl_define/user/name_attributes=confine sys$input 'perl_popen_in' +$ pif perl_popen_err .nes. "" then perl_define/user/name_attributes=confine sys$error 'perl_popen_err' +$ pif perl_popen_out .nes. "" then perl_define sys$output 'perl_popen_out' +$ cmd = perl_popen_cmd +$! --- get rid of global symbols +$ perl_del/symbol/global perl_popen_in +$ perl_del/symbol/global perl_popen_err +$ perl_del/symbol/global perl_popen_out +$ perl_del/symbol/global perl_popen_cmd +$ perl_on +$ 'cmd +$ perl_exit '$STATUS' -- cgit v1.2.3