Kaydet (Commit) fb0a81d0 authored tarafından Rene Engelhard's avatar Rene Engelhard

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/53553Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 42494bfd
......@@ -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:
......@@ -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:
......@@ -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), )))) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment