cppuhelper: new ZipPackage_cppuhelper_odk_headers
Change-Id: I77d7ef6890ca584cf022059838c318a2811bcd5d
This commit is contained in:
Michael Stahl
@@ -32,10 +32,12 @@ cppuhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppuhelper/allhe
|
||||
$(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \
|
||||
$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx
|
||||
|
||||
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
|
||||
# dependency on Package_cppuheaders_odk_headers.mk should ensure this is
|
||||
# updated whenever a new public header is added
|
||||
$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \
|
||||
$(SRCDIR)/cppuhelper/CustomTarget_cppuhelper_allheaders.mk \
|
||||
| $(cppuhelper_allheaders_DIR)/.dir $(SRCDIR)/cppuhelper/Package_inc.mk
|
||||
$(SRCDIR)/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk \
|
||||
| $(cppuhelper_allheaders_DIR)/.dir
|
||||
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
|
||||
printf '// Generated list of all cppuhelper/ includes\n' > $@
|
||||
$(foreach file, $(wildcard $(SRCDIR)/cppuhelper/inc/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*.hxx) \
|
||||
|
||||
@@ -31,9 +31,9 @@ $(eval $(call gb_Module_add_targets,cppuhelper,\
|
||||
CustomTarget_cppuhelper_allheaders \
|
||||
InternalUnoApi_cppuhelper \
|
||||
Library_cppuhelper \
|
||||
Package_inc \
|
||||
Package_unorc \
|
||||
StaticLibrary_findsofficepath \
|
||||
ZipPackage_cppuhelper_odk_headers \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Module_add_check_targets,cppuhelper,\
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
# -*- 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> (initial developer)
|
||||
#
|
||||
# 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,cppuhelper_inc,$(SRCDIR)/cppuhelper/inc))
|
||||
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/cppuhelperdllapi.h,cppuhelper/cppuhelperdllapi.h))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/access_control.hxx,cppuhelper/access_control.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/basemutex.hxx,cppuhelper/basemutex.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/bootstrap.hxx,cppuhelper/bootstrap.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase10.hxx,cppuhelper/compbase10.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase11.hxx,cppuhelper/compbase11.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase12.hxx,cppuhelper/compbase12.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase1.hxx,cppuhelper/compbase1.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase2.hxx,cppuhelper/compbase2.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase3.hxx,cppuhelper/compbase3.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase4.hxx,cppuhelper/compbase4.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase5.hxx,cppuhelper/compbase5.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase6.hxx,cppuhelper/compbase6.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase7.hxx,cppuhelper/compbase7.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase8.hxx,cppuhelper/compbase8.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase9.hxx,cppuhelper/compbase9.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase_ex.hxx,cppuhelper/compbase_ex.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase.hxx,cppuhelper/compbase.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/component_context.hxx,cppuhelper/component_context.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/component.hxx,cppuhelper/component.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/exc_hlp.hxx,cppuhelper/exc_hlp.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/factory.hxx,cppuhelper/factory.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/findsofficepath.h,cppuhelper/findsofficepath.h))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase10.hxx,cppuhelper/implbase10.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase11.hxx,cppuhelper/implbase11.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase12.hxx,cppuhelper/implbase12.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase1.hxx,cppuhelper/implbase1.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase2.hxx,cppuhelper/implbase2.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase3.hxx,cppuhelper/implbase3.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase4.hxx,cppuhelper/implbase4.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase5.hxx,cppuhelper/implbase5.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase6.hxx,cppuhelper/implbase6.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase7.hxx,cppuhelper/implbase7.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase8.hxx,cppuhelper/implbase8.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase9.hxx,cppuhelper/implbase9.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex.hxx,cppuhelper/implbase_ex.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex_post.hxx,cppuhelper/implbase_ex_post.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex_pre.hxx,cppuhelper/implbase_ex_pre.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase.hxx,cppuhelper/implbase.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implementationentry.hxx,cppuhelper/implementationentry.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/interfacecontainer.h,cppuhelper/interfacecontainer.h))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/interfacecontainer.hxx,cppuhelper/interfacecontainer.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/propertysetmixin.hxx,cppuhelper/propertysetmixin.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/propshlp.hxx,cppuhelper/propshlp.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/proptypehlp.h,cppuhelper/proptypehlp.h))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/proptypehlp.hxx,cppuhelper/proptypehlp.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/queryinterface.hxx,cppuhelper/queryinterface.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/shlib.hxx,cppuhelper/shlib.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/supportsservice.hxx,cppuhelper/supportsservice.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/typeprovider.hxx,cppuhelper/typeprovider.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/unourl.hxx,cppuhelper/unourl.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weakagg.hxx,cppuhelper/weakagg.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weak.hxx,cppuhelper/weak.hxx))
|
||||
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weakref.hxx,cppuhelper/weakref.hxx))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@@ -10,7 +10,7 @@
|
||||
$(eval $(call gb_StaticLibrary_StaticLibrary,findsofficepath))
|
||||
|
||||
$(eval $(call gb_StaticLibrary_use_packages,findsofficepath,\
|
||||
cppuhelper_inc \
|
||||
cppuhelper_odk_headers \
|
||||
sal_odk_headers \
|
||||
))
|
||||
|
||||
|
||||
87
cppuhelper/ZipPackage_cppuhelper_odk_headers.mk
Normal file
87
cppuhelper/ZipPackage_cppuhelper_odk_headers.mk
Normal file
@@ -0,0 +1,87 @@
|
||||
# -*- 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> (initial developer)
|
||||
#
|
||||
# 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,cppuhelper_odk_headers,$(SRCDIR)/cppuhelper/inc))
|
||||
|
||||
$(eval $(call gb_ZipPackage_add_files,cppuhelper_odk_headers,inc/cppuhelper,include/cppuhelper,\
|
||||
cppuhelper/cppuhelperdllapi.h \
|
||||
cppuhelper/access_control.hxx \
|
||||
cppuhelper/basemutex.hxx \
|
||||
cppuhelper/bootstrap.hxx \
|
||||
cppuhelper/compbase10.hxx \
|
||||
cppuhelper/compbase11.hxx \
|
||||
cppuhelper/compbase12.hxx \
|
||||
cppuhelper/compbase1.hxx \
|
||||
cppuhelper/compbase2.hxx \
|
||||
cppuhelper/compbase3.hxx \
|
||||
cppuhelper/compbase4.hxx \
|
||||
cppuhelper/compbase5.hxx \
|
||||
cppuhelper/compbase6.hxx \
|
||||
cppuhelper/compbase7.hxx \
|
||||
cppuhelper/compbase8.hxx \
|
||||
cppuhelper/compbase9.hxx \
|
||||
cppuhelper/compbase_ex.hxx \
|
||||
cppuhelper/compbase.hxx \
|
||||
cppuhelper/component_context.hxx \
|
||||
cppuhelper/component.hxx \
|
||||
cppuhelper/exc_hlp.hxx \
|
||||
cppuhelper/factory.hxx \
|
||||
cppuhelper/findsofficepath.h \
|
||||
cppuhelper/implbase10.hxx \
|
||||
cppuhelper/implbase11.hxx \
|
||||
cppuhelper/implbase12.hxx \
|
||||
cppuhelper/implbase1.hxx \
|
||||
cppuhelper/implbase2.hxx \
|
||||
cppuhelper/implbase3.hxx \
|
||||
cppuhelper/implbase4.hxx \
|
||||
cppuhelper/implbase5.hxx \
|
||||
cppuhelper/implbase6.hxx \
|
||||
cppuhelper/implbase7.hxx \
|
||||
cppuhelper/implbase8.hxx \
|
||||
cppuhelper/implbase9.hxx \
|
||||
cppuhelper/implbase_ex.hxx \
|
||||
cppuhelper/implbase_ex_post.hxx \
|
||||
cppuhelper/implbase_ex_pre.hxx \
|
||||
cppuhelper/implbase.hxx \
|
||||
cppuhelper/implementationentry.hxx \
|
||||
cppuhelper/interfacecontainer.h \
|
||||
cppuhelper/interfacecontainer.hxx \
|
||||
cppuhelper/propertysetmixin.hxx \
|
||||
cppuhelper/propshlp.hxx \
|
||||
cppuhelper/proptypehlp.h \
|
||||
cppuhelper/proptypehlp.hxx \
|
||||
cppuhelper/queryinterface.hxx \
|
||||
cppuhelper/shlib.hxx \
|
||||
cppuhelper/supportsservice.hxx \
|
||||
cppuhelper/typeprovider.hxx \
|
||||
cppuhelper/unourl.hxx \
|
||||
cppuhelper/weakagg.hxx \
|
||||
cppuhelper/weak.hxx \
|
||||
cppuhelper/weakref.hxx \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@@ -30,7 +30,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu))
|
||||
$(eval $(call gb_StaticLibrary_use_packages,ulingu,\
|
||||
comphelper_inc \
|
||||
cppu_odk_headers \
|
||||
cppuhelper_inc \
|
||||
cppuhelper_odk_headers \
|
||||
i18npool_inc \
|
||||
linguistic_inc \
|
||||
tools_inc \
|
||||
|
||||
@@ -23,7 +23,7 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
|
||||
$(call gb_Package_get_target,sal_odk_headers) \
|
||||
$(call gb_Package_get_target,salhelper_odk_headers) \
|
||||
$(call gb_Package_get_target,cppu_odk_headers) \
|
||||
$(call gb_Package_get_target,cppuhelper_inc) \
|
||||
$(call gb_Package_get_target,cppuhelper_odk_headers) \
|
||||
$(call gb_Package_get_target,store_inc) \
|
||||
$(call gb_Package_get_target,registry_inc)
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\
|
||||
basegfx_inc \
|
||||
comphelper_inc \
|
||||
cppu_odk_headers \
|
||||
cppuhelper_inc \
|
||||
cppuhelper_odk_headers \
|
||||
o3tl_inc \
|
||||
tools_inc \
|
||||
))
|
||||
|
||||
@@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,testtools_bridgetest_s,boost_headers
|
||||
|
||||
$(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\
|
||||
cppu_odk_headers \
|
||||
cppuhelper_inc \
|
||||
cppuhelper_odk_headers \
|
||||
))
|
||||
|
||||
$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\
|
||||
|
||||
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,headless,\
|
||||
basegfx_inc \
|
||||
comphelper_inc \
|
||||
cppu_odk_headers \
|
||||
cppuhelper_inc \
|
||||
cppuhelper_odk_headers \
|
||||
i18npool_inc \
|
||||
i18nutil_inc \
|
||||
o3tl_inc \
|
||||
|
||||
@@ -22,7 +22,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
|
||||
$(eval $(call gb_StaticLibrary_use_packages,vclmain,\
|
||||
comphelper_inc \
|
||||
cppu_odk_headers \
|
||||
cppuhelper_inc \
|
||||
cppuhelper_odk_headers \
|
||||
tools_inc \
|
||||
))
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect))
|
||||
$(eval $(call gb_StaticLibrary_use_packages,writerperfect,\
|
||||
comphelper_inc \
|
||||
cppu_odk_headers \
|
||||
cppuhelper_inc \
|
||||
cppuhelper_odk_headers \
|
||||
sot_inc \
|
||||
tools_inc \
|
||||
unotools_inc \
|
||||
|
||||
Reference in New Issue
Block a user