From 8f0921556cd1284d4fbef9ba136785f060ce474f Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 3 Jan 2018 22:42:30 -0500 Subject: [PATCH] fix travis build --- Makefile.in | 3 ++- c/Makefile.in | 4 ++-- c/auxents/Makefile.in | 4 ++-- c/cli/Makefile.in | 5 +++-- c/containers/Makefile.in | 4 ++-- c/dsl/Makefile.in | 4 ++-- c/experimental/Makefile.in | 4 ++-- c/input/Makefile.in | 4 ++-- c/lib/Makefile.in | 4 ++-- c/mapping/Makefile.in | 4 ++-- c/output/Makefile.in | 4 ++-- c/parsing/Makefile.in | 4 ++-- c/reg_test/Makefile.in | 4 ++-- c/reg_test/expected/Makefile.in | 4 ++-- c/reg_test/input/Makefile.in | 12 +++++++++--- c/reg_test/input/rfc-csv/Makefile.in | 4 ++-- c/reg_test/run | 2 +- c/stream/Makefile.in | 4 ++-- c/todo.txt | 2 +- c/unit_test/Makefile.in | 4 ++-- configure | 3 ++- doc/Makefile.in | 4 ++-- 22 files changed, 50 insertions(+), 41 deletions(-) diff --git a/Makefile.in b/Makefile.in index d889efe56..57f446d3a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -168,7 +168,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/autotools/ltmain.sh \ $(top_srcdir)/autotools/missing autotools/ar-lib \ autotools/compile autotools/config.guess autotools/config.sub \ - autotools/install-sh autotools/ltmain.sh autotools/missing + autotools/depcomp autotools/install-sh autotools/ltmain.sh \ + autotools/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/c/Makefile.in b/c/Makefile.in index b002f4ee4..1b256fb38 100644 --- a/c/Makefile.in +++ b/c/Makefile.in @@ -429,9 +429,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/Makefile + $(AUTOMAKE) --foreign c/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/auxents/Makefile.in b/c/auxents/Makefile.in index 79aa457b2..81abdaa7e 100644 --- a/c/auxents/Makefile.in +++ b/c/auxents/Makefile.in @@ -310,9 +310,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/auxents/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/auxents/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/auxents/Makefile + $(AUTOMAKE) --foreign c/auxents/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/cli/Makefile.in b/c/cli/Makefile.in index 69220a1bb..df529630f 100644 --- a/c/cli/Makefile.in +++ b/c/cli/Makefile.in @@ -294,6 +294,7 @@ noinst_LTLIBRARIES = libcli.la libcli_la_SOURCES = \ argparse.c \ argparse.h \ + comment_handling.h \ json_array_ingest.h \ mlrcli.c \ mlrcli.h \ @@ -320,9 +321,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/cli/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/cli/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/cli/Makefile + $(AUTOMAKE) --foreign c/cli/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/containers/Makefile.in b/c/containers/Makefile.in index 09779aba9..679f9153d 100644 --- a/c/containers/Makefile.in +++ b/c/containers/Makefile.in @@ -371,9 +371,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/containers/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/containers/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/containers/Makefile + $(AUTOMAKE) --foreign c/containers/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/dsl/Makefile.in b/c/dsl/Makefile.in index fba515eae..76b164900 100644 --- a/c/dsl/Makefile.in +++ b/c/dsl/Makefile.in @@ -368,9 +368,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/dsl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/dsl/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/dsl/Makefile + $(AUTOMAKE) --foreign c/dsl/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/experimental/Makefile.in b/c/experimental/Makefile.in index 274324aad..2ea1524ab 100644 --- a/c/experimental/Makefile.in +++ b/c/experimental/Makefile.in @@ -309,9 +309,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/experimental/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/experimental/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/experimental/Makefile + $(AUTOMAKE) --foreign c/experimental/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/input/Makefile.in b/c/input/Makefile.in index b9a6898d1..97ecd0103 100644 --- a/c/input/Makefile.in +++ b/c/input/Makefile.in @@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/input/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/input/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/input/Makefile + $(AUTOMAKE) --foreign c/input/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/lib/Makefile.in b/c/lib/Makefile.in index 1af61cf71..05d394c15 100644 --- a/c/lib/Makefile.in +++ b/c/lib/Makefile.in @@ -347,9 +347,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/lib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/lib/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/lib/Makefile + $(AUTOMAKE) --foreign c/lib/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/mapping/Makefile.in b/c/mapping/Makefile.in index c89fe4d7c..090d5cc06 100644 --- a/c/mapping/Makefile.in +++ b/c/mapping/Makefile.in @@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/mapping/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/mapping/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/mapping/Makefile + $(AUTOMAKE) --foreign c/mapping/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/output/Makefile.in b/c/output/Makefile.in index 5e81f4959..731e8f18a 100644 --- a/c/output/Makefile.in +++ b/c/output/Makefile.in @@ -340,9 +340,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/output/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/output/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/output/Makefile + $(AUTOMAKE) --foreign c/output/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/parsing/Makefile.in b/c/parsing/Makefile.in index d0f016dbe..714863dbf 100644 --- a/c/parsing/Makefile.in +++ b/c/parsing/Makefile.in @@ -358,9 +358,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/parsing/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/parsing/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/parsing/Makefile + $(AUTOMAKE) --foreign c/parsing/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/reg_test/Makefile.in b/c/reg_test/Makefile.in index 569ccfc6f..34b23d93f 100644 --- a/c/reg_test/Makefile.in +++ b/c/reg_test/Makefile.in @@ -520,9 +520,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/reg_test/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/reg_test/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/reg_test/Makefile + $(AUTOMAKE) --foreign c/reg_test/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/reg_test/expected/Makefile.in b/c/reg_test/expected/Makefile.in index fae6e826c..6988b2815 100644 --- a/c/reg_test/expected/Makefile.in +++ b/c/reg_test/expected/Makefile.in @@ -253,9 +253,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/reg_test/expected/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/reg_test/expected/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/reg_test/expected/Makefile + $(AUTOMAKE) --foreign c/reg_test/expected/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/reg_test/input/Makefile.in b/c/reg_test/input/Makefile.in index e8ca91b50..92cff7cff 100644 --- a/c/reg_test/input/Makefile.in +++ b/c/reg_test/input/Makefile.in @@ -300,7 +300,9 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = rfc-csv +SUBDIRS = rfc-csv \ + comments + EXTRA_DIST = \ a.csv \ a.pprint \ @@ -321,11 +323,13 @@ EXTRA_DIST = \ b.csv \ b.pprint \ bom.csv \ + bom-dquote-header.csv \ braced.csv \ c.csv \ c.pprint \ capture-lengths.dkvp \ capture.dkvp \ + comments \ d.csv \ d.pprint \ date1.csv \ @@ -489,6 +493,8 @@ EXTRA_DIST = \ utf8-align.dkvp \ utf8-align.nidx \ valgrind.txt \ + with-comments.csv \ + without-comments.csv \ x0to10.dat \ xy40.dkvp \ xyz345 \ @@ -506,9 +512,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/reg_test/input/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/reg_test/input/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/reg_test/input/Makefile + $(AUTOMAKE) --foreign c/reg_test/input/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/reg_test/input/rfc-csv/Makefile.in b/c/reg_test/input/rfc-csv/Makefile.in index da5a88993..69a89044f 100644 --- a/c/reg_test/input/rfc-csv/Makefile.in +++ b/c/reg_test/input/rfc-csv/Makefile.in @@ -263,9 +263,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/reg_test/input/rfc-csv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/reg_test/input/rfc-csv/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/reg_test/input/rfc-csv/Makefile + $(AUTOMAKE) --foreign c/reg_test/input/rfc-csv/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/reg_test/run b/c/reg_test/run index 2c17ff6ce..8e3bcc8bb 100755 --- a/c/reg_test/run +++ b/c/reg_test/run @@ -6792,7 +6792,7 @@ echo "Differences between $expfile and $outfile:" # when the diff is long. set +e -diff -I '^mlr' -C5 $expfile $outfile +diff -I '^mlr' -I '^cat' -C5 $expfile $outfile status=$? if [ $status -eq 0 ]; then diff --git a/c/stream/Makefile.in b/c/stream/Makefile.in index 81be747a2..9040b86ec 100644 --- a/c/stream/Makefile.in +++ b/c/stream/Makefile.in @@ -310,9 +310,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/stream/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/stream/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/stream/Makefile + $(AUTOMAKE) --foreign c/stream/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/c/todo.txt b/c/todo.txt index bc8e0a782..e18c54834 100644 --- a/c/todo.txt +++ b/c/todo.txt @@ -43,7 +43,7 @@ BUGFIXES * sql-setup doc somewhere ....... -* ./configure +* bare ./configure ? * valgrinds diff --git a/c/unit_test/Makefile.in b/c/unit_test/Makefile.in index a37f77f79..8af9a3dcf 100644 --- a/c/unit_test/Makefile.in +++ b/c/unit_test/Makefile.in @@ -660,9 +660,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/unit_test/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/unit_test/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu c/unit_test/Makefile + $(AUTOMAKE) --foreign c/unit_test/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/configure b/configure index 794917a03..0afffe43b 100755 --- a/configure +++ b/configure @@ -12182,7 +12182,7 @@ ac_config_links="$ac_config_links c/parsing/lempar.c:c/parsing/lempar.c" ac_config_links="$ac_config_links c/parsing/mlr_dsl_parse.y:c/parsing/mlr_dsl_parse.y" -ac_config_files="$ac_config_files Makefile c/cli/Makefile c/containers/Makefile c/parsing/Makefile c/dsl/Makefile c/experimental/Makefile c/input/Makefile c/lib/Makefile c/mapping/Makefile c/output/Makefile c/stream/Makefile c/auxents/Makefile c/unit_test/Makefile c/reg_test/Makefile c/reg_test/expected/Makefile c/reg_test/input/Makefile c/reg_test/input/rfc-csv/Makefile c/Makefile doc/Makefile" +ac_config_files="$ac_config_files Makefile c/cli/Makefile c/containers/Makefile c/parsing/Makefile c/dsl/Makefile c/experimental/Makefile c/input/Makefile c/lib/Makefile c/mapping/Makefile c/output/Makefile c/stream/Makefile c/auxents/Makefile c/unit_test/Makefile c/reg_test/Makefile c/reg_test/expected/Makefile c/reg_test/input/Makefile c/reg_test/input/rfc-csv/Makefile c/reg_test/input/comments/Makefile c/Makefile doc/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -13218,6 +13218,7 @@ do "c/reg_test/expected/Makefile") CONFIG_FILES="$CONFIG_FILES c/reg_test/expected/Makefile" ;; "c/reg_test/input/Makefile") CONFIG_FILES="$CONFIG_FILES c/reg_test/input/Makefile" ;; "c/reg_test/input/rfc-csv/Makefile") CONFIG_FILES="$CONFIG_FILES c/reg_test/input/rfc-csv/Makefile" ;; + "c/reg_test/input/comments/Makefile") CONFIG_FILES="$CONFIG_FILES c/reg_test/input/comments/Makefile" ;; "c/Makefile") CONFIG_FILES="$CONFIG_FILES c/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; diff --git a/doc/Makefile.in b/doc/Makefile.in index a4340dc11..94804304a 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -285,9 +285,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \