sfx2/UITest_sfx2_doc.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit d3f662245ba81a0d775aab670c0d920cf347aa48
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue May 23 21:22:42 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed May 24 17:28:40 2023 +0200
revert apparent overwrite of UITest_sfx2_doc.mk with
ExternalPackage_libffi.mk
sfx2/UITest_sfx2_doc.mk:12: *** gb_ExternalPackage_use_external_project:
only one project allowed. Stop.
in:
commit d2715de5b0a3bd4b5eabe99d8cf1edf52ca5b65f
Date: Tue Jul 14 23:35:57 2020 +0200
python3: update to 3.8.4
Change-Id: I6869376eebbfbb7509bb38df7a80a06eb032ee73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152177
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sfx2/UITest_sfx2_doc.mk b/sfx2/UITest_sfx2_doc.mk
index 61b0a1ca460c..b5e3ef8cebde 100644
--- a/sfx2/UITest_sfx2_doc.mk
+++ b/sfx2/UITest_sfx2_doc.mk
@@ -7,14 +7,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libffi,libffi))
+$(eval $(call gb_UITest_UITest,sfx2_doc))
-$(eval $(call gb_ExternalPackage_use_external_project,libffi,libffi))
+$(eval $(call gb_UITest_add_modules,sfx2_doc,$(SRCDIR)/sfx2/qa/uitest,\
+ doc/ \
+))
-ifeq ($(COM),MSC)
-$(eval $(call
gb_ExternalPackage_add_files,libffi,$(LIBO_LIB_FOLDER)/python-core-$(PYTHON_VERSION)/lib,
\
- $(HOST_PLATFORM)/.libs/libffi-7.dll \
+$(eval $(call gb_UITest_set_defs,sfx2_doc, \
+ TDOC="$(SRCDIR)/sfx2/qa/uitest/doc/data" \
))
-endif
# vim: set noet sw=4 ts=4:
