From b56cdaca112ad7d5288c507b897c179177ec9a70 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Fri, 16 Dec 2022 02:22:56 +0900 Subject: [PATCH 1/4] Tmain: consider versions other than 5.9.0 when deletig the version strings Signed-off-by: Masatake YAMATO --- Tmain/utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tmain/utils.sh b/Tmain/utils.sh index 57567bc63f..c6b68c3c12 100644 --- a/Tmain/utils.sh +++ b/Tmain/utils.sh @@ -146,5 +146,5 @@ check_encoding() jdropver() { - sed -e 's/, "version": "5.9.0"//' + sed -e 's/, "version": "[0-9.]*"//' } From 0b5fe6ee3f7bc35c74474c4ad96eab8701bde5ab Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sun, 4 Dec 2022 17:04:41 +0900 Subject: [PATCH 2/4] json-writer: version 1.0 Signed-off-by: Masatake YAMATO --- .../json-output-format.d/stdout-expected.txt | 22 +++++++++---------- main/writer-json.c | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Tmain/json-output-format.d/stdout-expected.txt b/Tmain/json-output-format.d/stdout-expected.txt index 9d5b36efd3..d7a0ff29cc 100644 --- a/Tmain/json-output-format.d/stdout-expected.txt +++ b/Tmain/json-output-format.d/stdout-expected.txt @@ -15,7 +15,7 @@ {"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^func main() {$/", "language": "Go", "line": 3, "kind": "func", "signature": "()", "scope": "main", "scopeKind": "package", "roles": "def", "end": 4} {"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^package main$/", "language": "Go", "line": 1, "kind": "package", "roles": "def"} # json --languages=+man --fields=*-T --extras=* -{"_type": "ptag", "name": "JSON_OUTPUT_VERSION", "path": "0.0", "pattern": "in development"} +{"_type": "ptag", "name": "JSON_OUTPUT_VERSION", "path": "1.0", "pattern": "in development"} {"_type": "ptag", "name": "TAG_EXTRA_DESCRIPTION", "path": "anonymous", "pattern": "Include tags for non-named objects like lambda"} {"_type": "ptag", "name": "TAG_EXTRA_DESCRIPTION", "path": "fileScope", "pattern": "Include tags of file scope"} {"_type": "ptag", "name": "TAG_EXTRA_DESCRIPTION", "path": "guest", "pattern": "Include tags generated by guest parsers"} @@ -90,16 +90,16 @@ {"_type": "ptag", "name": "TAG_PROGRAM_AUTHOR", "path": "Universal Ctags Team", "pattern": ""} {"_type": "ptag", "name": "TAG_PROGRAM_NAME", "path": "Universal Ctags", "pattern": "Derived from Exuberant Ctags"} {"_type": "ptag", "name": "TAG_PROGRAM_URL", "path": "https://ctags.io/", "pattern": "official site"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C!header", "path": "local", "pattern": "local header"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C!header", "path": "system", "pattern": "system header"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C!macro", "path": "undef", "pattern": "undefined"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Go!package", "path": "imported", "pattern": "imported package"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Go!unknown", "path": "receiverType", "pattern": "receiver type"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!module", "path": "imported", "pattern": "imported modules"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!module", "path": "indirectlyImported", "pattern": "module imported in alternative name"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!module", "path": "namespace", "pattern": "namespace from where classes\\/variables\\/functions are imported"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!unknown", "path": "imported", "pattern": "imported from the other module"} -{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!unknown", "path": "indirectlyImported", "pattern": "classes\\/variables\\/functions\\/modules imported in alternative name"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C", "kindName": "header", "path": "local", "pattern": "local header"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C", "kindName": "header", "path": "system", "pattern": "system header"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C", "kindName": "macro", "path": "undef", "pattern": "undefined"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Go", "kindName": "package", "path": "imported", "pattern": "imported package"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Go", "kindName": "unknown", "path": "receiverType", "pattern": "receiver type"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "module", "path": "imported", "pattern": "imported modules"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "module", "path": "indirectlyImported", "pattern": "module imported in alternative name"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "module", "path": "namespace", "pattern": "namespace from where classes\\/variables\\/functions are imported"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "unknown", "path": "imported", "pattern": "imported from the other module"} +{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "unknown", "path": "indirectlyImported", "pattern": "classes\\/variables\\/functions\\/modules imported in alternative name"} {"_type": "tag", "name": "Foo", "path": "input.py", "pattern": "/^class Foo:$/", "language": "Python", "line": 1, "kind": "class", "inherits": false, "access": "public", "roles": "def", "end": 3} {"_type": "tag", "name": "Foo.doIt", "path": "input.py", "pattern": "/^ def doIt():$/", "language": "Python", "line": 2, "kind": "member", "access": "public", "signature": "()", "scope": "Foo", "scopeKind": "class", "roles": "def", "extras": "qualified", "end": 3} {"_type": "tag", "name": "N\tA\tM\tE", "path": "input.1", "pattern": "/^.SH \"\tN\tA\tM\tE\t\"$/", "language": "Man", "line": 1, "kind": "section", "roles": "def", "end": 1} diff --git a/main/writer-json.c b/main/writer-json.c index 7d6ac9443b..fe5280dfbe 100644 --- a/main/writer-json.c +++ b/main/writer-json.c @@ -35,7 +35,7 @@ * If they have been added since last release, increment AGE. * If they have been removed since last release, set AGE to 0 */ -#define JSON_WRITER_CURRENT 0 +#define JSON_WRITER_CURRENT 1 #define JSON_WRITER_AGE 0 #ifndef json_boolean /* compat with jansson < 2.4 */ From c2ebf59c47be43bbd8db83f8a73f5161a42e35d6 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sun, 4 Dec 2022 17:12:07 +0900 Subject: [PATCH 3/4] ctags 6.0.0 Signed-off-by: Masatake YAMATO --- configure.ac | 2 +- docs/man/ctags-client-tools.7.rst | 2 +- docs/man/ctags-faq.7.rst | 2 +- docs/man/ctags-incompatibilities.7.rst | 2 +- docs/man/ctags-lang-asm.7.rst | 2 +- docs/man/ctags-lang-elm.7.rst | 2 +- docs/man/ctags-lang-gdscript.7.rst | 2 +- docs/man/ctags-lang-iPythonCell.7.rst | 2 +- docs/man/ctags-lang-inko.7.rst | 2 +- docs/man/ctags-lang-javascript.7.rst | 2 +- docs/man/ctags-lang-julia.7.rst | 2 +- docs/man/ctags-lang-python.7.rst | 2 +- docs/man/ctags-lang-r.7.rst | 2 +- docs/man/ctags-lang-rmarkdown.7.rst | 2 +- docs/man/ctags-lang-sql.7.rst | 2 +- docs/man/ctags-lang-tcl.7.rst | 2 +- docs/man/ctags-lang-verilog.7.rst | 2 +- docs/man/ctags-optlib.7.rst | 2 +- docs/man/ctags.1.rst | 2 +- docs/man/readtags.1.rst | 2 +- main/ctags.h | 2 +- misc/git-tag-maybe.sh | 2 +- win32/config_mingw.h | 6 +++--- win32/ctags.exe.manifest | 2 +- win32/ctags.rc | 4 ++-- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/configure.ac b/configure.ac index b2a63d4897..a7da482fe5 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.64]) -AC_INIT([universal-ctags],[5.9.0]) +AC_INIT([universal-ctags],[6.0.0]) if ! test -e "${srcdir}/config.h.in"; then echo "---" diff --git a/docs/man/ctags-client-tools.7.rst b/docs/man/ctags-client-tools.7.rst index 38ca150edd..d2d6e98650 100644 --- a/docs/man/ctags-client-tools.7.rst +++ b/docs/man/ctags-client-tools.7.rst @@ -6,7 +6,7 @@ ctags-client-tools Hints for developing a tool using ctags command and tags output -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-faq.7.rst b/docs/man/ctags-faq.7.rst index 4bd947e295..cab6f7da2c 100644 --- a/docs/man/ctags-faq.7.rst +++ b/docs/man/ctags-faq.7.rst @@ -6,7 +6,7 @@ ctags-faq Universal Ctags FAQ -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-incompatibilities.7.rst b/docs/man/ctags-incompatibilities.7.rst index 6fb684bafd..5b07199df1 100644 --- a/docs/man/ctags-incompatibilities.7.rst +++ b/docs/man/ctags-incompatibilities.7.rst @@ -6,7 +6,7 @@ ctags-incompatibilities Incompatibilities between Universal Ctags and Exuberant Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-asm.7.rst b/docs/man/ctags-lang-asm.7.rst index c2b55cf052..bacf021460 100644 --- a/docs/man/ctags-lang-asm.7.rst +++ b/docs/man/ctags-lang-asm.7.rst @@ -6,7 +6,7 @@ ctags-lang-asm Random notes about tagging Assembly language source code with Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-elm.7.rst b/docs/man/ctags-lang-elm.7.rst index 7a70d6303a..d130045a04 100644 --- a/docs/man/ctags-lang-elm.7.rst +++ b/docs/man/ctags-lang-elm.7.rst @@ -6,7 +6,7 @@ ctags-lang-elm Random notes about tagging Elm source code with Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-gdscript.7.rst b/docs/man/ctags-lang-gdscript.7.rst index 836cf7d5ec..098d6c8d3f 100644 --- a/docs/man/ctags-lang-gdscript.7.rst +++ b/docs/man/ctags-lang-gdscript.7.rst @@ -6,7 +6,7 @@ ctags-lang-gdscript Random notes about tagging GDScript source code with Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-iPythonCell.7.rst b/docs/man/ctags-lang-iPythonCell.7.rst index 9688fac863..7e44455c45 100644 --- a/docs/man/ctags-lang-iPythonCell.7.rst +++ b/docs/man/ctags-lang-iPythonCell.7.rst @@ -6,7 +6,7 @@ ctags-lang-iPythonCell The man page of the iPythonCell parser for Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-inko.7.rst b/docs/man/ctags-lang-inko.7.rst index 3d0c89c558..8b729e0268 100644 --- a/docs/man/ctags-lang-inko.7.rst +++ b/docs/man/ctags-lang-inko.7.rst @@ -4,7 +4,7 @@ ctags-lang-inko ====================================================================== -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-javascript.7.rst b/docs/man/ctags-lang-javascript.7.rst index 4c50d7a292..8da9482550 100644 --- a/docs/man/ctags-lang-javascript.7.rst +++ b/docs/man/ctags-lang-javascript.7.rst @@ -6,7 +6,7 @@ ctags-lang-javascript Random notes about tagging JavaScript source code with Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-julia.7.rst b/docs/man/ctags-lang-julia.7.rst index c099c2be7a..452f19ad25 100644 --- a/docs/man/ctags-lang-julia.7.rst +++ b/docs/man/ctags-lang-julia.7.rst @@ -6,7 +6,7 @@ ctags-lang-julia Random notes about tagging Julia source code with Universal-ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal-ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-python.7.rst b/docs/man/ctags-lang-python.7.rst index 6630bd3b9a..9fd2686428 100644 --- a/docs/man/ctags-lang-python.7.rst +++ b/docs/man/ctags-lang-python.7.rst @@ -6,7 +6,7 @@ ctags-lang-python Random notes about tagging python source code with Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-r.7.rst b/docs/man/ctags-lang-r.7.rst index cae9b0c9ed..722fe5df99 100644 --- a/docs/man/ctags-lang-r.7.rst +++ b/docs/man/ctags-lang-r.7.rst @@ -6,7 +6,7 @@ ctags-lang-r Random notes about tagging R source code with Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-rmarkdown.7.rst b/docs/man/ctags-lang-rmarkdown.7.rst index 96281b7348..b4535b2349 100644 --- a/docs/man/ctags-lang-rmarkdown.7.rst +++ b/docs/man/ctags-lang-rmarkdown.7.rst @@ -6,7 +6,7 @@ ctags-lang-rmarkdown Random notes about tagging R Markdown source code with Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-sql.7.rst b/docs/man/ctags-lang-sql.7.rst index 4ebad37ead..e6418d4079 100644 --- a/docs/man/ctags-lang-sql.7.rst +++ b/docs/man/ctags-lang-sql.7.rst @@ -6,7 +6,7 @@ ctags-lang-sql The man page of the SQL parser for Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-tcl.7.rst b/docs/man/ctags-lang-tcl.7.rst index fa324aacd7..b105b79675 100644 --- a/docs/man/ctags-lang-tcl.7.rst +++ b/docs/man/ctags-lang-tcl.7.rst @@ -6,7 +6,7 @@ ctags-lang-tcl Random notes about tagging tcl source code with Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-lang-verilog.7.rst b/docs/man/ctags-lang-verilog.7.rst index 47c8242d30..e6691cd082 100644 --- a/docs/man/ctags-lang-verilog.7.rst +++ b/docs/man/ctags-lang-verilog.7.rst @@ -7,7 +7,7 @@ ctags-lang-verilog The man page about SystemVerilog/Verilog parser for Universal Ctags -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags-optlib.7.rst b/docs/man/ctags-optlib.7.rst index f39094c81e..d1f6eb7424 100644 --- a/docs/man/ctags-optlib.7.rst +++ b/docs/man/ctags-optlib.7.rst @@ -6,7 +6,7 @@ ctags-optlib Universal Ctags parser definition language -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 7 diff --git a/docs/man/ctags.1.rst b/docs/man/ctags.1.rst index 6bca79d3f3..c8c4eea6c5 100644 --- a/docs/man/ctags.1.rst +++ b/docs/man/ctags.1.rst @@ -6,7 +6,7 @@ ctags Generate tag files for source code -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 1 diff --git a/docs/man/readtags.1.rst b/docs/man/readtags.1.rst index 78d13202bc..c80f17b868 100644 --- a/docs/man/readtags.1.rst +++ b/docs/man/readtags.1.rst @@ -6,7 +6,7 @@ readtags Find tag file entries matching specified names -:Version: 5.9.0 +:Version: 6.0.0 :Manual group: Universal Ctags :Manual section: 1 diff --git a/main/ctags.h b/main/ctags.h index 74644c8fa4..db169bd538 100644 --- a/main/ctags.h +++ b/main/ctags.h @@ -41,7 +41,7 @@ #if defined (HAVE_CONFIG_H) # define PROGRAM_VERSION PACKAGE_VERSION #else -# define PROGRAM_VERSION "5.9.0" +# define PROGRAM_VERSION "6.0.0" #endif #define PROGRAM_NAME "Universal Ctags" #define PROGRAM_URL "https://ctags.io/" diff --git a/misc/git-tag-maybe.sh b/misc/git-tag-maybe.sh index 3ea641cd9e..0a94150df4 100755 --- a/misc/git-tag-maybe.sh +++ b/misc/git-tag-maybe.sh @@ -23,7 +23,7 @@ run() { ##################################### main ####################################### -base=5.9 +base=6.0 cal=$(date +%Y%m%d) chicken=0 new_tagname="p${base}.${cal}.${chicken}" diff --git a/win32/config_mingw.h b/win32/config_mingw.h index 7990ea4fbf..9ecdbe1c7a 100644 --- a/win32/config_mingw.h +++ b/win32/config_mingw.h @@ -506,7 +506,7 @@ #define PACKAGE_NAME "universal-ctags" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "universal-ctags 5.9.0" +#define PACKAGE_STRING "universal-ctags 6.0.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "universal-ctags" @@ -515,7 +515,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.9.0" +#define PACKAGE_VERSION "6.0.0" /* Define if the pthread_in_use() detection is hard. */ /* #undef PTHREAD_IN_USE_DETECTION_HARD */ @@ -657,7 +657,7 @@ /* #undef USE_WINDOWS_THREADS */ /* Package version. */ -#define VERSION "5.9.0" +#define VERSION "6.0.0" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'wchar_t'. */ diff --git a/win32/ctags.exe.manifest b/win32/ctags.exe.manifest index 923dc5c72e..74402bb920 100644 --- a/win32/ctags.exe.manifest +++ b/win32/ctags.exe.manifest @@ -1,6 +1,6 @@ - + diff --git a/win32/ctags.rc b/win32/ctags.rc index 1d24d2afde..c6aae220ac 100644 --- a/win32/ctags.rc +++ b/win32/ctags.rc @@ -76,12 +76,12 @@ BEGIN BEGIN VALUE "CompanyName", "Universal Ctags Team" VALUE "FileDescription", "Universal Ctags" - VALUE "FileVersion", "5.9.0.0" + VALUE "FileVersion", "6.0.0.0" VALUE "InternalName", "ctags.exe" VALUE "LegalCopyright", "Copyright \251 2015-2022 Universal Ctags Team" VALUE "OriginalFilename", "ctags.exe" VALUE "ProductName", "Universal Ctags" - VALUE "ProductVersion", "5.9.0.0" + VALUE "ProductVersion", "6.0.0.0" END END BLOCK "VarFileInfo" From 373863f607904f4f4fc7ac20658b76ce9bb83712 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Thu, 8 Dec 2022 20:43:03 +0900 Subject: [PATCH 4/4] Revert "GitHub Actions: disable tagging temporarily" This reverts commit 441e4a7549d6aa7fa9ec538bb8a8709d348ba031. We are ready to weekly tagging again. --- misc/git-tag-maybe.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/misc/git-tag-maybe.sh b/misc/git-tag-maybe.sh index 0a94150df4..2c0630dfb4 100755 --- a/misc/git-tag-maybe.sh +++ b/misc/git-tag-maybe.sh @@ -2,9 +2,6 @@ set -e -echo tagging is disabled temporary -exit 0 - ##################################### util ####################################### COLOR_RED='\033[0;31m' # Red