[Libreoffice-commits] core.git: 9 commits - bean/Library_officebean.mk codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk cosv/StaticLibrary_cosv.mk cppu/CustomTarget_cppu_allheaders.mk cppuhelper/CustomTarget_cppuhelper_allheaders.mk cppuhelper/Module_cppuhelper.mk cppuhelper/Package_inc.mk cppuhelper/StaticLibrary_findsofficepath.mk cppuhelper/ZipPackage_cppuhelper_odk_headers.mk cppu/Library_cppu.mk cppu/Module_cppu.mk cppu/Package_inc.mk cppu/ZipPackage_cppu_odk_headers.mk embedserv/Library_inprocserv.mk extensions/StaticLibrary_npsoenv.mk extensions/StaticLibrary_plugcon.mk i18npool/Library_i18nisolang1.mk jurt/Library_jpipe.mk l10ntools/StaticLibrary_transex.mk lingucomponent/StaticLibrary_ulingu.mk np_sdk/StaticLibrary_nputils.mk odk/CustomTarget_doxygen.mk odk/CustomTarget_include.mk pyuno/Library_pyuno_wrapper.mk registry/Library_reg.mk registry/Module_registry.mk registry/Package_inc.mk registry/StaticLibrary_r egistry_helper.mk registry/ZipPackage_registry_odk_headers.mk sal/CustomTarget_sal_allheaders.mk salhelper/CustomTarget_salhelper_allheaders.mk salhelper/Library_salhelper.mk salhelper/Module_salhelper.mk salhelper/Package_inc.mk salhelper/ZipPackage_salhelper_odk_headers.mk sal/Library_sal.mk sal/Module_sal.mk sal/Package_generated.mk sal/Package_inc.mk sal/StaticLibrary_salcpprt.mk sal/ZipPackage_sal_generated.mk sal/ZipPackage_sal_odk_headers.mk sax/StaticLibrary_sax_shared.mk scp2/source sdext/Executable_xpdfimport.mk sdext/StaticLibrary_pdfimport_s.mk solenv/gbuild store/Library_store.mk store/Module_store.mk store/Package_inc.mk store/ZipPackage_store_odk_headers.mk svx/AllLangResTarget_svx.mk testtools/StaticLibrary_bridgetest.mk tools/StaticLibrary_ooopathutils.mk udm/StaticLibrary_udm.mk vcl/StaticLibrary_headless.mk vcl/StaticLibrary_vclmain.mk writerperfect/StaticLibrary_writerperfect.mk
Michael Stahl
mstahl at redhat.com
Tue Feb 26 16:35:32 PST 2013
bean/Library_officebean.mk | 2
codemaker/StaticLibrary_codemaker.mk | 4
codemaker/StaticLibrary_codemaker_cpp.mk | 4
codemaker/StaticLibrary_codemaker_java.mk | 4
cosv/StaticLibrary_cosv.mk | 2
cppu/CustomTarget_cppu_allheaders.mk | 9 +-
cppu/Library_cppu.mk | 2
cppu/Module_cppu.mk | 2
cppu/Package_inc.mk | 69 ---------------
cppu/ZipPackage_cppu_odk_headers.mk | 83 ++++++++++++++++++
cppuhelper/CustomTarget_cppuhelper_allheaders.mk | 6 -
cppuhelper/Module_cppuhelper.mk | 2
cppuhelper/Package_inc.mk | 85 -------------------
cppuhelper/StaticLibrary_findsofficepath.mk | 4
cppuhelper/ZipPackage_cppuhelper_odk_headers.mk | 87 +++++++++++++++++++
embedserv/Library_inprocserv.mk | 2
extensions/StaticLibrary_npsoenv.mk | 2
extensions/StaticLibrary_plugcon.mk | 2
i18npool/Library_i18nisolang1.mk | 2
jurt/Library_jpipe.mk | 2
l10ntools/StaticLibrary_transex.mk | 2
lingucomponent/StaticLibrary_ulingu.mk | 4
np_sdk/StaticLibrary_nputils.mk | 2
odk/CustomTarget_doxygen.mk | 25 ++++-
odk/CustomTarget_include.mk | 27 ------
pyuno/Library_pyuno_wrapper.mk | 2
registry/Library_reg.mk | 2
registry/Module_registry.mk | 2
registry/Package_inc.mk | 43 ---------
registry/StaticLibrary_registry_helper.mk | 2
registry/ZipPackage_registry_odk_headers.mk | 45 ++++++++++
sal/CustomTarget_sal_allheaders.mk | 4
sal/Library_sal.mk | 1
sal/Module_sal.mk | 3
sal/Package_generated.mk | 36 --------
sal/Package_inc.mk | 79 -----------------
sal/StaticLibrary_salcpprt.mk | 2
sal/ZipPackage_sal_generated.mk | 36 ++++++++
sal/ZipPackage_sal_odk_headers.mk | 102 +++++++++++++++++++++++
salhelper/CustomTarget_salhelper_allheaders.mk | 6 -
salhelper/Library_salhelper.mk | 2
salhelper/Module_salhelper.mk | 2
salhelper/Package_inc.mk | 40 ---------
salhelper/ZipPackage_salhelper_odk_headers.mk | 42 +++++++++
sax/StaticLibrary_sax_shared.mk | 2
scp2/source/sdkoo/module_sdkoo.scp | 9 +-
scp2/source/sdkoo/sdkoo.scp | 49 +++++++++++
sdext/Executable_xpdfimport.mk | 2
sdext/StaticLibrary_pdfimport_s.mk | 4
solenv/gbuild/ZipPackage.mk | 40 +++++++++
solenv/gbuild/gbuild.mk | 1
store/Library_store.mk | 2
store/Module_store.mk | 2
store/Package_inc.mk | 34 -------
store/ZipPackage_store_odk_headers.mk | 36 ++++++++
svx/AllLangResTarget_svx.mk | 2
testtools/StaticLibrary_bridgetest.mk | 4
tools/StaticLibrary_ooopathutils.mk | 2
udm/StaticLibrary_udm.mk | 2
vcl/StaticLibrary_headless.mk | 4
vcl/StaticLibrary_vclmain.mk | 4
writerperfect/StaticLibrary_writerperfect.mk | 4
62 files changed, 614 insertions(+), 475 deletions(-)
New commits:
commit 9b16031c5e3197bf685703bf236e53b5910b4f70
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Feb 27 01:29:42 2013 +0100
odk, scp2: remove the horribly broken "find" in CustomTarget_include
... and instead bundle the *_odk_headers zip files.
Change-Id: Ice86f8e22d3a6fa46f7cee38193dffdd0479d491
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index cde87c4..2a18fbf 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -13,6 +13,19 @@ odkcommon_ZIPLIST += docs/cpp/ref
CPPDOCREFNAME := "UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) C/C++ API Reference"
+odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \
+ registry $(if $(filter WNT,$(OS)),systools)
+odk_INCFILELIST := 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
+
# Cygwin Doxygen needs unix paths
DOXY_INPUT := $(docu_SRCDIR)/main.dox $(addprefix $(OUTDIR)/inc/,$(odk_INCDIRLIST) $(odk_INCFILELIST))
DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT))
diff --git a/odk/CustomTarget_include.mk b/odk/CustomTarget_include.mk
index 8d1ee5a..c8a12c3 100644
--- a/odk/CustomTarget_include.mk
+++ b/odk/CustomTarget_include.mk
@@ -11,33 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/include))
include $(SRCDIR)/solenv/inc/udkversion.mk
-odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \
- registry $(if $(filter WNT,$(OS)),systools)
-odk_INCFILELIST := 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
-odk_INCLIST := $(subst $(OUTDIR)/inc/,,$(shell find \
- $(foreach dir,$(odk_INCDIRLIST),$(OUTDIR)/inc/$(dir)) -type f)) \
- $(odk_INCFILELIST)
-
-define odk_inc
-odkcommon_ZIPLIST += include/$(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon/include): $(odk_WORKDIR)/include/$(1)
-$(odk_WORKDIR)/include/$(1): $(OUTDIR)/inc/$(1)
- mkdir -p $$(dir $$@)
- $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
- cp $$< $$@
-endef
-
-$(foreach inc,$(odk_INCLIST),$(eval $(call odk_inc,$(inc))))
-
odkcommon_ZIPLIST += include/udkversion.mk
$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/include,include/udkversion.mk))
$(odk_WORKDIR)/include/udkversion.mk:
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index b24bd7a..732388c 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -33,5 +33,12 @@ Module gid_Module_Optional_Sdkoo
Sortkey = "630";
ParentID = gid_Module_Optional;
Default = NO;
- Files = (gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon);
+ Files = (gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon,
+ gid_File_Zip_Odkheaders_sal_generated,
+ gid_File_Zip_Odkheaders_sal,
+ gid_File_Zip_Odkheaders_salhelper,
+ gid_File_Zip_Odkheaders_cppu,
+ gid_File_Zip_Odkheaders_cppuhelper,
+ gid_File_Zip_Odkheaders_store,
+ gid_File_Zip_Odkheaders_registry);
End
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 88eb508..02dc536 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -131,6 +131,55 @@ File gid_File_Zip_Odkcommon
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
End
+File gid_File_Zip_Odkheaders_sal_generated
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "sal_generated.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_sal
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "sal_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_salhelper
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "salhelper_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_cppu
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "cppu_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_cppuhelper
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "cppuhelper_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_store
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "store_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_registry
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "registry_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
#if (!defined(WNT) && !defined( MACOSX) )
Directory gid_Dir_Lib_Sdk
Styles = (CREATE);
commit 5c60cebafdc6d6d773c794c0a4ee58d63782df22
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Feb 27 00:23:07 2013 +0100
store: new ZipPackage_store_odk_headers
Change-Id: I2d4e2853014ef30419a66c8f9b2675b92d60adb6
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 36009e2..cde87c4 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -24,7 +24,7 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
$(call gb_Package_get_target,salhelper_odk_headers) \
$(call gb_Package_get_target,cppu_odk_headers) \
$(call gb_Package_get_target,cppuhelper_odk_headers) \
- $(call gb_Package_get_target,store_inc) \
+ $(call gb_Package_get_target,store_odk_headers) \
$(call gb_Package_get_target,registry_odk_headers)
diff --git a/store/Library_store.mk b/store/Library_store.mk
index f66c1eb..0954692 100644
--- a/store/Library_store.mk
+++ b/store/Library_store.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,store))
$(eval $(call gb_Library_set_soversion_script,store,3,$(SRCDIR)/store/util/store.map))
$(eval $(call gb_Library_use_packages,store,\
- store_inc \
+ store_odk_headers \
))
$(eval $(call gb_Library_add_defs,store,\
diff --git a/store/Module_store.mk b/store/Module_store.mk
index 9f166ac..f6a9454 100644
--- a/store/Module_store.mk
+++ b/store/Module_store.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,store))
$(eval $(call gb_Module_add_targets,store,\
Library_store \
- Package_inc \
+ ZipPackage_store_odk_headers \
))
# vim:set noet sw=4 ts=4:
diff --git a/store/Package_inc.mk b/store/Package_inc.mk
deleted file mode 100644
index 11c3e15..0000000
--- a/store/Package_inc.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; 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) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (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,store_inc,$(SRCDIR)/store))
-
-$(eval $(call gb_Package_add_file,store_inc,inc/store/store.h,inc/store/store.h))
-$(eval $(call gb_Package_add_file,store_inc,inc/store/store.hxx,inc/store/store.hxx))
-$(eval $(call gb_Package_add_file,store_inc,inc/store/storedllapi.h,inc/store/storedllapi.h))
-$(eval $(call gb_Package_add_file,store_inc,inc/store/types.h,inc/store/types.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/store/ZipPackage_store_odk_headers.mk b/store/ZipPackage_store_odk_headers.mk
new file mode 100644
index 0000000..cb21dbc
--- /dev/null
+++ b/store/ZipPackage_store_odk_headers.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; 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) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (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,store_odk_headers,$(SRCDIR)/store/inc/store))
+
+$(eval $(call gb_ZipPackage_add_files,store_odk_headers,inc/store,include/store,\
+ store.h \
+ store.hxx \
+ storedllapi.h \
+ types.h \
+))
+
+# vim: set noet sw=4 ts=4:
commit ba8372449befc6c534ab9596d7a3fd1e66884d61
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Feb 27 00:17:12 2013 +0100
registry: new ZipPackage_registry_odk_headers
Change-Id: I0730e0a354ec952cdb67d1b22067ab59c86334c0
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index d967c07..9f7f6f0 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker,boost_headers))
$(eval $(call gb_StaticLibrary_use_packages,codemaker,\
codemaker_inc \
- registry_inc \
+ registry_odk_headers \
sal_generated \
sal_odk_headers \
))
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index aa01e78..4a8edaf 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_cpp,boost_headers))
$(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
codemaker_inc \
- registry_inc \
+ registry_odk_headers \
sal_generated \
sal_odk_headers \
))
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index 810f071..03d9f07 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_java,boost_headers))
$(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
codemaker_inc \
- registry_inc \
+ registry_odk_headers \
sal_generated \
sal_odk_headers \
))
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index f041fc8..36009e2 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -25,7 +25,7 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
$(call gb_Package_get_target,cppu_odk_headers) \
$(call gb_Package_get_target,cppuhelper_odk_headers) \
$(call gb_Package_get_target,store_inc) \
- $(call gb_Package_get_target,registry_inc)
+ $(call gb_Package_get_target,registry_odk_headers)
$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html))
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index 375f162..1c79a00 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,reg))
$(eval $(call gb_Library_set_soversion_script,reg,3,$(SRCDIR)/registry/util/reg.map))
$(eval $(call gb_Library_use_packages,reg,\
- registry_inc \
+ registry_odk_headers \
))
$(eval $(call gb_Library_add_defs,reg,\
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 0ad5226..fce6fa4 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,registry))
$(eval $(call gb_Module_add_targets,registry,\
Library_reg \
- Package_inc \
+ ZipPackage_registry_odk_headers \
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/registry/Package_inc.mk b/registry/Package_inc.mk
deleted file mode 100644
index 6d67701..0000000
--- a/registry/Package_inc.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; 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) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (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,registry_inc,$(SRCDIR)/registry/inc/registry))
-
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.h,reader.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.hxx,reader.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflread.hxx,reflread.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/refltype.hxx,refltype.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflwrit.hxx,reflwrit.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/regdllapi.h,regdllapi.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.h,registry.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.hxx,registry.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/regtype.h,regtype.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/types.h,types.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/version.h,version.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.h,writer.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.hxx,writer.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/registry/ZipPackage_registry_odk_headers.mk b/registry/ZipPackage_registry_odk_headers.mk
new file mode 100644
index 0000000..ca0d738
--- /dev/null
+++ b/registry/ZipPackage_registry_odk_headers.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; 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) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (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,registry_odk_headers,$(SRCDIR)/registry/inc/registry))
+
+$(eval $(call gb_ZipPackage_add_files,registry_odk_headers,inc/registry,include/registry,\
+ reader.h \
+ reader.hxx \
+ reflread.hxx \
+ refltype.hxx \
+ reflwrit.hxx \
+ regdllapi.h \
+ registry.h \
+ registry.hxx \
+ regtype.h \
+ types.h \
+ version.h \
+ writer.h \
+ writer.hxx \
+))
+
+# vim: set noet sw=4 ts=4:
commit 836bde622df9cf0c50b598abe80bccda05d36be5
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Feb 27 00:06:26 2013 +0100
cppuhelper: new ZipPackage_cppuhelper_odk_headers
Change-Id: I77d7ef6890ca584cf022059838c318a2811bcd5d
diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
index 582a42a..e5f9081 100644
--- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
+++ b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
@@ -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) \
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
index b1d89b5..2a917fe 100644
--- a/cppuhelper/Module_cppuhelper.mk
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -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,\
diff --git a/cppuhelper/Package_inc.mk b/cppuhelper/Package_inc.mk
deleted file mode 100644
index af5a823..0000000
--- a/cppuhelper/Package_inc.mk
+++ /dev/null
@@ -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 at 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:
diff --git a/cppuhelper/StaticLibrary_findsofficepath.mk b/cppuhelper/StaticLibrary_findsofficepath.mk
index 4b97bcd..446577b 100644
--- a/cppuhelper/StaticLibrary_findsofficepath.mk
+++ b/cppuhelper/StaticLibrary_findsofficepath.mk
@@ -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 \
))
diff --git a/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk b/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk
new file mode 100644
index 0000000..d696507
--- /dev/null
+++ b/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk
@@ -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 at 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:
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index 5eee0fa..318f36b 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -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 \
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 9087a3b..f041fc8 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -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)
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 935b0aa..82256e2 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -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 \
))
diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk
index fcd1782..9f31be8 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -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,\
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
index 2a4d9bc..82b852d 100644
--- a/vcl/StaticLibrary_headless.mk
+++ b/vcl/StaticLibrary_headless.mk
@@ -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 \
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index a47e043..b7198c7 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -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 \
))
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index d36dc3a..9762184 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -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 \
commit 936d7badcb640731add02881c32a167c1dae569b
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 26 23:57:15 2013 +0100
cppu: new ZipPackage_cppu_odk_headers
Change-Id: I4ceee0ed3438a18e13c186ebd8d390604d26ec28
diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk
index ce9f214..6d5ebeb 100644
--- a/cppu/CustomTarget_cppu_allheaders.mk
+++ b/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) \
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index f3b99e4..dd6e433 100644
--- a/cppu/Library_cppu.mk
+++ b/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))
diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk
index 7742d2d..6a5bf32 100644
--- a/cppu/Module_cppu.mk
+++ b/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,\
diff --git a/cppu/Package_inc.mk b/cppu/Package_inc.mk
deleted file mode 100644
index 6e14e22..0000000
--- a/cppu/Package_inc.mk
+++ /dev/null
@@ -1,69 +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 at 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:
diff --git a/cppu/ZipPackage_cppu_odk_headers.mk b/cppu/ZipPackage_cppu_odk_headers.mk
new file mode 100644
index 0000000..0b7c9dc
--- /dev/null
+++ b/cppu/ZipPackage_cppu_odk_headers.mk
@@ -0,0 +1,83 @@
+# -*- 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 at 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:
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index 9930c7b..a888629 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/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 \
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk
index 3864c6e..d487f92 100644
--- a/i18npool/Library_i18nisolang1.mk
+++ b/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 \
))
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index 98bfed3..5eee0fa 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/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 \
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 528cbbb..9087a3b 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/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)
diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk
index bf6887c..5fb6cab 100644
--- a/sax/StaticLibrary_sax_shared.mk
+++ b/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,\
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 6e6c6a0..935b0aa 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/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 \
diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk
index 5f94303..fcd1782 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/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 \
))
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
index 1dc5b0c..2a4d9bc 100644
--- a/vcl/StaticLibrary_headless.mk
+++ b/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 \
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 547081a..a47e043 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/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 \
))
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index e5dbbf5..d36dc3a 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/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 \
commit b1cbf8f767ff5f120e6bb3b3adf88002ec9e919e
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 26 23:43:31 2013 +0100
salhelper: new ZipPackage_salhelper_odk_headers
Change-Id: I83172bd105496dd1af8090a01ebfac864958e20c
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 5e472f2..528cbbb 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -21,7 +21,7 @@ DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(
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_inc) \
+ $(call gb_Package_get_target,salhelper_odk_headers) \
$(call gb_Package_get_target,cppu_inc) \
$(call gb_Package_get_target,cppuhelper_inc) \
$(call gb_Package_get_target,store_inc) \
diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk
index 2ec5a62..60498aa 100644
--- a/salhelper/CustomTarget_salhelper_allheaders.mk
+++ b/salhelper/CustomTarget_salhelper_allheaders.mk
@@ -32,10 +32,12 @@ salhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,salhelper/allhead
$(call gb_CustomTarget_get_target,salhelper/allheaders) : \
$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx
-# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
+# dependency on Package_salhelper_odk_headers.mk should ensure this is
+# updated whenever a new public header is added
$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \
$(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \
- | $(salhelper_allheaders_DIR)/.dir $(SRCDIR)/salhelper/Package_inc.mk
+ $(SRCDIR)/salhelper/ZipPackage_salhelper_odk_headers.mk \
+ | $(salhelper_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all salhelper/ includes\n' > $@
$(foreach file, $(wildcard $(SRCDIR)/salhelper/inc/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*.hxx) \
diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk
index 7c66678..26c90dc 100644
--- a/salhelper/Library_salhelper.mk
+++ b/salhelper/Library_salhelper.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,salhelper))
-$(eval $(call gb_Library_use_package,salhelper,salhelper_inc))
+$(eval $(call gb_Library_use_package,salhelper,salhelper_odk_headers))
$(eval $(call gb_Library_add_defs,salhelper,\
-DSALHELPER_DLLIMPLEMENTATION \
diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk
index 699fbed..31f3f22 100644
--- a/salhelper/Module_salhelper.mk
+++ b/salhelper/Module_salhelper.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,salhelper))
$(eval $(call gb_Module_add_targets,salhelper,\
CustomTarget_salhelper_allheaders \
Library_salhelper \
- Package_inc \
+ ZipPackage_salhelper_odk_headers \
))
$(eval $(call gb_Module_add_check_targets,salhelper,\
diff --git a/salhelper/Package_inc.mk b/salhelper/Package_inc.mk
deleted file mode 100644
index 7a30c7f..0000000
--- a/salhelper/Package_inc.mk
+++ /dev/null
@@ -1,40 +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 at 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,salhelper_inc,$(SRCDIR)/salhelper/inc/salhelper))
-
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/salhelperdllapi.h,salhelperdllapi.h))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/condition.hxx,condition.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/dynload.hxx,dynload.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/linkhelper.hxx,linkhelper.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/refobj.hxx,refobj.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/simplereferenceobject.hxx,simplereferenceobject.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/singletonref.hxx,singletonref.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/thread.hxx,thread.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/timer.hxx,timer.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/salhelper/ZipPackage_salhelper_odk_headers.mk b/salhelper/ZipPackage_salhelper_odk_headers.mk
new file mode 100644
index 0000000..8de4d5f
--- /dev/null
+++ b/salhelper/ZipPackage_salhelper_odk_headers.mk
@@ -0,0 +1,42 @@
+# -*- 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 at 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,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper))
+
+$(eval $(call gb_ZipPackage_add_files,salhelper_odk_headers,inc/salhelper,include/salhelper,\
+ salhelperdllapi.h \
+ condition.hxx \
+ dynload.hxx \
+ linkhelper.hxx \
+ refobj.hxx \
+ simplereferenceobject.hxx \
+ singletonref.hxx \
+ thread.hxx \
+ timer.hxx \
+))
+
+# vim: set noet sw=4 ts=4:
commit 58cd5303238dc95ec410b73ea5cddf8b357c2ec8
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 26 23:28:20 2013 +0100
sal: why deliver log-areas.dox at all?
Change-Id: Ie3ebb133777644177dadec652dcaf04d6c7c3833
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index 613cf26..daee605 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/file.h,osl/detail/file.
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/android-bootstrap.h,osl/detail/android-bootstrap.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/ios-bootstrap.h,osl/detail/ios-bootstrap.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/component-mapping.h,osl/detail/component-mapping.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/log-areas.dox,sal/log-areas.dox))
$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comptr.hxx,systools/win32/comptr.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comtools.hxx,systools/win32/comtools.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/qswin32.h,systools/win32/qswin32.h))
commit 308cac3f2328b6284f0d071ad21497a0db38aed0
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 26 23:25:41 2013 +0100
sal: new ZipPackage_sal_odk_headers for public ODK headers
Change-Id: I76cb00121d7b4c21137be70ab7a5bd5389037302
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 160d9c6..cfc0caf 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_Library,officebean))
ifneq ($(OS),WNT)
$(eval $(call gb_Library_use_packages,officebean,\
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_Library_use_externals,officebean,\
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index 510b2c5..d967c07 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker,\
codemaker_inc \
registry_inc \
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index 2ee9c4e..aa01e78 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
codemaker_inc \
registry_inc \
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index 1bcdb25..810f071 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
codemaker_inc \
registry_inc \
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\
diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk
index 666da6b..a2bef2b 100644
--- a/cosv/StaticLibrary_cosv.mk
+++ b/cosv/StaticLibrary_cosv.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,cosv))
$(eval $(call gb_StaticLibrary_use_packages,cosv,\
cosv_inc \
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\
diff --git a/cppuhelper/StaticLibrary_findsofficepath.mk b/cppuhelper/StaticLibrary_findsofficepath.mk
index a33c13a..4b97bcd 100644
--- a/cppuhelper/StaticLibrary_findsofficepath.mk
+++ b/cppuhelper/StaticLibrary_findsofficepath.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,findsofficepath))
$(eval $(call gb_StaticLibrary_use_packages,findsofficepath,\
cppuhelper_inc \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_add_cobjects,findsofficepath,\
diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk
index d04bce8..32011b0 100644
--- a/embedserv/Library_inprocserv.mk
+++ b/embedserv/Library_inprocserv.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\
))
$(eval $(call gb_Library_use_packages,inprocserv,\
- sal_inc \
+ sal_odk_headers \
))
ifeq ($(COM),MSC)
diff --git a/extensions/StaticLibrary_npsoenv.mk b/extensions/StaticLibrary_npsoenv.mk
index 96c3ce3..8786f37 100644
--- a/extensions/StaticLibrary_npsoenv.mk
+++ b/extensions/StaticLibrary_npsoenv.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,npsoenv))
$(eval $(call gb_StaticLibrary_use_packages,npsoenv,\
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,npsoenv,\
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 316caa2..af15ade 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_cobjects,jpipe,\
))
$(eval $(call gb_Library_use_packages,jpipe,\
- sal_inc \
+ sal_odk_headers \
))
else
diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk
index e5cad80..a6f4d21 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,transex))
$(eval $(call gb_StaticLibrary_use_packages,transex,\
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_set_include,transex,\
diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index 264ea03..327be43 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/np_sdk/StaticLibrary_nputils.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,nputils))
$(eval $(call gb_StaticLibrary_use_packages,nputils,\
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_use_externals,nputils,\
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index d31ab03..5e472f2 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -20,7 +20,7 @@ DOXY_WORKDIR := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(odk_WORKDIR)/docs/
DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc)
DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
$(SRCDIR)/odk/pack/gendocu/main.dox \
- $(call gb_Package_get_target,sal_inc) \
+ $(call gb_Package_get_target,sal_odk_headers) \
$(call gb_Package_get_target,salhelper_inc) \
$(call gb_Package_get_target,cppu_inc) \
$(call gb_Package_get_target,cppuhelper_inc) \
diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk
index 2384baf..507c8f4 100644
--- a/pyuno/Library_pyuno_wrapper.mk
+++ b/pyuno/Library_pyuno_wrapper.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,pyuno_wrapper))
$(eval $(call gb_Library_use_packages,pyuno_wrapper,\
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_Library_set_include,pyuno_wrapper,\
diff --git a/registry/StaticLibrary_registry_helper.mk b/registry/StaticLibrary_registry_helper.mk
index 07469df..5655074 100644
--- a/registry/StaticLibrary_registry_helper.mk
+++ b/registry/StaticLibrary_registry_helper.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,registry_helper))
$(eval $(call gb_StaticLibrary_use_packages,registry_helper,\
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,registry_helper,\
diff --git a/sal/CustomTarget_sal_allheaders.mk b/sal/CustomTarget_sal_allheaders.mk
index dfef1ea..3374568 100644
--- a/sal/CustomTarget_sal_allheaders.mk
+++ b/sal/CustomTarget_sal_allheaders.mk
@@ -34,7 +34,9 @@ $(call gb_CustomTarget_get_target,sal/allheaders) : \
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
$(sal_allheaders_DIR)/sal_allheaders.hxx : $(SRCDIR)/sal/CustomTarget_sal_allheaders.mk \
- | $(sal_allheaders_DIR)/.dir $(SRCDIR)/sal/Package_inc.mk
+ $(SRCDIR)/sal/ZipPackage_sal_odk_headers.mk \
+ $(SRCDIR)/sal/Package_inc.mk \
+ | $(sal_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all sal/ includes\n' > $@
printf '#ifdef WNT\n' >> $@
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 62f9ce3..0d19b3f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precom
$(eval $(call gb_Library_use_packages,sal,\
sal_generated \
+ sal_odk_headers \
sal_inc \
))
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 7d20fa3..b683275 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -41,8 +41,9 @@ $(eval $(call gb_Module_add_targets,sal,\
$(if $(filter $(OS),WNT), \
Library_uwinapi) \
Package_inc \
- Package_generated \
StaticLibrary_salcpprt \
+ ZipPackage_sal_generated \
+ ZipPackage_sal_odk_headers \
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/sal/Package_generated.mk b/sal/Package_generated.mk
deleted file mode 100644
index 5bc43dc..0000000
--- a/sal/Package_generated.mk
+++ /dev/null
@@ -1,36 +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 at 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,sal_generated,$(call gb_CustomTarget_get_workdir,sal/generated)))
-
-$(eval $(call gb_Package_add_file,sal_generated,inc/sal/udkversion.h,sal/udkversion.h))
-
-ifneq ($(COM),MSC)
-$(eval $(call gb_Package_add_file,sal_generated,inc/sal/typesizes.h,sal/typesizes.h))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index 15fb477..613cf26 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -28,89 +28,11 @@
$(eval $(call gb_Package_Package,sal_inc,$(SRCDIR)/sal/inc))
$(eval $(call gb_Package_add_file,sal_inc,inc/protectorfactory.hxx,cppunittester/protectorfactory.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.h,osl/conditn.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.hxx,osl/conditn.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/diagnose.h,osl/diagnose.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/diagnose.hxx,osl/diagnose.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/doublecheckedlocking.h,osl/doublecheckedlocking.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/endian.h,osl/endian.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/file.h,osl/file.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/file.hxx,osl/file.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/getglobalmutex.hxx,osl/getglobalmutex.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/interlck.h,osl/interlck.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/module.h,osl/module.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/module.hxx,osl/module.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/mutex.h,osl/mutex.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/mutex.hxx,osl/mutex.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/nlsupport.h,osl/nlsupport.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/pipe_decl.hxx,osl/pipe_decl.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/pipe.h,osl/pipe.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/pipe.hxx,osl/pipe.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/process.h,osl/process.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/profile.h,osl/profile.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/profile.hxx,osl/profile.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security_decl.hxx,osl/security_decl.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security.h,osl/security.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security.hxx,osl/security.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/signal.h,osl/signal.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket_decl.hxx,osl/socket_decl.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket.h,osl/socket.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket.hxx,osl/socket.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/thread.h,osl/thread.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/thread.hxx,osl/thread.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/time.h,osl/time.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/util.h,osl/util.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/file.h,osl/detail/file.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/android-bootstrap.h,osl/detail/android-bootstrap.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/ios-bootstrap.h,osl/detail/ios-bootstrap.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/component-mapping.h,osl/detail/component-mapping.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/allocator.hxx,rtl/allocator.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/alloc.h,rtl/alloc.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/bootstrap.h,rtl/bootstrap.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/bootstrap.hxx,rtl/bootstrap.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/byteseq.h,rtl/byteseq.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/byteseq.hxx,rtl/byteseq.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/cipher.h,rtl/cipher.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/crc.h,rtl/crc.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/digest.h,rtl/digest.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/instance.hxx,rtl/instance.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/locale.h,rtl/locale.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/logfile.h,rtl/logfile.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/logfile.hxx,rtl/logfile.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/malformeduriexception.hxx,rtl/malformeduriexception.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.h,rtl/math.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.hxx,rtl/math.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/process.h,rtl/process.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/random.h,rtl/random.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ref.hxx,rtl/ref.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/strbuf.h,rtl/strbuf.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/strbuf.hxx,rtl/strbuf.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/string.h,rtl/string.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/string.hxx,rtl/string.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/stringconcat.hxx,rtl/stringconcat.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/stringutils.hxx,rtl/stringutils.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/tencinfo.h,rtl/tencinfo.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/textcvt.h,rtl/textcvt.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/textenc.h,rtl/textenc.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/unload.h,rtl/unload.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uri.h,rtl/uri.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uri.hxx,rtl/uri.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustrbuf.h,rtl/ustrbuf.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustrbuf.hxx,rtl/ustrbuf.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustring.h,rtl/ustring.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustring.hxx,rtl/ustring.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uuid.h,rtl/uuid.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/alloca.h,sal/alloca.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/ByteBufferWrapper.hxx,sal/ByteBufferWrapper.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/config.h,sal/config.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/sal/log-areas.dox,sal/log-areas.dox))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/log.hxx,sal/log.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/macros.h,sal/macros.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/main.h,sal/main.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/mathconf.h,sal/mathconf.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/saldllapi.h,sal/saldllapi.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/types.h,sal/types.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/sal/detail/log.h,sal/detail/log.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comptr.hxx,systools/win32/comptr.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comtools.hxx,systools/win32/comtools.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/qswin32.h,systools/win32/qswin32.h))
diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index f86043d..51e76b2 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
$(eval $(call gb_StaticLibrary_use_packages,salcpprt,\
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk
new file mode 100644
index 0000000..dd9af97
--- /dev/null
+++ b/sal/ZipPackage_sal_generated.mk
@@ -0,0 +1,36 @@
+# -*- 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 at 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,sal_generated,$(call gb_CustomTarget_get_workdir,sal/generated)))
+
+$(eval $(call gb_ZipPackage_add_files,sal_generated,inc/sal,include/sal,sal/udkversion.h))
+
+ifneq ($(COM),MSC)
+$(eval $(call gb_ZipPackage_add_files,sal_generated,inc/sal,include/sal,sal/typesizes.h))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/ZipPackage_sal_odk_headers.mk b/sal/ZipPackage_sal_odk_headers.mk
new file mode 100644
index 0000000..56c9d88
--- /dev/null
+++ b/sal/ZipPackage_sal_odk_headers.mk
@@ -0,0 +1,102 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ZipPackage_ZipPackage,sal_odk_headers,$(SRCDIR)/sal/inc))
+
+$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal,include/sal,\
+ sal/alloca.h \
+ sal/ByteBufferWrapper.hxx \
+ sal/config.h \
+ sal/log.hxx \
+ sal/macros.h \
+ sal/main.h \
+ sal/mathconf.h \
+ sal/saldllapi.h \
+ sal/types.h \
+))
+
+$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal/detail,include/sal/detail,\
+ sal/detail/log.h \
+))
+
+$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/rtl,include/rtl,\
+ rtl/allocator.hxx \
+ rtl/alloc.h \
+ rtl/bootstrap.h \
+ rtl/bootstrap.hxx \
+ rtl/byteseq.h \
+ rtl/byteseq.hxx \
+ rtl/cipher.h \
+ rtl/crc.h \
+ rtl/digest.h \
+ rtl/instance.hxx \
+ rtl/locale.h \
+ rtl/logfile.h \
+ rtl/logfile.hxx \
+ rtl/malformeduriexception.hxx \
+ rtl/math.h \
+ rtl/math.hxx \
+ rtl/process.h \
+ rtl/random.h \
+ rtl/ref.hxx \
+ rtl/strbuf.h \
+ rtl/strbuf.hxx \
+ rtl/string.h \
+ rtl/string.hxx \
+ rtl/stringconcat.hxx \
+ rtl/stringutils.hxx \
+ rtl/tencinfo.h \
+ rtl/textcvt.h \
+ rtl/textenc.h \
+ rtl/unload.h \
+ rtl/uri.h \
+ rtl/uri.hxx \
+ rtl/ustrbuf.h \
+ rtl/ustrbuf.hxx \
+ rtl/ustring.h \
+ rtl/ustring.hxx \
+ rtl/uuid.h \
+))
+
+$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/osl,include/osl,\
+ osl/conditn.h \
+ osl/conditn.hxx \
+ osl/diagnose.h \
+ osl/diagnose.hxx \
+ osl/doublecheckedlocking.h \
+ osl/endian.h \
+ osl/file.h \
+ osl/file.hxx \
+ osl/getglobalmutex.hxx \
+ osl/interlck.h \
+ osl/module.h \
+ osl/module.hxx \
+ osl/mutex.h \
+ osl/mutex.hxx \
+ osl/nlsupport.h \
+ osl/pipe_decl.hxx \
+ osl/pipe.h \
+ osl/pipe.hxx \
+ osl/process.h \
+ osl/profile.h \
+ osl/profile.hxx \
+ osl/security_decl.hxx \
+ osl/security.h \
+ osl/security.hxx \
+ osl/signal.h \
+ osl/socket_decl.hxx \
+ osl/socket.h \
+ osl/socket.hxx \
+ osl/thread.h \
+ osl/thread.hxx \
+ osl/time.h \
+ osl/util.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk
index fa9ab93..c5f8b90 100644
--- a/sdext/Executable_xpdfimport.mk
+++ b/sdext/Executable_xpdfimport.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Executable_Executable,xpdfimport))
$(eval $(call gb_Executable_use_packages,xpdfimport,\
sal_generated \
- sal_inc \
+ sal_odk_headers \
))
$(eval $(call gb_Executable_use_externals,xpdfimport,\
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 18a7bbc..ca50785 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/res))
$(eval $(call gb_SrsTarget_use_packages,svx/res,\
editeng_inc \
- sal_inc \
+ sal_odk_headers \
sfx2_inc \
svl_inc \
svtools_inc \
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index 79948e9..d9299f8 100644
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -20,7 +20,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils))
$(eval $(call gb_StaticLibrary_use_packages,ooopathutils,\
- sal_inc \
+ sal_odk_headers \
tools_inc \
))
diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk
index 8b43c8f..3d1b052 100644
--- a/udm/StaticLibrary_udm.mk
+++ b/udm/StaticLibrary_udm.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm))
$(eval $(call gb_StaticLibrary_use_packages,udm,\
cosv_inc \
sal_generated \
- sal_inc \
+ sal_odk_headers \
udm_inc \
))
commit 5e85d8406bbd069c022975ca4e1b7d74914062b5
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 26 23:19:19 2013 +0100
gbuild: add ZipPackage target
This is basically a Zip and a Package in one, so it's not necessary to
enumerate the content twice. The zip is sadly the easiest way to get a
large number of files through scp2 and into instsets.
Change-Id: Idadcced76bf10317fc348ac91203c15c47e8762d
diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk
new file mode 100644
index 0000000..79c14d5
--- /dev/null
+++ b/solenv/gbuild/ZipPackage.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# ZipPackage class
+# this is a bit of a hack, hopefully needed only temporarily because
+# scp2 can easily deal with zip files but not so easily with 100s of
+# individual files; ideally the Package itself should be sufficient.
+
+# sigh... WTF does that scp2/installer look for these in bin and not pck???
+gb_Zip_get_outdir_bin_target = $(OUTDIR)/bin/$(1).zip
+
+define gb_ZipPackage_ZipPackage
+$(call gb_Package_Package,$(1),$(2))
+$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1))
+$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_outdir_bin_target,$(1))
+$(call gb_Zip_get_outdir_bin_target,$(1)) : $(call gb_Zip_get_target,$(1))
+ cp $$< $$@
+$(call gb_Package_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1))
+
+endef
+
+# sadly Package delivers to inc/ but ODK path is include/ so need to
+# copy files twice
+# $(1) package
+# $(2) dir in package
+# $(3) dir in zip
+# $(4) file list
+define gb_ZipPackage_add_files
+$(call gb_Package_add_files,$(1),$(2),$(4))
+$(foreach file,$(4),$(call gb_Zip_add_file,$(1),$(3)/$(notdir $(file)),$(gb_Package_SOURCEDIR_$(1))/$(file)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 7c9d5ec..b0b6f92 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -334,6 +334,7 @@ include $(foreach class, \
CliNativeLibrary \
CliUnoApi \
Zip \
+ ZipPackage \
AllLangZip \
Configuration \
HelpTarget \
More information about the Libreoffice-commits
mailing list