svn commit: r1838933 - in /openoffice/trunk/main/solenv/gbuild: Executable.mk LinkTarget.mk

[da...@apache.org]

Author: damjan
Date: Fri Aug 24 18:56:02 2018
New Revision: 1838933

URL: http://svn.apache.org/viewvc?rev=1838933&view=rev
Log:
Add the solenv/gbuild changes I accidentally left out from my last commit,
which allow extracting custom .hpp files from .rdb using cppumaker.

Patch by: me


Modified:
    openoffice/trunk/main/solenv/gbuild/Executable.mk
    openoffice/trunk/main/solenv/gbuild/LinkTarget.mk

Modified: openoffice/trunk/main/solenv/gbuild/Executable.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Executable.mk?rev=1838933&r1=1838932&r2=1838933&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Executable.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Executable.mk Fri Aug 24 18:56:02 2018
@@ -97,6 +97,7 @@ $(eval $(foreach method,\
 	add_package_headers \
 	add_sdi_headers \
 	add_precompiled_header \
+	set_private_extract_of_public_api \
 ,\
 	$(call gb_Executable_forward_to_Linktarget,$(method))\
 ))

Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1838933&r1=1838932&r2=1838933&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Fri Aug 24 18:56:02 2018
@@ -571,6 +571,33 @@ $(foreach api,$(2),$(call gb_LinkTarget_
 
 endef
 
+define gb_LinkTarget_set_private_extract_of_public_api
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+	$(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc)
+endif
+
+$(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag): $(2)
+	$(call gb_Output_announce,$@,$(true),PVTUNOTYPES,2)
+	-$$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) && \
+		$(gb_UnoApiTarget_CPPUMAKERCOMMAND) \
+			-O $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) \
+			$(foreach unotype,$(3),-T$(unotype)) \
+			-BUCR \
+			-C \
+			$$(OUTDIR)/bin/udkapi.rdb && \
+		touch $(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag))
+
+$(call gb_LinkTarget_get_clean_target,$(1)) :
+	rm -rf $(call gb_UnoPrivateApiTarget_get_target,$(1))
+
+
+endef
+
 define gb_LinkTarget_add_libs
 $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
 endef