solenv/gbuild/InternalUnoApi.mk | 34 +++++++++++++++++---------- solenv/gbuild/LinkTarget.mk | 4 +-- solenv/gbuild/TargetLocations.mk | 4 +-- solenv/gbuild/UnoApi.mk | 13 ++++------ solenv/gbuild/UnoApiMerge.mk | 2 + solenv/gbuild/UnoApiTarget.mk | 48 +++++++++++++++++++++------------------ 6 files changed, 58 insertions(+), 47 deletions(-)
New commits: commit c6fc60d0739e1539e2efae23461f970eda7cf0f4 Author: David Tardon <[email protected]> Date: Sat Mar 24 15:20:14 2012 +0100 rename targets to match LinkTarget's functions diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index a0a63e3..ec141c0 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -650,12 +650,12 @@ $(foreach api,$(2),$(call gb_LinkTarget__add_internal_api_one,$(1),$(api),$(3))) endef define gb_LinkTarget_add_internal_api -$(call gb_LinkTarget__add_internal_api,$(1),$(2),lightweight_) +$(call gb_LinkTarget__add_internal_api,$(1),$(2)) endef define gb_LinkTarget_add_internal_bootstrap_api -$(call gb_LinkTarget__add_internal_api,$(1),$(2)) +$(call gb_LinkTarget__add_internal_api,$(1),$(2),bootstrap_) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index b229310..2176746 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -121,11 +121,11 @@ gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1))) gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1) gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb +gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive -gb_UnoApiHeadersTarget_get_lightweight_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/lightweight gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal +gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap.done gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.done -gb_UnoApiHeadersTarget_get_lightweight_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/lightweight.done gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1) gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 95b2766..bb82ddb 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -34,12 +34,12 @@ define gb_UnoApi_UnoApi $(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) $(call gb_Package_Package,$(1)_idl,$(SRCDIR)) -$(call gb_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_lightweight_dir,$(1))) +$(call gb_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) $(call gb_UnoApiTarget_set_root,$(1),UCR) $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) +$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1)) $(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) $(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_inc) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) @@ -47,7 +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_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) +$(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)) diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 893e416..388fe3c 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -265,39 +265,39 @@ touch $(1) endef -$(call gb_UnoApiHeadersTarget_get_target,%) : - $(call gb_Output_announce,$*,$(true),HPP,3) - $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*)) +$(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : + $(call gb_Output_announce,$*,$(true),HPB,3) + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*)) $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : $(call gb_Output_announce,$*,$(true),HPC,3) $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C) -$(call gb_UnoApiHeadersTarget_get_lightweight_target,%) : - $(call gb_Output_announce,$*,$(true),HPL,3) - $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_lightweight_dir,$*),-L) +$(call gb_UnoApiHeadersTarget_get_target,%) : + $(call gb_Output_announce,$*,$(true),HPP,3) + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L) .PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%) $(call gb_UnoApiHeadersTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),HPP,3) $(call gb_Helper_abbreviate_dirs_native,\ rm -rf \ + $(call gb_UnoApiHeadersTarget_get_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \ $(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*) \ - $(call gb_UnoApiHeadersTarget_get_lightweight_dir,$*) \ - $(call gb_UnoApiHeadersTarget_get_dir,$*) \ - $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$*) \ - $(call gb_UnoApiHeadersTarget_get_lightweight_target,$*) \ - $(call gb_UnoApiHeadersTarget_get_target,$*)) + $(call gb_UnoApiHeadersTarget_get_target,$*) \ + $(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*)) \ + $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$*) define gb_UnoApiHeadersTarget_UnoApiHeadersTarget $(call gb_UnoApiHeadersTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiHeadersTarget_get_bootstrap_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApiHeadersTarget_get_target,$(1)) : UNOAPI_DEPS := +$(call gb_UnoApiHeadersTarget_get_bootstrap_target,$(1)) : UNOAPI_DEPS := $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS := -$(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) : UNOAPI_DEPS := endef @@ -313,8 +313,8 @@ endef define gb_UnoApiHeadersTarget_add_rdbfile $(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),target) +$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),bootstrap_target) $(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),comprehensive_target) -$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),lightweight_target) endef commit ac6e856a00f1546b00e612512cac7a8fad9d694a Author: David Tardon <[email protected]> Date: Sat Mar 24 15:11:56 2012 +0100 use correct rdb root dirs diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index 5cfc0b5..1011d9c 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -30,27 +30,40 @@ $(call gb_InternalUnoApi_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs_native,\ rm -f $(call gb_InternalUnoApi_get_target,$*)) +# Note: The rdb root for the internal rdbs should be / . On the other +# side, UnoApiHeadersTarget expects UCR and it is really not easy to +# change, because the information would have to be duplicated at the +# calling side. So we simply do both .-) +# TODO: Should it come clear that these rdbs (installed into +# solver/$INPATH/rdb) are actually not needed for anything, this could +# be simplified. + define gb_InternalUnoApi_InternalUnoApi +$(call gb_UnoApiTarget_UnoApiTarget,$(1)_out) $(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) -$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) +$(call gb_UnoApiTarget_set_root,$(1)_out,/) +$(call gb_UnoApiTarget_set_root,$(1),UCR) +$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(1)_out) + +$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)_out) +$(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_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) +$(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)))) endef define gb_InternalUnoApi_add_idlfile -$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3)) +$(call gb_UnoApiTarget_add_idlfile,$(1)_out,$(2),$(3)) endef define gb_InternalUnoApi_add_idlfiles -$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3)) +$(call gb_UnoApiTarget_add_idlfiles,$(1)_out,$(2),$(3)) endef @@ -86,12 +99,12 @@ $(foreach dep,$(3),$(call gb_InternalUnoApi_add_api_dependency,$(1),$(2),$(dep)) endef define gb_InternalUnoApi_set_xmlfile -$(call gb_UnoApiTarget_set_xmlfile,$(1),$(2)) +$(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2)) endef define gb_InternalUnoApi_set_include -$(call gb_UnoApiTarget_set_include,$(1),$(2)) +$(call gb_UnoApiTarget_set_include,$(1)_out,$(2)) endef diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 579d2fb..95b2766 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -36,6 +36,8 @@ $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) $(call gb_Package_Package,$(1)_idl,$(SRCDIR)) $(call gb_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_lightweight_dir,$(1))) +$(call gb_UnoApiTarget_set_root,$(1),UCR) + $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) $(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk index d23ce75..067a4c1 100644 --- a/solenv/gbuild/UnoApiMerge.mk +++ b/solenv/gbuild/UnoApiMerge.mk @@ -32,6 +32,8 @@ define gb_UnoApiMerge_UnoApiMerge $(call gb_UnoApiTarget_UnoApiTarget,$(1)) +$(call gb_UnoApiTarget_set_root,$(1),/) + $(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)) diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 0fa2857..893e416 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -100,20 +100,18 @@ define gb_UnoApiTarget__regmerge_command_impl $(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_REGMERGECOMMAND),$(1) $(2) $(3)) endef -# TODO: -bUCR changes content of the RDB files; the old build system -# uses -b/ (by default) define gb_UnoApiTarget__rdbmaker_command_impl -$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -B$(2) -b$(2) $(3) $(4)) +$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -B$(2) -b$(3) $(4) $(5)) endef define gb_UnoApiTarget__command $(call gb_Output_announce,$*,$(true),RDB,3) mkdir -p $(dir $(1)) && \ $(if $(UNOAPI_FILES),\ - $(call gb_UnoApiTarget__regmerge_command_impl,$(1),UCR,$(UNOAPI_FILES)),\ + $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)),\ $(if $(UNOAPI_MERGE),\ - $(call gb_UnoApiTarget__regmerge_command_impl,$(1),/,$(UNOAPI_MERGE)),\ - $(call gb_UnoApiTarget__rdbmaker_command_impl,$(1),UCR,\ + $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_MERGE)),\ + $(call gb_UnoApiTarget__rdbmaker_command_impl,$(1),UCR,$(UNOAPI_ROOT),\ $(call gb_UnoApiTarget__get_types,$(UNOAPI_XML)),$(gb_UnoApiTarget_XMLRDB)))) \ $(if $(UNOAPI_REFERENCE), \ $(call gb_Output_announce,$*,$(true),DBc,3) \ @@ -128,10 +126,11 @@ $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3 $(error More than one mode of function of UnoApiTarget used: this is not supported),\ $(if $(or $(1),$(2),$(3)),,\ $(error Neither IDL files nor merged RDBs nor XML desc. were used: nothing will be produced))) +$(if $(4),,$(error No root has been set for the rdb file)) endef $(call gb_UnoApiTarget_get_target,%): - $(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML)) + $(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT)) $(call gb_UnoApiTarget__command,$@,$*,$<,$?) .PHONY : $(call gb_UnoApiTarget_get_clean_target,%) @@ -168,6 +167,7 @@ $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_XML := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT := ifeq ($(gb_FULLDEPS),$(true)) $(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES := @@ -245,6 +245,11 @@ $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(2) endef +define gb_UnoApiTarget_set_root +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT := $(2) + +endef + # UnoApiHeadersTarget gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_build,cppumaker) @@ -284,7 +289,6 @@ $(call gb_UnoApiHeadersTarget_get_clean_target,%) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$*) \ $(call gb_UnoApiHeadersTarget_get_target,$*)) -# TODO: add second parameter: root of rdb file (UCR vs. /) define gb_UnoApiHeadersTarget_UnoApiHeadersTarget $(call gb_UnoApiHeadersTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) commit 1a00658cd3867fe1a7a306aa309850796ca7a7a4 Author: David Tardon <[email protected]> Date: Sat Mar 24 13:36:46 2012 +0100 use the default deliver rule diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index 68e29ba..5cfc0b5 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -25,13 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(call gb_InternalUnoApi_get_target,%) : - $(call gb_Output_announce,$*,$(true),UNI,4) - $(call gb_Deliver_deliver,$(call gb_UnoApiTarget_get_target,$*),$@) - .PHONY : $(call gb_InternalUnoApi_get_clean_target,%) $(call gb_InternalUnoApi_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),UNI,4) $(call gb_Helper_abbreviate_dirs_native,\ rm -f $(call gb_InternalUnoApi_get_target,$*)) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 8348826..579d2fb 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -25,13 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(call gb_UnoApi_get_target,%) : - $(call gb_Output_announce,$*,$(true),UNO,4) - $(call gb_Deliver_deliver,$(call gb_UnoApiTarget_get_target,$*),$@) - .PHONY : $(call gb_UnoApi_get_clean_target,%) $(call gb_UnoApi_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),UNO,4) $(call gb_Helper_abbreviate_dirs_native,\ rm -f $(call gb_UnoApi_get_target,$*)) commit 15396990cf0aa73bc8afd592bb338c9af2604609 Author: David Tardon <[email protected]> Date: Sat Mar 24 07:22:39 2012 +0100 update copyright date diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index efffa9f..68e29ba 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -12,7 +12,7 @@ # License. # # Major Contributor(s): -# Copyright (C) 2010 Red Hat, Inc., David Tardon <[email protected]> +# Copyright (C) 2012 Red Hat, Inc., David Tardon <[email protected]> # (initial developer) # # All Rights Reserved. _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
