From 32b7525ee36670b4d68b41ac0edbf478d3d76e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?= Date: Fri, 9 May 2025 21:19:46 -0400 Subject: [PATCH] packaging: add missing submodule The Hunspell library was added to the project as a git submodule in commit 2a72da5, but some packaging scripts were not updated accordingly. GitLab: #1997 Change-Id: I5e6079fc23aeecfba2076067ecf5c4ed1f5a591a --- extras/packaging/gnu-linux/Jenkinsfile | 3 ++- extras/packaging/gnu-linux/Makefile | 3 ++- extras/scripts/build-windows.py | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/extras/packaging/gnu-linux/Jenkinsfile b/extras/packaging/gnu-linux/Jenkinsfile index 56a23854..f7ac4713 100644 --- a/extras/packaging/gnu-linux/Jenkinsfile +++ b/extras/packaging/gnu-linux/Jenkinsfile @@ -34,7 +34,8 @@ def SUBMODULES = ['daemon', '3rdparty/SortFilterProxyModel', '3rdparty/md4c', '3rdparty/tidy-html5', - '3rdparty/zxing-cpp'] + '3rdparty/zxing-cpp', + '3rdparty/hunspell'] def TARGETS = [:] def REMOTE_HOST = env.SSH_HOST_DL_RING_CX def REMOTE_BASE_DIR = '/srv/repository/ring' diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile index 48e19d9e..bb6e7311 100644 --- a/extras/packaging/gnu-linux/Makefile +++ b/extras/packaging/gnu-linux/Makefile @@ -128,7 +128,8 @@ $(RELEASE_TARBALL_FILENAME): tarballs.manifest ./3rdparty/SortFilterProxyModel \ ./3rdparty/md4c \ ./3rdparty/tidy-html5 \ - ./3rdparty/zxing-cpp; do \ + ./3rdparty/zxing-cpp \ + ./3rdparty/hunspell; do \ (cd "$$m" && git archive --prefix "$$m/" HEAD \ | tar xf - -C $(TMPDIR)/$(RELEASE_DIRNAME)); \ done diff --git a/extras/scripts/build-windows.py b/extras/scripts/build-windows.py index 65f8d0c0..27cc051c 100644 --- a/extras/scripts/build-windows.py +++ b/extras/scripts/build-windows.py @@ -212,6 +212,7 @@ def init_submodules(): "3rdparty/md4c", "3rdparty/tidy-html5", "3rdparty/zxing-cpp", + "3rdparty/hunspell", ] if execute_cmd(["git", "submodule", "update", "--init" ] + submodules, False):