mirror of
https://github.com/savoirfairelinux/jami-client-qt.git
synced 2025-12-19 01:52:30 +08:00
packaging: add missing submodule
The ZXing-C++ library was recently added to the project as a git submodule, but some of the packaging scripts were not updated accordingly. GitLab: #1947 Change-Id: Ic5324bd807e30bec44c0e07076b1f38903e12895
This commit is contained in:
3
extras/packaging/gnu-linux/Jenkinsfile
vendored
3
extras/packaging/gnu-linux/Jenkinsfile
vendored
@@ -33,7 +33,8 @@
|
|||||||
def SUBMODULES = ['daemon',
|
def SUBMODULES = ['daemon',
|
||||||
'3rdparty/SortFilterProxyModel',
|
'3rdparty/SortFilterProxyModel',
|
||||||
'3rdparty/md4c',
|
'3rdparty/md4c',
|
||||||
'3rdparty/tidy-html5']
|
'3rdparty/tidy-html5',
|
||||||
|
'3rdparty/zxing-cpp']
|
||||||
def TARGETS = [:]
|
def TARGETS = [:]
|
||||||
def REMOTE_HOST = env.SSH_HOST_DL_RING_CX
|
def REMOTE_HOST = env.SSH_HOST_DL_RING_CX
|
||||||
def REMOTE_BASE_DIR = '/srv/repository/ring'
|
def REMOTE_BASE_DIR = '/srv/repository/ring'
|
||||||
|
|||||||
@@ -127,7 +127,8 @@ $(RELEASE_TARBALL_FILENAME): tarballs.manifest
|
|||||||
. \
|
. \
|
||||||
./3rdparty/SortFilterProxyModel \
|
./3rdparty/SortFilterProxyModel \
|
||||||
./3rdparty/md4c \
|
./3rdparty/md4c \
|
||||||
./3rdparty/tidy-html5; do \
|
./3rdparty/tidy-html5 \
|
||||||
|
./3rdparty/zxing-cpp; do \
|
||||||
(cd "$$m" && git archive --prefix "$$m/" HEAD \
|
(cd "$$m" && git archive --prefix "$$m/" HEAD \
|
||||||
| tar xf - -C $(TMPDIR)/$(RELEASE_DIRNAME)); \
|
| tar xf - -C $(TMPDIR)/$(RELEASE_DIRNAME)); \
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -211,6 +211,7 @@ def init_submodules():
|
|||||||
"3rdparty/SortFilterProxyModel",
|
"3rdparty/SortFilterProxyModel",
|
||||||
"3rdparty/md4c",
|
"3rdparty/md4c",
|
||||||
"3rdparty/tidy-html5",
|
"3rdparty/tidy-html5",
|
||||||
|
"3rdparty/zxing-cpp",
|
||||||
]
|
]
|
||||||
if execute_cmd(["git", "submodule", "update", "--init" ] + submodules,
|
if execute_cmd(["git", "submodule", "update", "--init" ] + submodules,
|
||||||
False):
|
False):
|
||||||
|
|||||||
Reference in New Issue
Block a user