From: Takashi Sawanaka Date: Thu, 14 Sep 2023 23:59:45 +0000 (+0900) Subject: Update jq to version 1.7 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8fad452ef16963670758cabd80d4288fb2a453ca;p=winmerge-jp%2Fwinmerge-jp.git Update jq to version 1.7 --- diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index fd4c65f15..d33c6a15a 100644 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@ -29,8 +29,8 @@ https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-ARM64.zip!Build\ARM64\Release ^ https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-w32-mt-XP.zip!Build\tidy-html5 ^ https://github.com/htacg/tidy-html5/archive/refs/tags/5.4.0.zip!Build\tidy-html5 ^ -https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win32.exe!Build\jq ^ -https://github.com/stedolan/jq/archive/refs/tags/jq-1.6.zip!Build\jq ^ +https://github.com/jqlang/jq/releases/download/jq-1.7/jq-win32.exe!Build\jq ^ +https://github.com/jqlang/jq/archive/refs/tags/jq-1.7.zip!Build\jq ^ https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-v1.5.2-win64.zip!Build\zstd ^ https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-md4c-0.4.8-2-any.pkg.tar.zst!Build\md4c ^ https://mirror.msys2.org/msys/i686/gcc-libs-10.2.0-1-i686.pkg.tar.zst!Build\msys2_tmp ^ diff --git a/Externals/jq b/Externals/jq index 2e01ff1fb..11c528d04 160000 --- a/Externals/jq +++ b/Externals/jq @@ -1 +1 @@ -Subproject commit 2e01ff1fb69609540b2bdc4e62a60499f2b2fb8e +Subproject commit 11c528d04d76c9b9553781aa76b073e4f40da008 diff --git a/Externals/versions.txt b/Externals/versions.txt index 43fadd934..97aabde78 100644 --- a/Externals/versions.txt +++ b/Externals/versions.txt @@ -18,6 +18,6 @@ This file lists versions of the external components we are using. - 7-zip: 23.01 - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff) - html-tidy5: 5.4.0 -- jq: 1.6 +- jq: 1.7 - wil: 209ff9c7e30e71bf6d1405557bf78544920f8157 on Sep 9, 2021 - md4c: 0.4.8 diff --git a/Installer/InnoSetup/WinMergeARM64.is6.iss b/Installer/InnoSetup/WinMergeARM64.is6.iss index 2fd98c7c6..64dd6b428 100644 --- a/Installer/InnoSetup/WinMergeARM64.is6.iss +++ b/Installer/InnoSetup/WinMergeARM64.is6.iss @@ -619,7 +619,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins ; jq Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins -Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins +Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins ; md4c Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins diff --git a/Installer/InnoSetup/WinMergeX64.is6.iss b/Installer/InnoSetup/WinMergeX64.is6.iss index 2a4ecc94e..4a2d9d10d 100644 --- a/Installer/InnoSetup/WinMergeX64.is6.iss +++ b/Installer/InnoSetup/WinMergeX64.is6.iss @@ -618,7 +618,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins ; jq Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins -Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins +Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins ; md4c Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss index ab7a5740c..2d0a34ef4 100644 --- a/Installer/InnoSetup/WinMergeX64.iss +++ b/Installer/InnoSetup/WinMergeX64.iss @@ -610,7 +610,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins ; jq Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins -Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins +Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins ; md4c Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins diff --git a/Installer/InnoSetup/WinMergeX64NonAdmin.iss b/Installer/InnoSetup/WinMergeX64NonAdmin.iss index 50fae8aca..b2abf7afa 100644 --- a/Installer/InnoSetup/WinMergeX64NonAdmin.iss +++ b/Installer/InnoSetup/WinMergeX64NonAdmin.iss @@ -609,7 +609,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins ; jq Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins -Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins +Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins ; md4c Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins diff --git a/Installer/InnoSetup/WinMergeX86.iss b/Installer/InnoSetup/WinMergeX86.iss index 731c29d49..0278ab0f5 100755 --- a/Installer/InnoSetup/WinMergeX86.iss +++ b/Installer/InnoSetup/WinMergeX86.iss @@ -632,7 +632,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins ; jq Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins -Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins +Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins ; md4c Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins