Skip to content

Commit fcc434a

Browse files
Peter Prymmerjhi
authored andcommitted
small updates to DCL portions of perl kit
Message-ID: <[email protected]> p4raw-id: //depot/perl@16846
1 parent b881518 commit fcc434a

File tree

2 files changed

+30
-16
lines changed

2 files changed

+30
-16
lines changed

configure.com

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ $ IF ( F$SEARCH("UU.DIR").EQS."" )
460460
$ THEN
461461
$ CREATE/DIRECTORY [.UU]
462462
$ ELSE
463-
$ IF ( F$SEARCH("[.UU]*.*").NES."" ) THEN DELETE/NOLOG [.UU]*.*;*
463+
$ IF ( F$SEARCH("[.UU]*.*").NES."" ) THEN DELETE/NOLOG/NOCONFIRM [.UU]*.*;*
464464
$ ENDIF
465465
$!: Configure runs within the UU subdirectory
466466
$ SET DEFAULT [.UU]
@@ -586,7 +586,7 @@ $ GOTO Clean_up
586586
$ ENDIF
587587
$ ELSE
588588
$ echo4 "Looks good..."
589-
$ DELETE/NOLOG MISSING.;
589+
$ DELETE/NOLOG/NOCONFIRM MISSING.;
590590
$ ENDIF ! (miss_list .NES. "")
591591
$ ENDIF ! (manifestfound .EQS. "") ELSE
592592
$!
@@ -2154,8 +2154,7 @@ $ echo4 "Hmm... Looks like you have SOCKETSHR Berkeley networking support."
21542154
$ ELSE
21552155
$ Has_socketshr = "F"
21562156
$ ENDIF
2157-
$ IF (ccname .EQS. "DEC" .AND. Dec_C_Version .GE. 50200000) .OR. -
2158-
(ccname .EQS. "CXX")
2157+
$ IF (ccname .EQS. "DEC" .AND. Dec_C_Version .GE. 50200000) .OR. (ccname .EQS. "CXX")
21592158
$ THEN
21602159
$ Has_Dec_C_Sockets = "T"
21612160
$ echo ""
@@ -2172,9 +2171,9 @@ $ echo "build into Perl?"
21722171
$ IF Has_Dec_C_Sockets
21732172
$ THEN
21742173
$ dflt = "DECC"
2175-
$ else
2174+
$ ELSE
21762175
$ dflt = "SOCKETSHR"
2177-
$ endif
2176+
$ ENDIF
21782177
$ rp = "Choose socket stack (NONE"
21792178
$ IF Has_socketshr THEN rp = rp + ",SOCKETSHR"
21802179
$ IF Has_Dec_C_Sockets THEN rp = rp + ",DECC"
@@ -2183,8 +2182,8 @@ $ GOSUB myread
21832182
$ Has_Dec_C_Sockets = "F"
21842183
$ Has_socketshr = "F"
21852184
$ ans = F$EDIT(ans,"TRIM,COMPRESS,LOWERCASE")
2186-
$ IF ans.eqs."decc" then Has_Dec_C_Sockets = "T"
2187-
$ IF ans.eqs."socketshr" then Has_socketshr = "T"
2185+
$ IF ans.eqs."decc" THEN Has_Dec_C_Sockets = "T"
2186+
$ IF ans.eqs."socketshr" THEN Has_socketshr = "T"
21882187
$ ENDIF
21892188
$!
21902189
$!
@@ -2669,7 +2668,7 @@ $ build = ans
26692668
$ ENDIF
26702669
$ ENDIF
26712670
$!
2672-
$ DELETE/NOLOG Makefile.;
2671+
$ DELETE/NOLOG/NOCONFIRM Makefile.;
26732672
$ GOTO Beyond_open
26742673
$Open_error:
26752674
$ TYPE SYS$INPUT:
@@ -5460,6 +5459,9 @@ $ WC "d_wctomb='" + d_wctomb + "'"
54605459
$ WC "d_writev='undef'"
54615460
$ WC "db_hashtype=' '"
54625461
$ WC "db_prefixtype=' '"
5462+
$ WC "db_version_major='" + "'"
5463+
$ WC "db_version_minor='" + "'"
5464+
$ WC "db_version_patch='" + "'"
54635465
$ WC "dbgprefix='" + dbgprefix + "'"
54645466
$ WC "defvoidused='15'"
54655467
$ WC "devtype='" + devtype + "'"
@@ -5511,6 +5513,7 @@ $ WC "i8size='" + i8size + "'"
55115513
$ WC "i8type='" + i8type + "'"
55125514
$ WC "i_arpainet='undef'"
55135515
$ WC "i_crypt='undef'"
5516+
$ WC "i_db='undef'"
55145517
$ WC "i_dbm='undef'"
55155518
$ WC "i_dirent='" + i_dirent + "'"
55165519
$ WC "i_dlfcn='undef'"
@@ -5908,7 +5911,7 @@ $ WC "srand48_r_proto='0'"
59085911
$ WC "srandom_r_proto='0'"
59095912
$ WC "strerror_r_proto='0'"
59105913
$ WC "tmpnam_r_proto='0'"
5911-
$ WC "ttyname_r_proto='0'
5914+
$ WC "ttyname_r_proto='0'"
59125915
$!
59135916
$! ##END WRITE NEW CONSTANTS HERE##
59145917
$!
@@ -6025,9 +6028,9 @@ $ mcr []munchconfig 'config_sh' [-]config_h.sh
60256028
$ ! Concatenate them together
60266029
$ copy [-]config.local,[-]config.main [-]config.h
60276030
$! Clean up
6028-
$ DELETE/NOLOG [-]CONFIG.MAIN;*
6029-
$ DELETE/NOLOG [-]CONFIG.LOCAL;*
6030-
$ DELETE/NOLOG [-]CONFIG.FDL;*
6031+
$ DELETE/NOLOG/NOCONFIRM [-]CONFIG.MAIN;*
6032+
$ DELETE/NOLOG/NOCONFIRM [-]CONFIG.LOCAL;*
6033+
$ DELETE/NOLOG/NOCONFIRM [-]CONFIG.FDL;*
60316034
$!
60326035
$ IF ccname .EQS. "DEC"
60336036
$ THEN
@@ -6283,7 +6286,18 @@ $ ENDIF ! (.NOT.perl_symbol)
62836286
$ echo ""
62846287
$ echo4 "The perl_setup.com file is now being written..."
62856288
$ file_2_find = "[-]perl_setup.com"
6286-
$ OPEN/WRITE CONFIG 'file_2_find'
6289+
$!
6290+
$! Folks are likely to want to edit perl_setup.com.
6291+
$! STMLF RFM plays nicer with ported editors than does VFC.
6292+
$!
6293+
$ CREATE [-]CONFIG.FDL
6294+
$ DECK
6295+
RECORD
6296+
FORMAT STREAM_LF
6297+
$ EOD
6298+
$ CREATE /FDL=[-]CONFIG.FDL 'file_2_find'
6299+
$ OPEN/APPEND CONFIG 'file_2_find'
6300+
$ DELETE/NOLOG/NOCONFIRM [-]CONFIG.FDL;
62876301
$ WRITE CONFIG "$!"
62886302
$ WRITE CONFIG "$! Perl_Setup.com ''cf_time'"
62896303
$ IF cf_email.NES.perladmin

vms/genopt.com

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $! generates options file for vms link
22
$! p1 is filename and mode to open file (filename/write or filename/append)
33
$! p2 is delimiter separating elements of list in p3
44
$! p3 is list of items to be written, one per line, into options file
5-
$
5+
$!
66
$ open file 'p1'
77
$ element=0
88
$loop:
@@ -30,7 +30,7 @@ $ endif
3030
$ if y .nes. "" then write file y
3131
$ element=element+1
3232
$ goto loop
33-
$
33+
$!
3434
$out:
3535
$ close file
3636
$ exit

0 commit comments

Comments
 (0)