From 5d70fa532e45bcc799ba070f375b6ff34588c1eb Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 19 Oct 2016 21:19:36 -0400 Subject: [PATCH] Update version to 5.0.0-alpha --- c/lib/mlrescape.c | 4 ---- c/mlrvers.h | 2 +- configure.ac | 2 +- doc/manpage.html | 4 ++-- doc/manpage.txt | 4 ++-- doc/mlr.1 | 6 +++--- doc/reference.html | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/c/lib/mlrescape.c b/c/lib/mlrescape.c index 477590cf9..debbc057b 100644 --- a/c/lib/mlrescape.c +++ b/c/lib/mlrescape.c @@ -10,10 +10,6 @@ char* alloc_file_name_escaped_for_popen(char* filename) { sb_append_char(psb, '\''); for (char* p = filename; *p; p++) { char c = *p; - //if (c == '\'') { - //sb_append_char(psb, '\\'); - //} - //sb_append_char(psb, c); if (c == '\'') { sb_append_char(psb, '\''); sb_append_char(psb, '\\'); diff --git a/c/mlrvers.h b/c/mlrvers.h index 3b046e705..653fd5d61 100644 --- a/c/mlrvers.h +++ b/c/mlrvers.h @@ -1,5 +1,5 @@ #ifndef MLRVERS_H #define MLRVERS_H // Manually increment on updates to https://github.com/johnkerl/miller/releases -#define MLR_VERSION "v4.5.0-dev" +#define MLR_VERSION "v5.0.0-dev" #endif // MLRVERS_H diff --git a/configure.ac b/configure.ac index 52af0354b..ba97de5c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) # Manually increment on updates to https://github.com/johnkerl/miller/releases -AC_INIT([mlr],[4.5.0-dev]) +AC_INIT([mlr],[5.0.0-alpha]) AC_CONFIG_SRCDIR([c/mlrmain.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([autotools]) diff --git a/doc/manpage.html b/doc/manpage.html index 41f87b82b..5f59aff6a 100644 --- a/doc/manpage.html +++ b/doc/manpage.html @@ -165,7 +165,7 @@ DESCRIPTION insertion-ordered hash map. This encompasses a variety of data formats, including but not limited to the familiar CSV, TSV, and JSON. (Miller can handle positionally-indexed data as a special case.) This - manpage documents Miller v4.5.0-dev. + manpage documents Miller v5.0.0-dev. EXAMPLES COMMAND-LINE SYNTAX @@ -1871,7 +1871,7 @@ SEE ALSO - 2016-10-19 MILLER(1) + 2016-10-20 MILLER(1)

diff --git a/doc/manpage.txt b/doc/manpage.txt index 1d2de375b..5fc642e33 100644 --- a/doc/manpage.txt +++ b/doc/manpage.txt @@ -18,7 +18,7 @@ DESCRIPTION insertion-ordered hash map. This encompasses a variety of data formats, including but not limited to the familiar CSV, TSV, and JSON. (Miller can handle positionally-indexed data as a special case.) This - manpage documents Miller v4.5.0-dev. + manpage documents Miller v5.0.0-dev. EXAMPLES COMMAND-LINE SYNTAX @@ -1724,4 +1724,4 @@ SEE ALSO - 2016-10-19 MILLER(1) + 2016-10-20 MILLER(1) diff --git a/doc/mlr.1 b/doc/mlr.1 index eadd18ced..100525dfb 100644 --- a/doc/mlr.1 +++ b/doc/mlr.1 @@ -2,12 +2,12 @@ .\" Title: mlr .\" Author: [see the "AUTHOR" section] .\" Generator: ./mkman.rb -.\" Date: 2016-10-19 +.\" Date: 2016-10-20 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MILLER" "1" "2016-10-19" "\ \&" "\ \&" +.TH "MILLER" "1" "2016-10-20" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Portability definitions .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -38,7 +38,7 @@ on integer-indexed fields: if the natural data structure for the latter is the array, then Miller's natural data structure is the insertion-ordered hash map. This encompasses a variety of data formats, including but not limited to the familiar CSV, TSV, and JSON. (Miller can handle positionally-indexed data as -a special case.) This manpage documents Miller v4.5.0-dev. +a special case.) This manpage documents Miller v5.0.0-dev. .SH "EXAMPLES" .sp diff --git a/doc/reference.html b/doc/reference.html index d95d328cd..678f2cd4a 100644 --- a/doc/reference.html +++ b/doc/reference.html @@ -609,7 +609,7 @@ Output of one verb may be chained as input to another using "then", e.g. mlr stats1 -a min,mean,max -f flag,u,v -g color then sort -f color For more information please see http://johnkerl.org/miller/doc and/or -http://github.com/johnkerl/miller. This is Miller version v4.5.0-dev. +http://github.com/johnkerl/miller. This is Miller version v5.0.0-dev.