From f5adcba3fb354725e0cf3515ec75abf36d20b0ed Mon Sep 17 00:00:00 2001 From: Quentin Rouland Date: Sat, 21 Sep 2019 22:58:19 +0200 Subject: [PATCH] Add libgit2 as third dependencies TG-40 --- .gitmodules | 18 +++--------------- clickable.json | 43 ++++++++++++++++++++++++------------------- libs/libgit2 | 1 + 3 files changed, 28 insertions(+), 34 deletions(-) create mode 160000 libs/libgit2 diff --git a/.gitmodules b/.gitmodules index 7d8d177..47ddbbf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,3 @@ -[submodule "third/gpgme"] - path = libs/gpg/gpgme - url = https://github.com/gpg/gpgme -[submodule "third/libassuan"] - path = libs/gpg/libassuan - url = https://github.com/gpg/libassuan -[submodule "third/libgpg-error"] - path = libs/gpg/libgpg-error - url = https://github.com/gpg/libgpg-error -[submodule "third/gnupg"] - path = libs/gpg/gnupg - url = https://github.com/gpg/gnupg -[submodule "libs/utils/quazip"] - path = libs/quazip - url = https://github.com/stachenov/quazip [submodule "libs/gpg/gpgme"] path = libs/gpg/gpgme url = https://github.com/gpg/gpgme @@ -28,3 +13,6 @@ [submodule "libs/quazip"] path = libs/quazip url = https://github.com/stachenov/quazip +[submodule "libs/libgit2"] + path = libs/libgit2 + url = https://github.com/libgit2/libgit2 diff --git a/clickable.json b/clickable.json index 7e9e480..b46ff8d 100644 --- a/clickable.json +++ b/clickable.json @@ -1,22 +1,27 @@ { - "template": "cmake", - "kill": "UTPass", - "scripts": { + "template": "cmake", + "kill": "UTPass", + "scripts": { "style": "echo 'Astyle :' && astyle --options=.astylerc main.cpp && astyle --options=.astylerc --recursive 'plugins/*.cpp,*.h' && echo 'QmlFmt :' && qmlfmt -l tests && qmlfmt -w tests && qmlfmt -l qml && qmlfmt -w qml" - }, - "libraries": { - "gpg": { - "template": "cmake", - "make_jobs": 4, - "dependencies_build": [ - "texinfo", - "gpgsm", - "bison" - ] - }, - "quazip": { - "template": "cmake", - "make_jobs": 4 - } - } + }, + "libraries": { + "gpg": { + "template": "cmake", + "make_jobs": 4, + "dependencies_build": [ + "texinfo", + "gpgsm", + "bison" + ] + }, + "quazip": { + "template": "cmake", + "make_jobs": 4 + }, + "libgit2": { + "template": "cmake", + "make_jobs": 4, + "build_args": "-DBUILD_SHARED_LIBS=OFF" + } + } } diff --git a/libs/libgit2 b/libs/libgit2 new file mode 160000 index 0000000..3828d7a --- /dev/null +++ b/libs/libgit2 @@ -0,0 +1 @@ +Subproject commit 3828d7afdd08b595584048e8e4dab6ddd4506ed1