cppu: new ZipPackage_cppu_odk_headers

Change-Id: I4ceee0ed3438a18e13c186ebd8d390604d26ec28

cppu/CustomTarget_cppu_allheaders.mk

@@ -32,9 +32,12 @@ cppu_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppu/allheaders)
 $(call gb_CustomTarget_get_target,cppu/allheaders) : \
 	$(cppu_allheaders_DIR)/cppu_allheaders.hxx
 
-# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
-$(cppu_allheaders_DIR)/cppu_allheaders.hxx : $(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \
-            | $(cppu_allheaders_DIR)/.dir $(SRCDIR)/cppu/Package_inc.mk
+# dependency on Package_cppu_odk_headers.mk should ensure this is
+# updated whenever a new public header is added
+$(cppu_allheaders_DIR)/cppu_allheaders.hxx : \
+			$(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \
+			$(SRCDIR)/cppu/ZipPackage_cppu_odk_headers.mk \
+            | $(cppu_allheaders_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	printf '// Generated list of all cppu/ includes\n' >  $@
 	$(foreach file, $(wildcard $(SRCDIR)/cppu/inc/*.h) $(wildcard $(SRCDIR)/cppu/inc/*.hxx) \

cppu/Library_cppu.mk

@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,cppu))
 
 $(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map))
 
-$(eval $(call gb_Library_use_package,cppu,cppu_inc))
+$(eval $(call gb_Library_use_package,cppu,cppu_odk_headers))
 
 $(eval $(call gb_Library_use_udk_api,cppu))
 

cppu/Module_cppu.mk

@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,cppu,\
 	Library_log_uno \
 	Library_purpenvhelper \
 	Library_unsafe_uno \
-	Package_inc \
+	ZipPackage_cppu_odk_headers \
 ))
 
 $(eval $(call gb_Module_add_check_targets,cppu,\

cppu/Package_inc.mk

-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com>
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,cppu_inc,$(SRCDIR)/cppu/inc))
-
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Any.h,com/sun/star/uno/Any.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Any.hxx,com/sun/star/uno/Any.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/genfunc.h,com/sun/star/uno/genfunc.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/genfunc.hxx,com/sun/star/uno/genfunc.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Reference.h,com/sun/star/uno/Reference.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Reference.hxx,com/sun/star/uno/Reference.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Sequence.h,com/sun/star/uno/Sequence.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Sequence.hxx,com/sun/star/uno/Sequence.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Type.h,com/sun/star/uno/Type.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Type.hxx,com/sun/star/uno/Type.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/cppudllapi.h,cppu/cppudllapi.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/EnvDcp.hxx,cppu/EnvDcp.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/Enterable.hxx,cppu/Enterable.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/EnvGuards.hxx,cppu/EnvGuards.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/macros.hxx,cppu/macros.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/Map.hxx,cppu/Map.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/unotype.hxx,cppu/unotype.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/helper/purpenv/Environment.hxx,cppu/helper/purpenv/Environment.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/helper/purpenv/Mapping.hxx,cppu/helper/purpenv/Mapping.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/typeclass.h,typelib/typeclass.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/typedescription.h,typelib/typedescription.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/typedescription.hxx,typelib/typedescription.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/uik.h,typelib/uik.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/any2.h,uno/any2.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/current_context.h,uno/current_context.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/current_context.hxx,uno/current_context.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/data.h,uno/data.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/dispatcher.h,uno/dispatcher.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/dispatcher.hxx,uno/dispatcher.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/Enterable.h,uno/Enterable.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/EnvDcp.h,uno/EnvDcp.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/environment.h,uno/environment.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/environment.hxx,uno/environment.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/lbnames.h,uno/lbnames.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/mapping.h,uno/mapping.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/mapping.hxx,uno/mapping.hxx))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/sequence2.h,uno/sequence2.h))
-$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/threadpool.h,uno/threadpool.h))
-
-# vim: set noet sw=4 ts=4:

cppu/ZipPackage_cppu_odk_headers.mk

+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com>
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_ZipPackage_ZipPackage,cppu_odk_headers,$(SRCDIR)/cppu/inc))
+
+$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/com/sun/star/uno,include/com/sun/star/uno,\
+	com/sun/star/uno/Any.h \
+	com/sun/star/uno/Any.hxx \
+	com/sun/star/uno/genfunc.h \
+	com/sun/star/uno/genfunc.hxx \
+	com/sun/star/uno/Reference.h \
+	com/sun/star/uno/Reference.hxx \
+	com/sun/star/uno/Sequence.h \
+	com/sun/star/uno/Sequence.hxx \
+	com/sun/star/uno/Type.h \
+	com/sun/star/uno/Type.hxx \
+))
+
+$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu,include/cppu,\
+	cppu/cppudllapi.h \
+	cppu/EnvDcp.hxx \
+	cppu/Enterable.hxx \
+	cppu/EnvGuards.hxx \
+	cppu/macros.hxx \
+	cppu/Map.hxx \
+	cppu/unotype.hxx \
+))
+
+$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu/helper/purpenv/,include/cppu/helper/purpenv/,\
+	cppu/helper/purpenv/Environment.hxx \
+	cppu/helper/purpenv/Mapping.hxx \
+))
+
+$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/typelib,include/typelib,\
+	typelib/typeclass.h \
+	typelib/typedescription.h \
+	typelib/typedescription.hxx \
+	typelib/uik.h \
+))
+
+$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/uno,include/uno,\
+	uno/any2.h \
+	uno/current_context.h \
+	uno/current_context.hxx \
+	uno/data.h \
+	uno/dispatcher.h \
+	uno/dispatcher.hxx \
+	uno/Enterable.h \
+	uno/EnvDcp.h \
+	uno/environment.h \
+	uno/environment.hxx \
+	uno/lbnames.h \
+	uno/mapping.h \
+	uno/mapping.hxx \
+	uno/sequence2.h \
+	uno/threadpool.h \
+))
+
+# vim: set noet sw=4 ts=4:

extensions/StaticLibrary_plugcon.mk

@@ -34,7 +34,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon))
 $(eval $(call gb_StaticLibrary_use_packages,plugcon,\
     basegfx_inc \
     comphelper_inc \
-    cppu_inc \
+    cppu_odk_headers \
     i18npool_inc \
     np_sdk_inc \
     tools_inc \

i18npool/Library_i18nisolang1.mk

@@ -29,7 +29,7 @@
 $(eval $(call gb_Library_Library,i18nisolang1))
 
 $(eval $(call gb_Library_use_packages,i18nisolang1,\
-	cppu_inc \
+	cppu_odk_headers \
 	i18npool_inc \
 ))
 

lingucomponent/StaticLibrary_ulingu.mk

@@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu))
 
 $(eval $(call gb_StaticLibrary_use_packages,ulingu,\
 	comphelper_inc \
-	cppu_inc \
+	cppu_odk_headers \
 	cppuhelper_inc \
 	i18npool_inc \
 	linguistic_inc \

odk/CustomTarget_doxygen.mk

@@ -22,7 +22,7 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
 	$(SRCDIR)/odk/pack/gendocu/main.dox \
 	$(call gb_Package_get_target,sal_odk_headers) \
 	$(call gb_Package_get_target,salhelper_odk_headers) \
-	$(call gb_Package_get_target,cppu_inc) \
+	$(call gb_Package_get_target,cppu_odk_headers) \
 	$(call gb_Package_get_target,cppuhelper_inc) \
 	$(call gb_Package_get_target,store_inc) \
 	$(call gb_Package_get_target,registry_inc)

sax/StaticLibrary_sax_shared.mk

@@ -10,7 +10,7 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared))
 
 $(eval $(call gb_StaticLibrary_use_packages,sax_shared,\
-	cppu_inc \
+	cppu_odk_headers \
 ))
 
 $(eval $(call gb_StaticLibrary_set_include,sax_shared,\

sdext/StaticLibrary_pdfimport_s.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s))
 $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\
     basegfx_inc \
     comphelper_inc \
-    cppu_inc \
+    cppu_odk_headers \
     cppuhelper_inc \
     o3tl_inc \
     tools_inc \

testtools/StaticLibrary_bridgetest.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s))
 $(eval $(call gb_StaticLibrary_use_external,testtools_bridgetest_s,boost_headers))
 
 $(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\
-	cppu_inc \
+	cppu_odk_headers \
 	cppuhelper_inc \
 ))
 

vcl/StaticLibrary_headless.mk

@@ -32,7 +32,7 @@ $(eval $(call gb_StaticLibrary_use_packages,headless,\
 	basebmp_inc \
 	basegfx_inc \
 	comphelper_inc \
-	cppu_inc \
+	cppu_odk_headers \
 	cppuhelper_inc \
 	i18npool_inc \
 	i18nutil_inc \

vcl/StaticLibrary_vclmain.mk

@@ -21,7 +21,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
 
 $(eval $(call gb_StaticLibrary_use_packages,vclmain,\
 	comphelper_inc \
-	cppu_inc \
+	cppu_odk_headers \
 	cppuhelper_inc \
 	tools_inc \
 ))

writerperfect/StaticLibrary_writerperfect.mk

@@ -21,7 +21,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect))
 
 $(eval $(call gb_StaticLibrary_use_packages,writerperfect,\
 	comphelper_inc \
-	cppu_inc \
+	cppu_odk_headers \
 	cppuhelper_inc \
 	sot_inc \
 	tools_inc \