[Libreoffice-commits] core.git: 2 commits - binaryurp/Library_binaryurp.mk solenv/gbuild
David Tardon
dtardon at redhat.com
Sat Mar 30 10:52:40 PDT 2013
binaryurp/Library_binaryurp.mk | 2 -
solenv/gbuild/InternalUnoApi.mk | 43 +++++++++++++++++----------------------
solenv/gbuild/TargetLocations.mk | 5 +---
3 files changed, 22 insertions(+), 28 deletions(-)
New commits:
commit 2be8a22e836b6bb7172f4b51c13440813bb9ae9a
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 30 18:27:06 2013 +0100
binaryurp does not need offapi
Change-Id: I4196e763e8374d1f50700c20362245224acb9e13
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index 37b96e7..f6c8bab 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,binaryurp))
$(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp))
-$(eval $(call gb_Library_use_sdk_api,binaryurp))
+$(eval $(call gb_Library_use_udk_api,binaryurp))
$(eval $(call gb_Library_use_external,binaryurp,boost_headers))
commit 4e3b172595ef495c8906da4b24afc3aabe07f9ce
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 30 16:24:30 2013 +0100
stop delivering useless rdb for InternalUnoApi
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 2d77d0d..193c507 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -25,39 +25,34 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+$(dir $(call gb_InternalUnoApi_get_target,%)).dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $(@)))
+
+$(dir $(call gb_InternalUnoApi_get_target,%))%/.dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $(@)))
+
+$(call gb_InternalUnoApi_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),UNI,5) \
+ touch $@
+
.PHONY : $(call gb_InternalUnoApi_get_clean_target,%)
$(call gb_InternalUnoApi_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),UNI,5) \
$(call gb_Helper_abbreviate_dirs,\
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_UnoApiTarget_set_root,$(1)_out,/)
$(call gb_UnoApiTarget_set_root,$(1),UCR)
-$(call gb_UnoApiTarget_merge_api,$(1),$(1)_out)
+$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
$(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
-$(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_UnoApiTarget_get_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY)
-$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(1)_out)
-$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY)
-$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_external_headers_target,$(1)_out)
-
-$(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(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)
@@ -65,19 +60,19 @@ $(call gb_Helper_make_userfriendly_targets,$(1),InternalUnoApi)
endef
define gb_InternalUnoApi_add_idlfile
-$(call gb_UnoApiTarget_add_idlfile,$(1)_out,$(2),$(3))
+$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
endef
define gb_InternalUnoApi_add_idlfiles
-$(call gb_UnoApiTarget_add_idlfiles,$(1)_out,$(2),$(3))
+$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
endef
define gb_InternalUnoApi__use_api
$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
-$(call gb_InternalUnoApi_get_target,$(1)_out) : $(call gb_UnoApiTarget_get_target,$(2))
-$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(call gb_UnoApiTarget_get_headers_target,$(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
@@ -107,7 +102,7 @@ $(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(de
endef
define gb_InternalUnoApi_set_include
-$(call gb_UnoApiTarget_set_include,$(1)_out,$(2))
+$(call gb_UnoApiTarget_set_include,$(1),$(2))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 2583ea0..b738b65 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -44,14 +44,12 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/lib \
$(OUTDIR)/par \
$(OUTDIR)/pck \
- $(OUTDIR)/rdb \
$(OUTDIR)/res \
$(OUTDIR)/share \
$(OUTDIR)/unittest \
$(OUTDIR)/xml \
gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
-gb_InternalUnoApi_get_target = $(OUTDIR)/rdb/$(1).rdb
gb_PackagePart_get_target = $(OUTDIR)/$(1)
gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
gb_Rdb_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/xml/$(1).rdb
@@ -140,6 +138,7 @@ gb_InstallModuleTarget_get_external_target = $(WORKDIR)/InstallModuleTarget/$(1)
gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).filelist
gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist
gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
+gb_InternalUnoApi_get_target = $(WORKDIR)/InternalUnoApi/$(1).done
gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
gb_Jar_get_classsetname = Jar/$(1)
gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
@@ -278,6 +277,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
InstallModule \
InstallModuleTarget \
InstallScriptTarget \
+ InternalUnoApi \
JavaClassSet \
Jar \
JunitTest \
@@ -330,7 +330,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
Executable \
Extension \
InstallScript \
- InternalUnoApi \
Library \
StaticLibrary \
UnoApi \
More information about the Libreoffice-commits
mailing list