From 857adeada9cc3276e79ceb828959a3ffe2d7409b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 10 Apr 2013 16:08:08 +0200 Subject: Revert "registry: new ZipPackage_registry_odk_headers" This reverts commit ba8372449befc6c534ab9596d7a3fd1e66884d61. The "reg" library is not actually a stable URE interface. Conflicts: odk/CustomTarget_doxygen.mk registry/Module_registry.mk Change-Id: Ic53e1b8eecd6a12c9ec194df2f0093004db7c01b --- codemaker/StaticLibrary_codemaker.mk | 2 +- codemaker/StaticLibrary_codemaker_cpp.mk | 2 +- codemaker/StaticLibrary_codemaker_java.mk | 2 +- registry/Library_reg.mk | 2 +- registry/Module_registry.mk | 2 +- registry/Package_inc.mk | 43 +++++++++++++++++++++++++++ registry/ZipPackage_registry_odk_headers.mk | 45 ----------------------------- 7 files changed, 48 insertions(+), 50 deletions(-) create mode 100644 registry/Package_inc.mk delete mode 100644 registry/ZipPackage_registry_odk_headers.mk diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index ebd86c881718..f95842fe37bb 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_odk_headers \ + registry_inc \ sal_generated \ sal_odk_headers \ salhelper_odk_headers \ diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index 7bd556506785..6c081ffefcb6 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_odk_headers \ + registry_inc \ sal_generated \ sal_odk_headers \ salhelper_odk_headers \ diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index 4ef12c366994..096da0fd78de 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_odk_headers \ + registry_inc \ sal_generated \ sal_odk_headers \ salhelper_odk_headers \ diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index 1c79a0048191..375f162a5a91 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_odk_headers \ + registry_inc \ )) $(eval $(call gb_Library_add_defs,reg,\ diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index 7806c2a36d01..3d0eb9611956 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 \ - ZipPackage_registry_odk_headers \ + Package_inc \ $(if $(filter-out $(OS),IOS), \ Executable_regmerge \ Executable_regview \ diff --git a/registry/Package_inc.mk b/registry/Package_inc.mk new file mode 100644 index 000000000000..6d67701bf73e --- /dev/null +++ b/registry/Package_inc.mk @@ -0,0 +1,43 @@ +# -*- 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 (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 deleted file mode 100644 index ca0d7388e139..000000000000 --- a/registry/ZipPackage_registry_odk_headers.mk +++ /dev/null @@ -1,45 +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 (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: -- cgit