[gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. 58a02d2e425f88c1f9b697f11d4630f3416617dd

[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.0-stable has been updated
       via  58a02d2e425f88c1f9b697f11d4630f3416617dd (commit)
       via  176594bbcd1255f0e6bbde616aeaaa7ddfeca3cc (commit)
      from  e427f97daa5f252709f5380701f306e031585dde (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=58a02d2e425f88c1f9b697f11d4630f3416617dd

commit 58a02d2e425f88c1f9b697f11d4630f3416617dd
Author: Arnold D. Robbins <address@hidden>
Date:   Tue Jan 1 19:04:10 2013 +0200

    Improvements in pc/ directory from Eli Z.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index afe2c83..8ea6af0 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,14 @@
+2012-12-28  Eli Zaretskii  <address@hidden>
+
+       * Makefile (install1): Don't require a Unixy shell and Sed.  Don't
+       edit igawk.bat to point to the igawk script in $(prefix)/bin, as
+       that directory should be on PATH when Gawk is installed.  Create
+       $(prefix)/bin/awk.exe, to emulate a symlink created on Unix.
+       Install documentation in $(prefix)/share.  Install gawkinet.info.
+       (install-strip): New target.
+
+       * install.awk: Install documentation in $prefix/share.
+
 2012-12-24         Arnold D. Robbins     <address@hidden>
 
        * 4.0.2: Release tar ball made.
diff --git a/pc/Makefile b/pc/Makefile
index af3044d..11ecc88 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -72,8 +72,8 @@ MAK = $(MAKE) $(MAKEFILE)
 prefix = c:/gnu
 pkgdatadir = $(prefix)/lib/awk
 #
-# Define the install method. Method 1 is Unix-like (and requires cat,
-# cp, mkdir, sed, and sh); method 2 uses gawk and batch files.
+# Define the install method. Method 1 is Unix-like (and requires cat
+# and cp); method 2 uses gawk and batch files.
 install = 1
 #------------------------------------------------------------------------
 # To work around command-line length problems, this makefile assumes
@@ -287,18 +287,25 @@ install1:
        echo extproc sh $(prefix)/bin/igawk.cmd > igawk.cmd
        echo shift >> igawk.cmd
        cat pc/awklib/igawk >> igawk.cmd
-       sed "s;igawk;$(prefix)/bin/igawk;" pc/awklib/igawk.bat > igawk.bat
-       sh mkinstal.sh $(prefix)/bin
-       sh mkinstal.sh $(pkgdatadir) $(prefix)/man/man1 $(prefix)/info
+       cat pc/awklib/igawk.bat > igawk.bat
+       -mkdir "$(prefix)"
+       -mkdir "$(prefix)/bin"
+       -mkdir "$(prefix)/share"
+       -mkdir "$(prefix)/share/man"
+       -mkdir "$(pkgdatadir)" "$(prefix)/share/man/man1" "$(prefix)/share/info"
        cp *awk.exe igawk.bat igawk.cmd pc/awklib/igawk $(prefix)/bin
+       cp gawk.exe $(prefix)/bin/awk.exe
        cp awklib/eg/lib/* pc/awklib/igawk.awk $(pkgdatadir)
-       cp doc/*.1 $(prefix)/man/man1
-       cp doc/gawk.info $(prefix)/info
+       cp doc/*.1 $(prefix)/share/man/man1
+       cp doc/*.info $(prefix)/share/info
 
 # install2 is equivalent to install1, but doesn't require cp, sed, etc.
 install2:
        gawk -v prefix=$(prefix) -f install.awk
 
+install-strip: install$(install)
+       strip "$(prefix)/bin"/*.exe
+
 clean:
        rm -rf gawk pgawk dgawk *.exe gawk.map *.o *.obj core a.out $(RSPFILE) 
$(PRSPFILE) $(DRSPFILE) $(DYN_EXP)
 #      cd doc && $(MAKE) clean
diff --git a/pc/install.awk b/pc/install.awk
index 367e8b9..7b8e1c9 100644
--- a/pc/install.awk
+++ b/pc/install.awk
@@ -50,13 +50,13 @@ printf("extproc sh %s/bin/igawk.cmd\nshift\n", prefix) > 
igawk_cmd
 while (getline < igawk) print $0 > igawk_cmd
 
 # Create igawk.bat for DOS
-printf("@sh %s/bin/igawk %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9", prefix) > 
igawk_bat
+printf("@sh igawk %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9", prefix) > igawk_bat
 
 # Do common
 cp(igawk " *awk.exe " prefix "/bin")
-mkinstalldirs(prefix "/lib/awk " prefix "/man/man1 " prefix "/info")
+mkinstalldirs(prefix "/lib/awk " prefix "/share/man/man1 " prefix 
"/share/info")
 cp("awklib/eg/lib/* pc/awklib/igawk.awk " prefix "/lib/awk");
-cp("doc/*.1 " prefix "/man/man1");
-cp("doc/gawk.info " prefix "/info");
-cp("doc/gawkinet.info " prefix "/info");
+cp("doc/*.1 " prefix "/share/man/man1");
+cp("doc/gawk.info " prefix "/share/info");
+cp("doc/gawkinet.info " prefix "/share/info");
 }

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=176594bbcd1255f0e6bbde616aeaaa7ddfeca3cc

commit 176594bbcd1255f0e6bbde616aeaaa7ddfeca3cc
Author: Arnold D. Robbins <address@hidden>
Date:   Tue Jan 1 19:02:40 2013 +0200

    Bring gawk regex closer to GLIBC.

diff --git a/ChangeLog b/ChangeLog
index d37c9eb..0ef990c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-01         Arnold D. Robbins     <address@hidden>
+
+       Sync with GLIBC regex files.
+
+       * regex_internal.h (struct re_dfa_t): Remove ifdefs around
+       __libc_lock_define since it's already defined to empty in non-LIBC
+       case.
+       * regexec.c (check_node_accept_bytes): Restore decl with use from
+       GLIBC code since this is LIBC case.
+
 2012-12-24         Arnold D. Robbins     <address@hidden>
 
        * 4.0.2: Release tar ball made.
diff --git a/regex_internal.h b/regex_internal.h
index f38a13b..1805089 100644
--- a/regex_internal.h
+++ b/regex_internal.h
@@ -692,9 +692,7 @@ struct re_dfa_t
 #ifdef DEBUG
   char* re_str;
 #endif
-#if defined _LIBC
   __libc_lock_define (, lock)
-#endif
 };
 
 #define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set))
diff --git a/regexec.c b/regexec.c
index ea4a02f..7d594d2 100644
--- a/regexec.c
+++ b/regexec.c
@@ -3934,7 +3934,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, int 
node_idx,
          if (cset->nequiv_classes)
            {
              const unsigned char *cp = pin;
-          int32_t idx;
              table = (const int32_t *)
                _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
              weights = (const unsigned char *)
@@ -3943,7 +3942,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, int 
node_idx,
                _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
              indirect = (const int32_t *)
                _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
-             idx = findidx (&cp, elem_len);
+             int32_t idx = findidx (&cp, elem_len);
              if (idx > 0)
                for (i = 0; i < cset->nequiv_classes; ++i)
                  {

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

Summary of changes:
 ChangeLog        |   10 ++++++++++
 pc/ChangeLog     |   11 +++++++++++
 pc/Makefile      |   21 ++++++++++++++-------
 pc/install.awk   |   10 +++++-----
 regex_internal.h |    2 --
 regexec.c        |    3 +--
 6 files changed, 41 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
gawk