[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-783-g2fe3818

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-4.1-stable has been updated
       via  2fe3818b9574f685eaeefc9e7d61cf7ba00ec87e (commit)
      from  640d55ecdaced9e826a95a0bce4c65a3e5965cae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=2fe3818b9574f685eaeefc9e7d61cf7ba00ec87e

commit 2fe3818b9574f685eaeefc9e7d61cf7ba00ec87e
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Jan 11 05:47:34 2016 +0200

    Updates for VSI distribution of VMS.

diff --git a/vms/ChangeLog b/vms/ChangeLog
index 92fb7ab..e951075 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,16 @@
+2016-01-10         John E. Malmberg      <address@hidden>
+
+       * 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-05-19         Arnold D. Robbins     <address@hidden>
 
        * 4.1.3: Release tar ball made.
diff --git a/vms/build_gawk_pcsi_desc.com b/vms/build_gawk_pcsi_desc.com
index 63d149e..298d0ea 100644
--- a/vms/build_gawk_pcsi_desc.com
+++ b/vms/build_gawk_pcsi_desc.com
@@ -96,8 +96,8 @@ $! Required product dependencies.
 $!----------------------------------
 $ 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)
@@ -109,8 +109,20 @@ $ if dashver .eqs. "-" then dashver = ""
 $ vmstag = majver + minver + dashver
 $ code = f$extract(0, 1, arch_type)
 $ arch_code = f$extract(0, 1, arch_type)
-$ write pdsc -
- "   if (not <software ''vmsprd' ''base' VMS version minimum ''node_swvers'>) 
;"
+$ line_out = -
+ "   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 260ec4e..065b640 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 a7f13f4..45cbc21 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 44fceaf..cb7dc5f 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 67d2d32..ed5a26e 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 ed68fc4..ef7bce4 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")

-----------------------------------------------------------------------

Summary of changes:
 vms/ChangeLog                   |   13 +++++++++++++
 vms/build_gawk_pcsi_desc.com    |   18 +++++++++++++++---
 vms/compare_gawk_source.com     |    2 ++
 vms/gawk_alias_setup.com        |    6 ++----
 vms/gawk_release_note_start.txt |   11 +++++++++++
 vms/pcsi_gawk_file_list.txt     |    4 ++--
 vms/remove_old_gawk.com         |    9 ++++++---
 7 files changed, 51 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
gawk