diff options
| author | Rene Engelhard <rene@debian.org> | 2018-04-25 15:53:03 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2018-04-25 20:57:47 +0200 |
| commit | e514db95679658dfdb91a775999793d32de36cff (patch) | |
| tree | 10e9899cacaddf80d5d2e0b04ed0f5d783d4726a /odk/build-examples_common.mk | |
| parent | 70882a41a7645aa279bd08b0ba35e89ceacde56a (diff) | |
fix build
Change-Id: If2315987d2447b1a44f3e62384f03d2621be7106
Reviewed-on: https://gerrit.libreoffice.org/53455
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Rene Engelhard <rene@debian.org>
Diffstat (limited to 'odk/build-examples_common.mk')
| -rw-r--r-- | odk/build-examples_common.mk | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk index 5847c3bc29a8..c0142d3c633b 100644 --- a/odk/build-examples_common.mk +++ b/odk/build-examples_common.mk @@ -1,44 +1,52 @@ -$(call gb_CustomTarget_get_target,$(testname)): \ - $(call gb_CustomTarget_get_workdir,$(testname))/setsdkenv +define odk_build-examples_test + +$(eval $(call gb_CustomTarget_CustomTarget,$(1))) + +$(call gb_CustomTarget_get_target,$(1)): \ + $(call gb_CustomTarget_get_workdir,$(1))/setsdkenv ifneq ($(gb_SUPPRESS_TESTS),) @true else - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) - rm -fr $(call gb_CustomTarget_get_workdir,$(testname))/{out,user} + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$(1)),$(true),CHK,1) + rm -fr $(call gb_CustomTarget_get_workdir,$(1))/{out,user} ifeq (MACOSX,$(OS)) $(eval ODK_BUILD_SHELL := $(shell $(gb_MKTEMP))) cp /bin/sh "$(ODK_BUILD_SHELL)" chmod 0700 "$(ODK_BUILD_SHELL)" endif - (saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $< \ + (saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $$< \ $(if $(filter MACOSX,$(OS)),, \ && $(gb_Helper_LIBRARY_PATH_VAR)=$$saved_library_path) \ && export \ - UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,$(testname))/user) \ + UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,$(1))/user) \ $(foreach my_dir,$(my_example_dirs), \ && (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \ && printf 'yes\n' | LC_ALL=C make \ $(if $(filter MACOSX,$(OS)), SHELL=$(ODK_BUILD_SHELL), )))) \ - >$(call gb_CustomTarget_get_workdir,$(testname))/log 2>&1 \ + >$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \ || (RET=$$? \ $(if $(filter MACOSX,$(OS)), && rm -f $(ODK_BUILD_SHELL) , ) \ - && cat $(call gb_CustomTarget_get_workdir,$(testname))/log \ + && cat $(call gb_CustomTarget_get_workdir,$(1))/log \ && exit $$RET) ifeq (MACOSX,$(OS)) -rm -f $(ODK_BUILD_SHELL) endif endif -$(call gb_CustomTarget_get_workdir,$(testname))/setsdkenv: \ +$(call gb_CustomTarget_get_workdir,$(1))/setsdkenv: \ $(SRCDIR)/odk/config/setsdkenv_unix.sh.in \ $(BUILDDIR)/config_$(gb_Side).mk | \ - $(call gb_CustomTarget_get_workdir,$(testname))/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) + $(call gb_CustomTarget_get_workdir,$(1))/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$(1)),$(true),SED,1) sed -e 's!@OO_SDK_NAME@!sdk!' \ -e 's!@OO_SDK_HOME@!$(INSTDIR)/$(SDKDIRNAME)!' \ -e 's!@OFFICE_HOME@!$(INSTROOTBASE)!' -e 's!@OO_SDK_MAKE_HOME@!!' \ -e 's!@OO_SDK_ZIP_HOME@!!' -e 's!@OO_SDK_CAT_HOME@!!' \ -e 's!@OO_SDK_SED_HOME@!!' -e 's!@OO_SDK_CPP_HOME@!!' \ -e 's!@OO_SDK_JAVA_HOME@!$(JAVA_HOME)!' \ - -e 's!@OO_SDK_OUTPUT_DIR@!$(call gb_CustomTarget_get_workdir,$(testname))/out!' \ - -e 's!@SDK_AUTO_DEPLOYMENT@!YES!' $< > $@ + -e 's!@OO_SDK_OUTPUT_DIR@!$(call gb_CustomTarget_get_workdir,$(1))/out!' \ + -e 's!@SDK_AUTO_DEPLOYMENT@!YES!' $$< > $$@ + +.PHONY: $(call gb_CustomTarget_get_target,$(1)) + +endef |