odk/CustomTarget_build-examples.mk | 2 +-
odk/CustomTarget_build-examples_java.mk | 4 ++--
odk/build-examples_common.mk | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit fb0a81d04cc4b425bbd7dd9b8e32d8d9b6c3bc4e
Author: Rene Engelhard <r...@debian.org>
Date: Fri Apr 27 10:20:05 2018 +0200
add a second argument to the odk_build-examples_test "template"
... as two times my_example_dirs (probably) runs into the same
"global variable" issue like with testname=
Change-Id: I40dcff8e1e01c0cf557143432003bd9d8787bce1
Reviewed-on: https://gerrit.libreoffice.org/53553
Reviewed-by: Michael Stahl <michael.st...@cib.de>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/odk/CustomTarget_build-examples.mk
b/odk/CustomTarget_build-examples.mk
index c72efef71b85..de3e9653f336 100644
--- a/odk/CustomTarget_build-examples.mk
+++ b/odk/CustomTarget_build-examples.mk
@@ -29,6 +29,6 @@ my_example_dirs = \
# cpp/custompanel \
-$(eval $(call odk_build-examples_test,odk/build-examples))
+$(eval $(call odk_build-examples_test,odk/build-examples,$(my_example_dirs)))
# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_build-examples_java.mk
b/odk/CustomTarget_build-examples_java.mk
index 6d77ac50f039..f49429677e0e 100644
--- a/odk/CustomTarget_build-examples_java.mk
+++ b/odk/CustomTarget_build-examples_java.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-my_example_dirs = \
+my_example_dirs_java = \
DevelopersGuide/BasicAndDialogs/CreatingDialogs \
DevelopersGuide/Charts \
DevelopersGuide/Components/Addons/JobsAddon \
@@ -57,6 +57,6 @@ my_example_dirs = \
# java/NotesAccess \
# java/Storage \
-$(eval $(call odk_build-examples_test,odk/build-examples_java))
+$(eval $(call
odk_build-examples_test,odk/build-examples_java,$(my_example_dirs_java)))
# vim: set noet sw=4 ts=4:
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index c0c5e0e8b8a6..1f07208bfe3e 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -19,7 +19,7 @@ endif
&& $(gb_Helper_LIBRARY_PATH_VAR)=$$saved_library_path) \
&& export \
UserInstallation=$(call gb_Helper_make_url,$(call
gb_CustomTarget_get_workdir,$(1))/user) \
- $(foreach my_dir,$(my_example_dirs), \
+ $(foreach my_dir,$(2), \
&& (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
&& printf 'yes\n' | LC_ALL=C make \
$(if $(filter MACOSX,$(OS)), SHELL=$(ODK_BUILD_SHELL), ))))
\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
