Merge pull request #1196 from xexyl/vers

lcn2 · web-flow · commit 689de2d10e2f · 2025-02-28T11:35:25.000-08:00
diff --git a/jparse/CHANGES.md b/jparse/CHANGES.md
@@ -4,8 +4,8 @@
 
 Add util function that uses `file_size()` called `is_empty()`.
 
-Updated `JPARSE_UTILS_VERSION` to `"1.0.26 2025-02-28"`.
-Updated `UTIL_TEST_VERSION` to `"1.0.24 2025-02-28"`.
+Updated all tools by changing `x.y.z` to `x.y+1.0` except that for those under <
+`2.0.0` they have been changed to `2.0.0`.
 
 
 ## Release 2.2.29 2025-02-27
diff --git a/jparse/jparse_bug_report.sh b/jparse/jparse_bug_report.sh
@@ -79,7 +79,7 @@ if [[ -z "$MAKE" ]]; then
 fi
 export MAKE
 export MAKE_FLAGS="V=@ S=@ Q= E=@ I= Q_V_OPTION=1 INSTALL_V= MAKE_CD_Q="
-export BUG_REPORT_VERSION="2.0.6 2025-02-27"
+export BUG_REPORT_VERSION="2.1.0 2025-02-28"
 export FAILURE_SUMMARY=
 export NOTICE_SUMMARY=
 export DBG_LEVEL="0"
diff --git a/jparse/jsemcgen.sh b/jparse/jsemcgen.sh
@@ -39,7 +39,7 @@ export UNKNOWN_FUNC=
 export JSEMTBLGEN="./jsemtblgen"
 export JSEMTBLGEN_ARGS=
 export PATCH_TOOL=
-export JSEMCGEN_VERSION="1.2.0 2024-10-09"
+export JSEMCGEN_VERSION="2.0.0 2025-02-28"
 
 # attempt to fetch system specific paths to tools we need
 #
diff --git a/jparse/jsemtblgen.h b/jparse/jsemtblgen.h
@@ -76,7 +76,7 @@
 /*
  * official jsemtblgen version
  */
-#define JSEMTBLGEN_VERSION "1.2.2 2025-02-23"		/* format: major.minor YYYY-MM-DD */
+#define JSEMTBLGEN_VERSION "2.0.0 2025-02-28"		/* format: major.minor YYYY-MM-DD */
 
 /*
  * jsemtblgen tool basename
diff --git a/jparse/json_utf8.h b/jparse/json_utf8.h
@@ -38,7 +38,7 @@
 /*
  * official jparse UTF-8 version
  */
-#define JPARSE_UTF8_VERSION "2.0.6 2025-01-17"	/* format: major.minor YYYY-MM-DD */
+#define JPARSE_UTF8_VERSION "2.1.0 2025-02-28"	/* format: major.minor YYYY-MM-DD */
 
 
 extern size_t utf8len(const char *str, int32_t surrogate);
diff --git a/jparse/jstrdecode.h b/jparse/jstrdecode.h
@@ -73,7 +73,7 @@
 /*
  * official jstrdecode version
  */
-#define JSTRDECODE_VERSION "2.1.5 2024-12-26"	/* format: major.minor YYYY-MM-DD */
+#define JSTRDECODE_VERSION "2.2.0 2025-02-28"	/* format: major.minor YYYY-MM-DD */
 
 
 /*
diff --git a/jparse/jstrencode.h b/jparse/jstrencode.h
@@ -73,7 +73,7 @@
 /*
  * official jstrencode version
  */
-#define JSTRENCODE_VERSION "2.1.1 2024-11-15"	/* format: major.minor YYYY-MM-DD */
+#define JSTRENCODE_VERSION "2.2.0 2025-02-28"	/* format: major.minor YYYY-MM-DD */
 
 
 /*
diff --git a/jparse/run_bison.sh b/jparse/run_bison.sh
@@ -20,7 +20,7 @@
 
 # setup
 #
-export RUN_BISON_VERSION="1.2.0 2024-10-09"
+export RUN_BISON_VERSION="2.0.0 2025-02-28"
 export BISON_BASENAME="bison"
 export PREFIX="jparse"
 export SORRY_H="sorry.tm.ca.h"
diff --git a/jparse/run_flex.sh b/jparse/run_flex.sh
@@ -20,7 +20,7 @@
 
 # setup
 #
-export RUN_FLEX_VERSION="1.2.0 2024-10-09"
+export RUN_FLEX_VERSION="2.0.0 2025-02-28"
 export FLEX_BASENAME="flex"
 export PREFIX="jparse"
 export SORRY_H="sorry.tm.ca.h"
diff --git a/jparse/test_jparse/is_available.sh b/jparse/test_jparse/is_available.sh
@@ -16,7 +16,7 @@
 #
 # Share and enjoy! :-)
 
-export VERSION="1.2.0 2024-10-09"
+export VERSION="2.0.0 2025-02-28"
 NAME=$(basename "$0")
 export NAME
 export PRINT_WHERE=""
diff --git a/jparse/test_jparse/jnum_chk.h b/jparse/test_jparse/jnum_chk.h
@@ -66,7 +66,7 @@
 /*
  * official jnum_chk version
  */
-#define JNUM_CHK_VERSION "1.0.1 2024-03-02"      /* format: major.minor YYYY-MM-DD */
+#define JNUM_CHK_VERSION "2.0.0 2025-02-28"      /* format: major.minor YYYY-MM-DD */
 
 
 /*
diff --git a/jparse/test_jparse/jnum_gen.h b/jparse/test_jparse/jnum_gen.h
@@ -74,7 +74,7 @@
 /*
  * official jnum_gen version
  */
-#define JNUM_GEN_VERSION "1.0.1 2024-03-02"	/* format: major.minor YYYY-MM-DD */
+#define JNUM_GEN_VERSION "2.0.0 2025-02-28"	/* format: major.minor YYYY-MM-DD */
 
 /*
  * jnum_gen tool basename
diff --git a/jparse/test_jparse/jparse_test.sh b/jparse/test_jparse/jparse_test.sh
@@ -73,7 +73,7 @@
 
 # setup
 #
-export JPARSE_TEST_VERSION="1.2.3 2025-01-01"	    # version format: major.minor YYYY-MM-DD */
+export JPARSE_TEST_VERSION="2.0.0 2025-02-28"	    # version format: major.minor YYYY-MM-DD */
 export CHK_TEST_FILE="./test_jparse/json_teststr.txt"
 export CHK_INVALID_TEST_FILE="./test_jparse/json_teststr_fail.txt"
 export JPARSE="./jparse"
diff --git a/jparse/test_jparse/jstr_test.sh b/jparse/test_jparse/jstr_test.sh
@@ -24,7 +24,7 @@ export JSTRENCODE="./jstrencode"
 export TEST_FILE="./test_jparse/jstr_test.out"
 export TEST_FILE2="./test_jparse/jstr_test2.out"
 export JSTR_TEST_TXT="./test_jparse/jstr_test.txt"
-export JSTR_TEST_VERSION="1.2.7 2025-01-02" # version format: major.minor YYYY-MM-DD
+export JSTR_TEST_VERSION="2.0.0 2025-02-28" # version format: major.minor YYYY-MM-DD
 export TOPDIR=
 
 export USAGE="usage: $0 [-h] [-V] [-v level] [-e jstrencode] [-d jstrdecode] [-Z topdir]
diff --git a/jparse/test_jparse/not_a_comment.sh b/jparse/test_jparse/not_a_comment.sh
@@ -40,7 +40,7 @@
 
 # setup
 #
-export VERSION="1.0 2025-01-03"
+export VERSION="2.0.0 2025-02-28"
 NAME=$(basename "$0")
 export NAME
 #
diff --git a/jparse/test_jparse/pr_jparse_test.h b/jparse/test_jparse/pr_jparse_test.h
@@ -67,7 +67,7 @@
 /*
  * official pr_jparse_test version
  */
-#define PR_JPARSE_TEST_VERSION "1.2.0 2024-10-09"	/* format: major.minor YYYY-MM-DD */
+#define PR_JPARSE_TEST_VERSION "2.0.0 2025-02-28"	/* format: major.minor YYYY-MM-DD */
 
 /*
  * pr_jparse_test tool basename
diff --git a/jparse/test_jparse/prep.sh b/jparse/test_jparse/prep.sh
@@ -20,7 +20,7 @@
 export FAILURE_SUMMARY=
 export SKIPPED_SUMMARY=
 export LOGFILE=
-export PREP_VERSION="1.2.1 2025-01-04"
+export PREP_VERSION="2.0.0 2025-02-28"
 export NOTICE_COUNT="0"
 export USAGE="usage: $0 [-h] [-v level] [-V] [-e] [-o] [-m make] [-M Makefile] [-l logfile]
 
diff --git a/jparse/test_jparse/run_jparse_tests.sh b/jparse/test_jparse/run_jparse_tests.sh
@@ -20,7 +20,7 @@
 
 # setup
 #
-export RUN_JPARSE_TESTS_VERSION="1.0.1 2024-10-22"
+export RUN_JPARSE_TESTS_VERSION="2.0.0 2025-02-28"
 export USAGE="usage: $0 [-h] [-V] [-v level] [-D dbg_level] [-J json_level] [-j jparse] [-p pr_jparse_test] [-c jnum_chk] [-Z topdir]
 
     -h			print help and exit
diff --git a/jparse/util.c b/jparse/util.c
@@ -8888,7 +8888,7 @@ check_invalid_option(char const *prog, int ch, int opt)
  */
 #include "../json_utf8.h"
 
-#define UTIL_TEST_VERSION "1.0.24 2025-02-28" /* version format: major.minor YYYY-MM-DD */
+#define UTIL_TEST_VERSION "2.0.0 2025-02-28" /* version format: major.minor YYYY-MM-DD */
 
 int
 main(int argc, char **argv)
diff --git a/jparse/verge.h b/jparse/verge.h
@@ -50,7 +50,7 @@
 /*
  * official verge tool version
  */
-#define VERGE_VERSION "1.2.0 2024-10-09"		/* format: major.minor YYYY-MM-DD */
+#define VERGE_VERSION "2.0.0 2025-02-28"		/* format: major.minor YYYY-MM-DD */
 
 
 /*
diff --git a/jparse/version.h b/jparse/version.h
@@ -34,22 +34,22 @@
  *
  * NOTE: this should match the latest Release string in CHANGES.md
  */
-#define JPARSE_REPO_VERSION "2.2.29 2025-02-28"		/* format: major.minor YYYY-MM-DD */
+#define JPARSE_REPO_VERSION "2.3.0 2025-02-28"		/* format: major.minor YYYY-MM-DD */
 
 /*
  * official jparse version
  */
-#define JPARSE_VERSION "1.2.8 2024-12-31"		/* format: major.minor YYYY-MM-DD */
+#define JPARSE_VERSION "2.0.0 2025-02-28"		/* format: major.minor YYYY-MM-DD */
 
 /*
  * official JSON parser version
  */
-#define JPARSE_LIBRARY_VERSION "2.2.7 2025-01-18"	/* library version format: major.minor YYYY-MM-DD */
+#define JPARSE_LIBRARY_VERSION "2.3.0 2025-02-28"	/* library version format: major.minor YYYY-MM-DD */
 
 /*
  * official utility functions (util.c) version
  */
-#define JPARSE_UTILS_VERSION "1.0.26 2025-02-28"         /* format: major.minor YYYY-MM-DD */
+#define JPARSE_UTILS_VERSION "2.0.0 2025-02-28"         /* format: major.minor YYYY-MM-DD */
 
 
 #endif /* INCLUDE_JPARSE_VERSION_H */

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export UNKNOWN_FUNC=`
`39`	`39`	`export JSEMTBLGEN="./jsemtblgen"`
`40`	`40`	`export JSEMTBLGEN_ARGS=`
`41`	`41`	`export PATCH_TOOL=`
`42`		`-export JSEMCGEN_VERSION="1.2.0 2024-10-09"`
	`42`	`+export JSEMCGEN_VERSION="2.0.0 2025-02-28"`
`43`	`43`
`44`	`44`	`# attempt to fetch system specific paths to tools we need`
`45`	`45`	`#`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`# setup`
`22`	`22`	`#`
`23`		`-export RUN_BISON_VERSION="1.2.0 2024-10-09"`
	`23`	`+export RUN_BISON_VERSION="2.0.0 2025-02-28"`
`24`	`24`	`export BISON_BASENAME="bison"`
`25`	`25`	`export PREFIX="jparse"`
`26`	`26`	`export SORRY_H="sorry.tm.ca.h"`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#`
`17`	`17`	`# Share and enjoy! :-)`
`18`	`18`
`19`		`-export VERSION="1.2.0 2024-10-09"`
	`19`	`+export VERSION="2.0.0 2025-02-28"`
`20`	`20`	`NAME=$(basename "$0")`
`21`	`21`	`export NAME`
`22`	`22`	`export PRINT_WHERE=""`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`
`74`	`74`	`# setup`
`75`	`75`	`#`
`76`		`-export JPARSE_TEST_VERSION="1.2.3 2025-01-01" # version format: major.minor YYYY-MM-DD */`
	`76`	`+export JPARSE_TEST_VERSION="2.0.0 2025-02-28" # version format: major.minor YYYY-MM-DD */`
`77`	`77`	`export CHK_TEST_FILE="./test_jparse/json_teststr.txt"`
`78`	`78`	`export CHK_INVALID_TEST_FILE="./test_jparse/json_teststr_fail.txt"`
`79`	`79`	`export JPARSE="./jparse"`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`
`41`	`41`	`# setup`
`42`	`42`	`#`
`43`		`-export VERSION="1.0 2025-01-03"`
	`43`	`+export VERSION="2.0.0 2025-02-28"`
`44`	`44`	`NAME=$(basename "$0")`
`45`	`45`	`export NAME`
`46`	`46`	`#`