cli_ure/Package_version.mk | 2 +-
solenv/gbuild/InternalUnoApi.mk | 3 +++
solenv/gbuild/TargetLocations.mk | 2 ++
solenv/gbuild/UnoApi.mk | 2 ++
solenv/gbuild/UnoApiMerge.mk | 3 +++
solenv/gbuild/UnoApiTarget.mk | 11 ++++++++++-
6 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 79c8e862fbfba8e44801a69f7a7ce2d68469130b
Author: David Tardon <dtar...@redhat.com>
Date: Wed Aug 1 09:38:07 2012 +0200
ensure IDL files of used UnoApis are in place
Change-Id: I27740a60b9b5ff7ef5541713b2f85e03f8e70c7d
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index a32984f..90249a5 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -52,6 +52,8 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call
gb_UnoApiTarget_get_target,$(
$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call
gb_UnoApiTarget_get_clean_target,$(1)_out)
$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call
gb_UnoApiHeadersTarget_get_clean_target,$(1))
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
+
$(call gb_Deliver_add_deliverable,$(call
gb_InternalUnoApi_get_target,$(1)),$(call
gb_UnoApiTarget_get_target,$(1)_out),$(1))
$$(eval $$(call gb_Module_register_target,$(call
gb_InternalUnoApi_get_target,$(1)),$(call
gb_InternalUnoApi_get_clean_target,$(1))))
@@ -71,6 +73,7 @@ endef
define gb_InternalUnoApi__use_api
$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
$(call gb_InternalUnoApi_get_target,$(1)) : $(call
gb_UnoApiTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call
gb_UnoApiTarget_get_headers_target,$(2))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 1a8bcda..c9e8b8c 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -153,6 +153,8 @@ gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
gb_SrsTemplatePartTarget_get_target =
$(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))/$(subst
_tmpl,,$(notdir $(1)))
gb_SrsTemplateTarget_get_include_dir =
$(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
+gb_UnoApiTarget_get_external_headers_target =
$(WORKDIR)/UnoApiTarget/$(1).external
+gb_UnoApiTarget_get_headers_target = $(WORKDIR)/UnoApiTarget/$(1).headers
gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
gb_UnoApiHeadersTarget_get_bootstrap_dir =
$(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap$(2)
gb_UnoApiHeadersTarget_get_comprehensive_dir =
$(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive$(2)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index da9a4af..a5ecfda 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -47,6 +47,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call
gb_UnoApiHeadersTarget_get_clea
$(call gb_UnoApi_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target,$(1)_idl)
$(call gb_UnoApi_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target,$(1)_inc)
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call
gb_Package_get_target,$(1)_idl)
$(call gb_Package_get_preparation_target,$(1)_inc) : $(call
gb_UnoApiHeadersTarget_get_target,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call
gb_UnoApiTarget_get_target,$(1)),$(1))
@@ -132,6 +133,7 @@ endef
define gb_UnoApi__use_api
$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
$(call gb_UnoApi_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call
gb_UnoApiTarget_get_headers_target,$(2))
endef
diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk
index 3ce9ad5..d321219 100644
--- a/solenv/gbuild/UnoApiMerge.mk
+++ b/solenv/gbuild/UnoApiMerge.mk
@@ -38,6 +38,8 @@ $(call gb_UnoApiMerge_get_target,$(1)) :| $(dir $(call
gb_UnoApiMerge_get_target
$(call gb_UnoApiMerge_get_target,$(1)) : $(call
gb_UnoApiTarget_get_target,$(1))
$(call gb_UnoApiMerge_get_clean_target,$(1)) : $(call
gb_UnoApiTarget_get_clean_target,$(1))
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
+
$(call gb_Deliver_add_deliverable,$(call
gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call
gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1))))
@@ -50,6 +52,7 @@ endef
define gb_UnoApiMerge__use_api
$(call gb_UnoApiTarget_merge_api,$(1),$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call
gb_UnoApiTarget_get_headers_target,$(2))
endef
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index c473f6d..64c49b6 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -134,6 +134,12 @@ $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and
$(2),$(3)),$(and $(1),$(3
$(if $(4),,$(error No root has been set for the rdb file))
endef
+$(call gb_UnoApiTarget_get_external_headers_target,%) :
+ mkdir -p $(dir $@) && touch $@
+
+$(call gb_UnoApiTarget_get_headers_target,%) : $(call
gb_UnoApiTarget_get_external_headers_target,%)
+ mkdir -p $(dir $@) && touch $@
+
$(call gb_UnoApiTarget_get_target,%) :
$(call
gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT))
$(call gb_UnoApiTarget__command,$@,$*)
@@ -142,7 +148,9 @@ $(call gb_UnoApiTarget_get_target,%) :
$(call gb_UnoApiTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),UNO,4)
-$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_UnoApiTarget_get_target,$*))
+ rm -f $(call gb_UnoApiTarget_get_target,$*) \
+ $(call gb_UnoApiTarget_get_external_headers_target,$*) \
+ $(call gb_UnoApiTarget_get_headers_target,$*))
-rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \
$(basename $(call
gb_UnoApiPartTarget_get_dep_target,$*)) \
$(call gb_UnoApiPartTarget_get_target,$*)
@@ -207,6 +215,7 @@ $(call gb_UnoApiTarget_get_target,$(1)) : \
$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done)
$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
$(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) :| $(call
gb_UnoApiTarget_get_external_headers_target,$(1))
endef
commit ea1cb3aeacec32f001680b4be125df8c815c25e8
Author: David Tardon <dtar...@redhat.com>
Date: Wed Aug 1 08:53:25 2012 +0200
fix delivery of cliureversion.mk
Change-Id: I50fd8ceae60ee451c729ffaa01c95b77308acaea
diff --git a/cli_ure/Package_version.mk b/cli_ure/Package_version.mk
index 4f67f48..6ab670e 100644
--- a/cli_ure/Package_version.mk
+++ b/cli_ure/Package_version.mk
@@ -9,6 +9,6 @@
$(eval $(call gb_Package_Package,cli_ure_version,$(SRCDIR)/cli_ure/version))
-$(eval $(call gb_Package_add_file,bin/cliureversion.mk,version.txt))
+$(eval $(call
gb_Package_add_file,cli_ure_version,bin/cliureversion.mk,version.txt))
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
