[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, master, updated. 738835a65bc8afa60fd2b3d
|
From: |
Arnold Robbins |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, master, updated. 738835a65bc8afa60fd2b3df4c98bd0f8020018f |
|
Date: |
Thu, 04 Oct 2012 10:56:53 +0000 |
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, master has been updated
via 738835a65bc8afa60fd2b3df4c98bd0f8020018f (commit)
via 6d63bb4d7df65d29f5c8a2662fbad8044e78e03b (commit)
via e7bdf5ebd4162172e79c00196061af625bd729f2 (commit)
from 82f91536607791340faab394432860f68f0b2787 (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=738835a65bc8afa60fd2b3df4c98bd0f8020018f
commit 738835a65bc8afa60fd2b3df4c98bd0f8020018f
Author: Arnold D. Robbins <address@hidden>
Date: Thu Oct 4 12:56:28 2012 +0200
Update to autoconf 1.12.4.
diff --git a/ChangeLog b/ChangeLog
index 6dc3570..862153d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@
* gawkapi.c: Changed r_make_str_node to make_str_node everywhere.
* node.c (make_str_node): Renamed from make_str_node.
+ Update to automake 1.12.4.
+
+ * Makefile.in, aclocal.m4, awklib/Makefile.in, doc/Makefile.in,
+ extension/Makefile.in, extension/aclocal.m4, test/Makefile.in:
+ Regenerated.
+
2012-09-23 Arnold D. Robbins <address@hidden>
`delete array' and `nextfile' are now in POSIX.
diff --git a/Makefile.in b/Makefile.in
index d3931c4..f58c58e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/NEWS b/NEWS
index 6b54202..c4117dd 100644
--- a/NEWS
+++ b/NEWS
@@ -26,11 +26,13 @@ Changes from 4.0.1 to 4.1
7. The and(), or() and xor() functions now take any number of arguments,
with a minimum of two.
+
+8. Infrastructure upgrades: Automake 1.12.4.
Changes from 4.0.1 to 4.0.2
---------------------------
-1. Infrastructure upgrades: Autoconf 2.69, Automake 1.12,3, bison 2.6.3.
+1. Infrastructure upgrades: Autoconf 2.69, Automake 1.12.3, bison 2.6.3.
xx. Various minor bug fixes and documentation updates.
diff --git a/aclocal.m4 b/aclocal.m4
index 43bbdd4..fa8a246 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.3], [],
+m4_if([$1], [1.12.4], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.3])dnl
+[AM_AUTOMAKE_VERSION([1.12.4])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index d6d2aa2..6a89d05 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 280e18b..85ca9ab 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 687c496..0ea1b86 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/extension/aclocal.m4 b/extension/aclocal.m4
index 18cab75..4358745 100644
--- a/extension/aclocal.m4
+++ b/extension/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.3], [],
+m4_if([$1], [1.12.4], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.3])dnl
+[AM_AUTOMAKE_VERSION([1.12.4])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/test/Makefile.in b/test/Makefile.in
index cc8091a..e60c1c6 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -1370,7 +1370,7 @@ machine-tests: $(MACHINE_TESTS)
mpfr-tests: $(MPFR_TESTS)
shlib-tests:
- @if grep 'DYNAMIC 1' $(top_srcdir)/config.h > /dev/null ; then \
+ @if grep 'DYNAMIC 1' $(top_builddir)/config.h > /dev/null ; then \
$(MAKE) shlib-real-tests ; \
else echo shlib tests not supported on this system ; \
fi
@@ -1880,7 +1880,7 @@ beginfile1::
beginfile2:
@echo $@
- @-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)"
$(srcdir)/address@hidden $(srcdir)/address@hidden ) > _$@ 2>&1
+ @-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)"
$(abs_srcdir)/address@hidden $(abs_srcdir)/address@hidden ) > _$@ 2>&1
@-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
dumpvars::
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=6d63bb4d7df65d29f5c8a2662fbad8044e78e03b
commit 6d63bb4d7df65d29f5c8a2662fbad8044e78e03b
Author: Arnold D. Robbins <address@hidden>
Date: Thu Oct 4 12:53:18 2012 +0200
Fix VPATH builds.
diff --git a/test/ChangeLog b/test/ChangeLog
index b8e5594..3f5a7bc 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-04 Akim Demaille <address@hidden>
+
+ Fix VPATH builds.
+
+ * Makefile.am (shlib-tests): config.h is in builddir.
+ (beginfile2): So is gawk itself.
+
2012-09-23 Arnold D. Robbins <address@hidden>
* lintwarn.ok: Updated.
diff --git a/test/Makefile.am b/test/Makefile.am
index 962ab6b..135ddd8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -986,7 +986,7 @@ machine-tests: $(MACHINE_TESTS)
mpfr-tests: $(MPFR_TESTS)
shlib-tests:
- @if grep 'DYNAMIC 1' $(top_srcdir)/config.h > /dev/null ; then \
+ @if grep 'DYNAMIC 1' $(top_builddir)/config.h > /dev/null ; then \
$(MAKE) shlib-real-tests ; \
else echo shlib tests not supported on this system ; \
fi
@@ -1498,7 +1498,7 @@ beginfile1::
beginfile2:
@echo $@
- @-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)"
$(srcdir)/address@hidden $(srcdir)/address@hidden ) > _$@ 2>&1
+ @-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)"
$(abs_srcdir)/address@hidden $(abs_srcdir)/address@hidden ) > _$@ 2>&1
@-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
dumpvars::
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=e7bdf5ebd4162172e79c00196061af625bd729f2
commit e7bdf5ebd4162172e79c00196061af625bd729f2
Author: Arnold D. Robbins <address@hidden>
Date: Thu Oct 4 12:52:26 2012 +0200
Clean up make_str_node macro.
diff --git a/ChangeLog b/ChangeLog
index bee035b..6dc3570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-04 Arnold D. Robbins <address@hidden>
+
+ * TODO.xgawk: Update.
+ * awk.h (make_str_node): Removed macro.
+ (make_string): Modified to call make_str_node.
+ (r_make_str_node): Renamed to make_str_node.
+ * gawkapi.c: Changed r_make_str_node to make_str_node everywhere.
+ * node.c (make_str_node): Renamed from make_str_node.
+
2012-09-23 Arnold D. Robbins <address@hidden>
`delete array' and `nextfile' are now in POSIX.
diff --git a/TODO.xgawk b/TODO.xgawk
index 78f2642..250031f 100644
--- a/TODO.xgawk
+++ b/TODO.xgawk
@@ -4,8 +4,6 @@ To-do list for xgawk enhancements:
- In extensions/configure.ac - add compiler warnings if GCC.
-- Consider adding a way to access gawk special vars read only.
-
Low priority:
- Enhance extension/fork.c waitpid to allow the caller to specify the options.
@@ -146,3 +144,5 @@ Done:
- Attempting to load the same file with -f and -i (or @include) should
be a fatal error.
+
+- Consider adding a way to access gawk special vars read only.
diff --git a/awk.h b/awk.h
index bafb4b9..28ed92c 100644
--- a/awk.h
+++ b/awk.h
@@ -1288,8 +1288,7 @@ extern STACK_ITEM *stack_top;
#define getbucket(b) getblock(b, BLOCK_BUCKET, BUCKET *)
#define freebucket(b) freeblock(b, BLOCK_BUCKET)
-#define make_string(s, l) r_make_str_node((s), (l), 0)
-#define make_str_node(s, l, f) r_make_str_node((s), (l), (f))
+#define make_string(s, l) make_str_node((s), (l), 0)
#define SCAN 1
#define ALREADY_MALLOCED 2
@@ -1636,7 +1635,7 @@ extern void pp_string_fp(Func_print print_func, FILE *fp,
const char *str,
extern NODE *r_force_number(NODE *n);
extern NODE *r_format_val(const char *format, int index, NODE *s);
extern NODE *r_dupnode(NODE *n);
-extern NODE *r_make_str_node(const char *s, size_t len, int flags);
+extern NODE *make_str_node(const char *s, size_t len, int flags);
extern void *more_blocks(int id);
extern void r_unref(NODE *tmp);
extern int parse_escape(const char **string_ptr);
diff --git a/gawkapi.c b/gawkapi.c
index dbb8549..3473a48 100644
--- a/gawkapi.c
+++ b/gawkapi.c
@@ -634,7 +634,7 @@ api_sym_update_scalar(awk_ext_id_t id,
* a number, we can avoid calling unref and then making a new node
* by simply installing the new value. First, we follow the same
* recipe used by node.c:r_unref to wipe the current values, and then
- * we copy the logic from r_make_number or r_make_str_node to install
+ * we copy the logic from r_make_number or make_str_node to install
* the new value.
*/
switch (value->val_type) {
@@ -670,7 +670,7 @@ api_sym_update_scalar(awk_ext_id_t id,
#endif
free_wstr(r);
- /* r_make_str_node(ALREADY_MALLOCED): */
+ /* make_str_node(s, l, ALREADY_MALLOCED): */
r->numbr = 0;
r->flags = (MALLOC|STRING|STRCUR);
r->stfmt = -1;
diff --git a/node.c b/node.c
index c7316dc..f8152ba 100644
--- a/node.c
+++ b/node.c
@@ -371,10 +371,10 @@ cmp_awknums(const NODE *t1, const NODE *t2)
}
-/* r_make_str_node --- make a string node */
+/* make_str_node --- make a string node */
NODE *
-r_make_str_node(const char *s, size_t len, int flags)
+make_str_node(const char *s, size_t len, int flags)
{
NODE *r;
getnode(r);
@@ -392,7 +392,7 @@ r_make_str_node(const char *s, size_t len, int flags)
if (flags & ALREADY_MALLOCED)
r->stptr = (char *) s;
else {
- emalloc(r->stptr, char *, len + 2, "r_make_str_node");
+ emalloc(r->stptr, char *, len + 2, "make_str_node");
memcpy(r->stptr, s, len);
}
r->stptr[len] = '\0';
@@ -441,7 +441,7 @@ r_make_str_node(const char *s, size_t len, int flags)
*ptm++ = c;
}
len = ptm - r->stptr;
- erealloc(r->stptr, char *, len + 1, "r_make_str_node");
+ erealloc(r->stptr, char *, len + 1, "make_str_node");
r->stptr[len] = '\0';
}
r->stlen = len;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 15 +++++++++++++++
Makefile.in | 2 +-
NEWS | 4 +++-
TODO.xgawk | 4 ++--
aclocal.m4 | 6 +++---
awk.h | 5 ++---
awklib/Makefile.in | 2 +-
doc/Makefile.in | 2 +-
extension/Makefile.in | 2 +-
extension/aclocal.m4 | 6 +++---
gawkapi.c | 4 ++--
node.c | 8 ++++----
test/ChangeLog | 7 +++++++
test/Makefile.am | 4 ++--
test/Makefile.in | 6 +++---
15 files changed, 50 insertions(+), 27 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, master, updated. 738835a65bc8afa60fd2b3df4c98bd0f8020018f,
Arnold Robbins <=