[Libreoffice-commits] core.git: 4 commits - solenv/gbuild
David Tardon
dtardon at redhat.com
Sun Apr 28 06:20:45 PDT 2013
solenv/gbuild/InternalUnoApi.mk | 4 ----
solenv/gbuild/TargetLocations.mk | 2 --
solenv/gbuild/UnoApi.mk | 21 +++++++++++++--------
solenv/gbuild/UnoApiTarget.mk | 11 +----------
4 files changed, 14 insertions(+), 24 deletions(-)
New commits:
commit 92b618f5829bc46104c4c0ba2129bd857b42b4c6
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 28 14:44:19 2013 +0200
do not copy anything to instdir in build stage
Change-Id: I923704d47d4fbc764e847a1bd6eed9fca2dce089
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 9d2a80b..6897af9 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -10,8 +10,7 @@
gb_UnoApi_DOCDIR := $(gb_Package_SDKDIRNAME)/docs/common/ref
# NOTE: this is the output dir used in odk/CustomTarget_autodoc.mk
gb_UnoApi_SRCDOCDIR := $(call gb_CustomTarget_get_workdir,odk/docs/common/ref)
-gb_UnoApi_ENABLE_DOC := $(filter ODK,$(BUILD_TYPE))
-gb_UnoApi_ENABLE_IDL := $(filter ODK,$(BUILD_TYPE))
+gb_UnoApi_ENABLE_INSTALL := $(and $(filter host,$(gb_Side)),$(filter ODK,$(BUILD_TYPE)))
# NOTE: This is needed temporarily to force rebuild with API files from
# $(WORKDIR), thus fixing generated deps. Otherwise, a change of an .idl
@@ -30,11 +29,9 @@ $(call gb_UnoApi_get_clean_target,%) :
define gb_UnoApi_UnoApi
$(call gb_UnoApiTarget_UnoApiTarget,$(1))
$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
-ifneq ($(gb_UnoApi_ENABLE_IDL),)
+ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
-endif
-ifneq ($(gb_UnoApi_ENABLE_DOC),)
$(call gb_Package_Package_internal,$(1)_doc,$(gb_UnoApi_SRCDOCDIR))
$(call gb_Package_set_outdir,$(1)_doc,$(INSTDIR))
endif
@@ -56,7 +53,7 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
endef
-ifneq ($(gb_UnoApi_ENABLE_IDL),)
+ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
# Create a package of IDL files for putting into SDK.
#
@@ -72,7 +69,7 @@ $(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/i
endef
-else # !gb_UnoApi_ENABLE_IDL
+else # !gb_UnoApi_ENABLE_INSTALL
gb_UnoApi_package_idlfiles :=
gb_UnoApi__add_idlfile :=
@@ -91,7 +88,7 @@ $(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$
endef
-ifneq ($(gb_UnoApi_ENABLE_DOC),)
+ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
# gb_UnoApi__add_docfile_impl api htmlfile
define gb_UnoApi__add_docfile_impl
@@ -129,7 +126,7 @@ $(foreach idlfile,$(3),$(call gb_UnoApi__add_docfile_for_idl,$(1),$(2)/$(idlfile
endef
-else
+else # !gb_UnoApi_ENABLE_INSTALL
gb_UnoApi__add_docfile :=
gb_UnoApi__add_docfiles :=
commit 423bec3b760092cd1aadebd710586b007dd80ee0
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 28 14:12:00 2013 +0200
drop UnoApiTarget_get_*headers
This was actually meant for idls, not headers :-) And it is obsolete, as
we do not deliver these to $(OUTDIR) anymore. We use explicit include
paths into $(SRCDIR) instead.
Change-Id: Iccb0dc529a99be59390f032fc331996146829abb
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index dabcdf5..869b6a7 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -33,9 +33,6 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(
$(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
$(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_UnoApiTarget_get_external_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
-
$$(eval $$(call gb_Module_register_target,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),InternalUnoApi)
@@ -55,7 +52,6 @@ define gb_InternalUnoApi__use_api
$(call gb_UnoApiTarget_use_api,$(1),$(2))
$(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 3c43b36..727e582 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -195,8 +195,6 @@ gb_UIImageListTarget_get_target = $(WORKDIR)/UIImageListTarget/$(1).ilst
gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done
gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1)
gb_UIMenubarTarget_get_target = $(WORKDIR)/UIMenubarTarget/$(1).xml
-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)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),bootstrap)
gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),comprehensive)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 26ae9a8..9d2a80b 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -47,10 +47,6 @@ $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
-ifneq ($(gb_UnoApi_ENABLE_IDL),)
-$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
-endif
-
$(call gb_UnoApi__make_outdir_headers_rule,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
@@ -206,7 +202,6 @@ define gb_UnoApi__use_api
$(call gb_UnoApiTarget_use_api,$(1),$(2))
$(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/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 0cf7ff6..915fd68 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -119,12 +119,6 @@ $(if $(UNOAPI_FILES),,$(error No IDL files have been set for the rdb file))
$(if $(UNOAPI_ROOT),,$(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)
$(call gb_UnoApiTarget__command,$@,$*)
@@ -134,9 +128,7 @@ $(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,$*) \
- $(call gb_UnoApiTarget_get_target,$*).oldformat \
- $(call gb_UnoApiTarget_get_external_headers_target,$*) \
- $(call gb_UnoApiTarget_get_headers_target,$*))
+ $(call gb_UnoApiTarget_get_target,$*).oldformat
-rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \
$(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \
$(call gb_UnoApiPartTarget_get_target,$*)
@@ -201,7 +193,6 @@ $(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 96f582ab70cd78bc5bbb5f0015974007481dc5d9
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 28 14:07:07 2013 +0200
drop forgotten decl. of _inc Package for UnoApi
We do not deliver the created headers anymore.
Change-Id: I5317c43522d0b91044ccc880031795360816b21d
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index a4f13a1..26ae9a8 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -34,7 +34,6 @@ ifneq ($(gb_UnoApi_ENABLE_IDL),)
$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
endif
-$(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1)))
ifneq ($(gb_UnoApi_ENABLE_DOC),)
$(call gb_Package_Package_internal,$(1)_doc,$(gb_UnoApi_SRCDOCDIR))
$(call gb_Package_set_outdir,$(1)_doc,$(INSTDIR))
commit cfd5faaf8f9adfb8bffd845784cddf5c1f0616b8
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 28 14:06:44 2013 +0200
only deliver IDL files if needed
Change-Id: If59a19363d9b82f17fcdfe4632edf6f757c65f64
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 4807c32..a4f13a1 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -11,6 +11,7 @@ gb_UnoApi_DOCDIR := $(gb_Package_SDKDIRNAME)/docs/common/ref
# NOTE: this is the output dir used in odk/CustomTarget_autodoc.mk
gb_UnoApi_SRCDOCDIR := $(call gb_CustomTarget_get_workdir,odk/docs/common/ref)
gb_UnoApi_ENABLE_DOC := $(filter ODK,$(BUILD_TYPE))
+gb_UnoApi_ENABLE_IDL := $(filter ODK,$(BUILD_TYPE))
# NOTE: This is needed temporarily to force rebuild with API files from
# $(WORKDIR), thus fixing generated deps. Otherwise, a change of an .idl
@@ -29,8 +30,10 @@ $(call gb_UnoApi_get_clean_target,%) :
define gb_UnoApi_UnoApi
$(call gb_UnoApiTarget_UnoApiTarget,$(1))
$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
+ifneq ($(gb_UnoApi_ENABLE_IDL),)
$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
+endif
$(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1)))
ifneq ($(gb_UnoApi_ENABLE_DOC),)
$(call gb_Package_Package_internal,$(1)_doc,$(gb_UnoApi_SRCDOCDIR))
@@ -45,7 +48,9 @@ $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
+ifneq ($(gb_UnoApi_ENABLE_IDL),)
$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
+endif
$(call gb_UnoApi__make_outdir_headers_rule,$(1))
@@ -56,6 +61,8 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
endef
+ifneq ($(gb_UnoApi_ENABLE_IDL),)
+
# Create a package of IDL files for putting into SDK.
#
# gb_UnoApi_package_idlfiles api
@@ -70,6 +77,13 @@ $(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/i
endef
+else # !gb_UnoApi_ENABLE_IDL
+
+gb_UnoApi_package_idlfiles :=
+gb_UnoApi__add_idlfile :=
+
+endif
+
define gb_UnoApi__add_headerfile_impl
$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3))
More information about the Libreoffice-commits
mailing list