summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--solenv/gbuild/CliUnoApi.mk123
-rw-r--r--solenv/gbuild/TargetLocations.mk6
-rw-r--r--testtools/CustomTarget_bridgetest_climaker.mk4
4 files changed, 43 insertions, 92 deletions
diff --git a/Makefile.in b/Makefile.in
index 47f507a892c4..9c78dbf8fee1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,7 +104,7 @@ gbuild_TARGETS := AllLangHelp \
AutoInstall \
CliLibrary \
CliNativeLibrary \
- CliUnoApiTarget \
+ CliUnoApi \
Configuration \
CppunitTest \
CustomTarget \
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 63ba9e75ffec..1ce38441ec23 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -7,17 +7,19 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# CliUnoApiTarget class
+# CliUnoApi class
+
+gb_CliUnoApi_EXT := $(gb_CliAssembly_POLICYEXT)
-gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT)
+gb_CliUnoApi_KEYFILE_DEFAULT := $(gb_CliAssembly_KEYFILE_DEFAULT)
-gb_CliUnoApiTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker)
-gb_CliUnoApiTarget_COMMAND := $(call gb_Executable_get_command,climaker)
+gb_CliUnoApi_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker)
+gb_CliUnoApi_COMMAND := $(call gb_Executable_get_command,climaker)
-define gb_CliUnoApiTarget__command
+define gb_CliUnoApi__command
$(call gb_Output_announce,$(2),$(true),CLI,4)
$(call gb_Helper_abbreviate_dirs,\
- $(gb_CliUnoApiTarget_COMMAND) \
+ $(gb_CliUnoApi_COMMAND) \
--out $(1) \
--assembly-company "LibreOffice" \
--assembly-description "This assembly contains metadata for the LibreOffice API." \
@@ -29,96 +31,38 @@ $(call gb_Helper_abbreviate_dirs,\
)
endef
-$(dir $(call gb_CliUnoApiTarget_get_target,%)).dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_CliUnoApiTarget_get_target,%) : $(gb_CliUnoApiTarget_DEPS)
- $(call gb_CliUnoApiTarget__command,$@,$*,$<)
-
-.PHONY : $(call gb_CliUnoApiTarget_get_clean_target,%)
-$(call gb_CliUnoApiTarget_get_clean_target,%) :
+.PHONY : $(call gb_CliUnoApi_get_clean_target,%)
+$(call gb_CliUnoApi_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),CLI,4)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_CliUnoApiTarget_get_target,$*) \
+ rm -f $(call gb_CliUnoApi_get_target,$*) \
)
-define gb_CliUnoApiTarget_CliUnoApiTarget
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_API :=
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_ASSEMBLIES :=
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_DEPS :=
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_KEYFILE :=
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_VERSION :=
-
-$(call gb_CliUnoApiTarget_get_target,$(1)) :| $(dir $(call gb_CliUnoApiTarget_get_target,$(1))).dir
-
-endef
-
-define gb_CliUnoApiTarget_set_keyfile
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_KEYFILE := $(2)
-$(call gb_CliUnoApiTarget_get_target,$(1)) : $(2)
-
-endef
-
-define gb_CliUnoApiTarget_set_version
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_VERSION := $(2)
-
-endef
-
-define gb_CliUnoApiTarget_wrap_api
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_API := $(call gb_UnoApiTarget_get_target,$(2))
-$(call gb_CliUnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
-
-endef
-
-define gb_CliUnoApiTarget__use_api
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_DEPS += $(2)
-$(call gb_CliUnoApiTarget_get_target,$(1)) : $(2)
-
-endef
-
-define gb_CliUnoApiTarget_use_api
-$(foreach api,$(2),$(call gb_CliUnoApiTarget__use_api,$(1),$(call gb_UnoApiTarget_get_target,$(api))))
-
-endef
-
-define gb_CliUnoApiTarget_use_assembly
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_ASSEMBLIES += $(call gb_CliUnoApi_get_target,$(2))
-$(call gb_CliUnoApiTarget_get_target,$(1)) : $(call gb_CliUnoApi_get_target,$(2))
-
-endef
-
-define gb_CliUnoApiTarget_use_assemblies
-$(foreach assembly,$(2),$(call gb_CliUnoApiTarget_use_assembly,$(1),$(assembly)))
-
-endef
-
-# CliUnoApi class
-
-gb_CliUnoApi_EXT := $(gb_CliUnoApiTarget_EXT)
-gb_CliUnoApi_KEYFILE_DEFAULT := $(gb_CliAssembly_KEYFILE_DEFAULT)
# Create a CLI library for UNO API
#
# gb_CliUnoApi_CliUnoApi target
define gb_CliUnoApi_CliUnoApi
-$(call gb_CliUnoApiTarget_CliUnoApiTarget,$(1))
$(call gb_CliAssembly_CliAssembly,$(1))
-$(call gb_CliUnoApiTarget_set_keyfile,$(1),$(gb_CliUnoApi_KEYFILE_DEFAULT))
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_API :=
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_ASSEMBLIES :=
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_DEPS :=
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_KEYFILE :=
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_VERSION :=
+
+$(call gb_CliUnoApi_set_keyfile,$(1),$(gb_CliUnoApi_KEYFILE_DEFAULT))
-$(call gb_CliUnoApi_get_target,$(1)) : $(call gb_CliUnoApiTarget_get_target,$(1))
$(call gb_CliUnoApi_get_target,$(1)) :| $(call gb_CliAssembly_get_target,$(1))
$(call gb_CliUnoApi_get_target,$(1)) :| $(dir $(call gb_CliUnoApi_get_target,$(1))).dir
-$(call gb_CliUnoApi_get_clean_target,$(1)) : $(call gb_CliUnoApiTarget_get_clean_target,$(1))
$(call gb_CliUnoApi_get_clean_target,$(1)) : $(call gb_CliAssembly_get_clean_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_CliUnoApi_get_target,$(1)),$(call gb_CliUnoApiTarget_get_target,$(1)),$(1))
+$$(eval $$(call gb_Module_register_target,$(call gb_CliUnoApi_get_target,$(1)),$(call gb_CliUnoApi_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),CliUnoApi)
-$$(eval $$(call gb_Module_register_target,$(call gb_CliUnoApiTarget_get_target,$(1)),$(call gb_CliUnoApiTarget_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),CliUnoApiTarget)
+
+$(call gb_CliUnoApi_get_target,$(1)) : $(gb_CliUnoApi_DEPS)
+ $$(call gb_CliUnoApi__command,$$@,$(1))
endef
@@ -128,13 +72,14 @@ $(call gb_CliAssembly_set_configfile,$(1),$(2))
endef
define gb_CliUnoApi_set_keyfile
-$(call gb_CliUnoApiTarget_set_keyfile,$(1),$(2))
$(call gb_CliAssembly_set_keyfile,$(1),$(2))
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_KEYFILE := $(2)
+$(call gb_CliUnoApi_get_target,$(1)) : $(2)
endef
define gb_CliUnoApi_set_assembly_version
-$(call gb_CliUnoApiTarget_set_version,$(1),$(2))
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_VERSION := $(2)
endef
@@ -144,22 +89,30 @@ $(call gb_CliAssembly_set_policy,$(1),$(2),$(3))
endef
define gb_CliUnoApi_wrap_api
-$(call gb_CliUnoApiTarget_wrap_api,$(1),$(2))
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_API := $(call gb_UnoApiTarget_get_target,$(2))
+$(call gb_CliUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
+
+endef
+
+define gb_CliUnoApi__use_api
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_DEPS += $(2)
+$(call gb_CliUnoApi_get_target,$(1)) : $(2)
endef
define gb_CliUnoApi_use_api
-$(call gb_CliUnoApiTarget_use_api,$(1),$(2))
+$(foreach api,$(2),$(call gb_CliUnoApi__use_api,$(1),$(call gb_UnoApiTarget_get_target,$(api))))
endef
define gb_CliUnoApi_use_assembly
-$(call gb_CliUnoApiTarget_use_assembly,$(1),$(2))
+$(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_ASSEMBLIES += $(call gb_CliUnoApi_get_target,$(2))
+$(call gb_CliUnoApi_get_target,$(1)) : $(call gb_CliUnoApi_get_target,$(2))
endef
define gb_CliUnoApi_use_assemblies
-$(call gb_CliUnoApiTarget_use_assemblies,$(1),$(2))
+$(foreach assembly,$(2),$(call gb_CliUnoApi_use_assembly,$(1),$(assembly)))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 878d747fa939..dd6658f829fe 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -22,7 +22,7 @@
# thoese are hard-coded to URE for now since there are so few of them...
gb_CliLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliLibrary_EXT)
gb_CliNativeLibrary_get_target = $(INSTROOT)/$(LIBO_URE_LIB_FOLDER)/$(1)$(gb_CliNativeLibrary_EXT)
-gb_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT)
+gb_CliUnoApi_get_target = $(INSTROOT)/$(LIBO_URE_LIB_FOLDER)/$(1)$(gb_CliUnoApi_EXT)
gb_PackagePart_get_destinations = \
$(INSTDIR) \
$(OUTDIR)/bin \
@@ -71,7 +71,6 @@ gb_CliAssemblyTarget_get_assembly_target = $(WORKDIR)/CliAssemblyTarget/$(1)$(gb
gb_CliConfigTarget_get_target = $(WORKDIR)/CliConfigTarget/$(1).config
gb_CliLibraryTarget_get_target = $(WORKDIR)/CliLibraryTarget/$(1)$(gb_CliLibraryTarget_EXT)
gb_CliNativeLibrary_get_preparation_target = $(WORKDIR)/CliNativeLibraryTarget/$(1).prepare
-gb_CliUnoApiTarget_get_target = $(WORKDIR)/CliUnoApiTarget/$(1)$(gb_CliUnoApiTarget_EXT)
gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
gb_ComponentTarget_get_target_for_build = $(WORKDIR_FOR_BUILD)/ComponentTarget/$(1).component
gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared
@@ -254,7 +253,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
CliConfigTarget \
CliLibraryTarget \
CliNativeLibrary \
- CliUnoApiTarget \
+ CliUnoApi \
ComponentTarget \
CustomPackage \
DescriptionTranslateTarget \
@@ -328,7 +327,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
$(eval $(call gb_Helper_make_outdir_clean_targets,\
CliLibrary \
- CliUnoApi \
InstallScript \
))
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index 70b5cd29fc0e..55c78a97989e 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -17,14 +17,14 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
$(testtools_CLIDIR)/cli_types_bridgetest.dll : \
$(call gb_UnoApiTarget_get_target,bridgetest) \
$(call gb_UnoApiTarget_get_target,udkapi) \
- $(OUTDIR)/bin/cli_uretypes.dll \
+ $(call gb_CliUnoApi_get_target,cli_uretypes) \
$(call gb_Executable_get_runtime_dependencies,climaker) \
| $(testtools_CLIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,climaker) \
$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
- --out $@ -r $(OUTDIR)/bin/cli_uretypes.dll \
+ --out $@ -r $(call gb_CliUnoApi_get_target,cli_uretypes) \
-X $(call gb_UnoApiTarget_get_target,udkapi) \
$(call gb_UnoApiTarget_get_target,bridgetest) > /dev/null)