Repository.mk | 4 ++--
RepositoryExternal.mk | 6 ++++--
ucb/JunitTest_ucb_webdav_unoapi.mk | 14 ++++++++++++++
ucb/Module_ucb.mk | 1 +
ucb/qa/unoapi/ucb.sce | 2 --
ucb/qa/unoapi/ucb_webdav.sce | 19 +++++++++++++++++++
6 files changed, 40 insertions(+), 6 deletions(-)
New commits:
commit 1fee95ce153a591fcd1921587c1db5d1e67497d1
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Nov 13 07:22:09 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Nov 13 17:59:55 2023 +0300
--disable-curl builds: split WebDAV-related JunitTests to fix checks
Change-Id: I0a46dc226e141eb585817fff4871f8d1681a3f3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159352
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/ucb/JunitTest_ucb_webdav_unoapi.mk
b/ucb/JunitTest_ucb_webdav_unoapi.mk
new file mode 100644
index 000000000000..2675922a3cea
--- /dev/null
+++ b/ucb/JunitTest_ucb_webdav_unoapi.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_JunitTest_JunitTest,ucb_webdav_unoapi))
+
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,ucb_webdav_unoapi))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk
index 7bbcc925e28d..023863ba936a 100644
--- a/ucb/Module_ucb.mk
+++ b/ucb/Module_ucb.mk
@@ -42,6 +42,7 @@ endif
$(eval $(call gb_Module_add_subsequentcheck_targets,ucb,\
JunitTest_ucb_complex \
JunitTest_ucb_unoapi \
+ $(if $(WITH_WEBDAV),JunitTest_ucb_webdav_unoapi) \
))
# vim: set noet sw=4 ts=4:
diff --git a/ucb/qa/unoapi/ucb.sce b/ucb/qa/unoapi/ucb.sce
index 0c798cfdedab..00aa7de2a8b7 100644
--- a/ucb/qa/unoapi/ucb.sce
+++ b/ucb/qa/unoapi/ucb.sce
@@ -18,9 +18,7 @@
-o ucb.UcbContentProviderProxyFactory
-o ucb.UcbPropertiesManager
-o ucb.UcbStore
--o ucb.UniversalContentBroker
-o ucpchelp.CHelpContentProvider
--o ucpdav.WebDAVContentProvider
-o ucpfile.FileProvider
-o ucpftp.FTPContentProvider
-o ucphier.HierarchyContentProvider
diff --git a/ucb/qa/unoapi/ucb_webdav.sce b/ucb/qa/unoapi/ucb_webdav.sce
new file mode 100644
index 000000000000..4ce463cc0bec
--- /dev/null
+++ b/ucb/qa/unoapi/ucb_webdav.sce
@@ -0,0 +1,19 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+-o ucb.UniversalContentBroker
+-o ucpdav.WebDAVContentProvider
commit f5d5c4df9f6a1f303692409960506c9890202042
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Nov 10 21:10:11 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Nov 13 16:12:47 2023 +0300
Fix packaging with --enable-mpl-subset
Change-Id: I1cae9e9a9837df968663b6f46bd1e0d369377126
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159308
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9abad8667cfb..0a8d63493463 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3044,9 +3044,10 @@ endef
else # !SYSTEM_POSTGRESQL
ifeq ($(OS),WNT)
+$(if $(MPL_SUBSET),,\
$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
postgresql \
-))
+)))
endif # WNT
define gb_LinkTarget__use_postgresql
commit 77850a479711ebbc113568fd6e481fa799395ec6
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Nov 10 21:09:11 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Nov 13 16:12:23 2023 +0300
Fix packaging with --disable-curl
Change-Id: I9c3c1f1953c4d59c5a2d4c6017e73768d93a7bc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159307
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/Repository.mk b/Repository.mk
index 56d8b2d28b84..2375470218a9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -368,7 +368,7 @@ endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
avmedia \
- LanguageTool \
+ $(if $(ENABLE_CURL),LanguageTool) \
$(call gb_Helper_optional,AVMEDIA, \
$(if $(filter MACOSX,$(OS)),\
avmediaMacAVF \
@@ -671,7 +671,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
ucbhelper \
$(if $(WITH_WEBDAV),ucpdav1) \
ucpfile1 \
- ucpftp1 \
+ $(if $(ENABLE_CURL),ucpftp1) \
$(call gb_Helper_optional,XMLHELP,ucpchelp1) \
ucphier1 \
ucppkg1 \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 92ea4ba17670..9abad8667cfb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2724,9 +2724,10 @@ endef
else # !SYSTEM_CURL
+$(if $(ENABLE_CURL),\
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
curl \
-))
+)))
define gb_LinkTarget__use_curl
$(call gb_LinkTarget_use_package,$(1),curl)
