diff options
| -rw-r--r-- | vms/ChangeLog | 15 | ||||
| -rw-r--r-- | vms/build_gawk_pcsi_desc.com | 16 | ||||
| -rw-r--r-- | vms/compare_gawk_source.com | 2 | ||||
| -rw-r--r-- | vms/gawk_alias_setup.com | 6 | ||||
| -rw-r--r-- | vms/gawk_release_note_start.txt | 11 | ||||
| -rw-r--r-- | vms/pcsi_gawk_file_list.txt | 4 | ||||
| -rw-r--r-- | vms/remove_old_gawk.com | 9 |
7 files changed, 49 insertions, 14 deletions
diff --git a/vms/ChangeLog b/vms/ChangeLog index 06382ce2..7f9dc798 100644 --- a/vms/ChangeLog +++ b/vms/ChangeLog @@ -1,7 +1,20 @@ +2016-01-10 John E. Malmberg <wb8tyw@qsl.net> + + * build_gawk_pcsi_desc.com: Better detection for VMS Software + Inc.'s OpenVMS releases. + * compare_gawk_source.com: Skip files that VMS can not diff + with native tools. + * gawk_alias_setup: Install aliases in correct simulated + Linux directory. + * pcsi_gawk_file_list.txt: Install binaries and aliass in + correct simulated Linux directory. + * remove_old_gawk.com: Look for old gawk images that may + have been installed in the wrong directory. + 2015-07-02 John E. Malmberg <wb8tyw@qsl.net> * build_gawk_pcsi_desc.com: Update to support new VMS - producer of VSI. + producer of VSI. 2015-05-19 Arnold D. Robbins <arnold@skeeve.com> diff --git a/vms/build_gawk_pcsi_desc.com b/vms/build_gawk_pcsi_desc.com index 33cf3137..298d0ea0 100644 --- a/vms/build_gawk_pcsi_desc.com +++ b/vms/build_gawk_pcsi_desc.com @@ -98,7 +98,6 @@ $ vmsprd = "DEC" $ if base .eqs. "I64VMS" then vmsprd = "HP" $ vsiprd = "VSI" $! -$ write pdsc " software ''vmsprd' ''base' VMS ;" $ arch_type = f$getsyi("ARCH_NAME") $ node_swvers = f$getsyi("node_swvers") $ vernum = f$extract(1, f$length(node_swvers), node_swvers) @@ -111,9 +110,18 @@ $ vmstag = majver + minver + dashver $ code = f$extract(0, 1, arch_type) $ arch_code = f$extract(0, 1, arch_type) $ line_out = - - " if ((not <software ''vsiprd' ''base' VMS version minimum" + - - " ''node_swvers'>) and" + - - " (not <software ''vmsprd' ''base' VMS version minimum ''node_swvers'>));" + " if ((<software ''vmsprd' ''base' VMS> and" +$ write pdsc line_out +$ line_out = - + " (not <software ''vmsprd' ''base' VMS version minimum" + - + " ''node_swvers'>)) or" +$ write pdsc line_out +$ line_out = - + " (<software ''vsiprd' ''base' VMS>" +$ write pdsc line_out +$ line_out = - + " and (not <software ''vsiprd' ''base' VMS version minimum" + - + " ''node_swvers'>))) ;" $ write pdsc line_out $ write pdsc " error NEED_VMS''vmstag';" $ write pdsc " end if;" diff --git a/vms/compare_gawk_source.com b/vms/compare_gawk_source.com index 260ec4eb..065b640a 100644 --- a/vms/compare_gawk_source.com +++ b/vms/compare_gawk_source.com @@ -269,6 +269,8 @@ $ if ref_fname .eqs. "nasty2.ok" then ref_skip = 1 $ if ref_fname .eqs. "profile5.awk" then ref_skip = 1 $ if ref_fname .eqs. "profile5.ok" then ref_skip = 1 $ if ref_fname .eqs. "po.m4" then ref_skip = 1 +$ if ref_fname .eqs. "configure." then ref_skip = 1 +$ if ref_fname .eqs. "libtool.m4" then ref_skip = 1 $! $! $ if ref_skip .ne. 0 diff --git a/vms/gawk_alias_setup.com b/vms/gawk_alias_setup.com index a7f13f4b..45cbc219 100644 --- a/vms/gawk_alias_setup.com +++ b/vms/gawk_alias_setup.com @@ -22,10 +22,8 @@ $ set proc/parse=extended $ endif $! $! -$ call do_alias "gawk" "[bin]" -$ call do_alias "gawk" "[bin]" "awk" -$ call do_alias "gawk" "[bin]" "gawk" "[usr.bin]" -$ call do_alias "gawk" "[bin]" "awk" "[usr.bin]" +$ call do_alias "gawk" "[usr.bin]" +$ call do_alias "gawk" "[usr.bin]" "awk" $ call do_alias "gawk.1" "[usr.share.man.man1]" "awk.1" $! $ exit diff --git a/vms/gawk_release_note_start.txt b/vms/gawk_release_note_start.txt index 44fceaf5..cb7dc5f5 100644 --- a/vms/gawk_release_note_start.txt +++ b/vms/gawk_release_note_start.txt @@ -141,8 +141,19 @@ fixes the issues. This kit is designed to be used with the GNV Bash 4.2.45 or later kit. + Fixes and enhancements: + Gawk 4.1.3 ECO 1 + +* The previous GAWK kits were placing the binaries in /bin instead of + /usr/bin, and not cleaning up the older binaries from the /bin directory + after an update. + +* The older kits could not properly detect the VSI releases of OpenVMS. + + Older kits: + * No logical names required for proper Gawk operations other than GNV$GNU for locating the simulated "/". diff --git a/vms/pcsi_gawk_file_list.txt b/vms/pcsi_gawk_file_list.txt index 67d2d324..ed5a26e9 100644 --- a/vms/pcsi_gawk_file_list.txt +++ b/vms/pcsi_gawk_file_list.txt @@ -71,8 +71,8 @@ [gnv.usr.src.gawk.extension] [gnv.usr.src.gawk.extension]vms.dir [gnv.usr.src.gawk.extension.vms] -[gnv.bin]gnv$gawk.exe -[gnv.bin]igawk. +[gnv.usr.bin]gnv$gawk.exe +[gnv.usr.bin]igawk. [gnv.vms_bin]remove_old_gawk.com [gnv.vms_bin]gawk_alias_setup.com [gnv.vms_bin]gawk_verb.cld diff --git a/vms/remove_old_gawk.com b/vms/remove_old_gawk.com index ed68fc45..ef7bce46 100644 --- a/vms/remove_old_gawk.com +++ b/vms/remove_old_gawk.com @@ -24,6 +24,7 @@ $ file = f$element(i, ",", old_cutils) $ if file .eqs. "" then goto cutils_loop_end $ if file .eqs. "," then goto cutils_loop_end $ call update_old_image 'file' +$ call update_old_image 'file' '[usr.bin]' $ i = i + 1 $ goto cutils_loop $cutils_loop_end: @@ -53,9 +54,11 @@ $!------------------------------------------- $update_old_image: subroutine $! $ file = p1 +$ fdir = p2 +$ if fdir .eqs. "" then fdir = "[bin]" $! First get the FID of the new gawk image. $! Don't remove anything that matches it. -$ new_gawk = f$search("GNV$GNU:[BIN]GNV$''file'.EXE") +$ new_gawk = f$search("GNV$GNU:[user.bin]GNV$''file'.EXE") $! $ new_gawk_fid = "No_new_gawk_fid" $ if new_gawk .nes. "" @@ -71,9 +74,9 @@ $! Ok to delete and replace. $! $! $ old_gawk_fid = "No_old_gawk_fid" -$ old_gawk = f$search("gnv$gnu:[bin]''file'.") +$ old_gawk = f$search("gnv$gnu:''fdir'''file'.") $ old_gawk_exe_fid = "No_old_gawk_fid" -$ old_gawk_exe = f$search("gnv$gnu:[bin]''file'.exe") +$ old_gawk_exe = f$search("gnv$gnu:''fdir'''file'.exe") $ if old_gawk_exe .nes. "" $ then $ old_gawk_exe_fid = f$file_attributes(old_gawk_exe, "FID") |