refactor UnoApi class

offapi/Module_offapi.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Module_Module,offapi))
 
 $(eval $(call gb_Module_add_targets,offapi,\
 	UnoApi_offapi \
-	UnoApi_types \
-	Package_offapi_idl \
-	Package_offapi_inc \
+	UnoApiMerge_types \
 ))
 
 # vim: set noet sw=4 ts=4:

offapi/Package_offapi_idl.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_UnoApiTarget_autopackage_idl,offapi))
-
-# vim: set noet sw=4 ts=4:

offapi/Package_offapi_inc.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_UnoApiTarget_autopackage_inc,offapi))
-
-# vim: set noet sw=4 ts=4:

offapi/UnoApi_types.mk → offapi/UnoApiMerge_types.mk

@@ -26,21 +26,21 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
+$(eval $(call gb_UnoApiMerge_UnoApiMerge,types))
 
-$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
+$(eval $(call gb_UnoApiMerge_add_rdbfiles,types,\
     udkapi \
     offapi \
 ))
 
-$(eval $(call gb_UnoApiTarget_add_reference_rdbfile,types,\
+$(eval $(call gb_UnoApiMerge_add_reference_rdbfile,types,\
     offapi/type_reference/types \
 ))
 
 # ugly hack for now!
 statistic : $(gb_Helper_MISC)/api_statistic
 
-$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiTarget_get_target,types)
-	$(PERL) util/checknewapi.pl $(call gb_UnoApiTarget_get_target,types) $(UNOAPI_REFERENCE_types) "$(RSCREVISION)" "$(gb_UnoApiTarget_REGVIEWTARGET)" > $@
+$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiMerge_get_target,types)
+	$(PERL) util/checknewapi.pl $(call gb_UnoApiMerge_get_target,types) $(UNOAPI_REFERENCE_types) "$(RSCREVISION)" "$(gb_UnoApiMerge_REGVIEWTARGET)" > $@
 
 # vim: set noet sw=4 ts=4:

oovbaapi/Module_oovbaapi.mk

@@ -31,8 +31,6 @@ $(eval $(call gb_Module_Module,oovbaapi))
 
 $(eval $(call gb_Module_add_targets,oovbaapi,\
 	UnoApi_oovbaapi \
-	Package_oovbaapi_inc \
-	Package_oovbaapi_idl \
 ))
 
 # vim: set noet sw=4 ts=4:

oovbaapi/Package_oovbaapi_idl.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_UnoApiTarget_autopackage_idl,oovbaapi))
-
-# vim: set noet sw=4 ts=4:

oovbaapi/Package_oovbaapi_inc.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_UnoApiTarget_autopackage_inc,oovbaapi))
-
-# vim: set noet sw=4 ts=4:

oovbaapi/UnoApi_oovbaapi.mk

@@ -26,20 +26,20 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi))
+$(eval $(call gb_UnoApi_UnoApi,oovbaapi))
 
-$(eval $(call gb_UnoApiTarget_add_rdbfiles,oovbaapi,\
+$(eval $(call gb_UnoApi_add_api,oovbaapi,\
     udkapi \
     offapi \
 ))
 
-$(eval $(call gb_UnoApiTarget_set_include,oovbaapi,\
+$(eval $(call gb_UnoApi_set_include,oovbaapi,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/oovbaapi \
 	-I$(OUTDIR)/idl \
 ))
 
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\
 	Globals \
 	Hyperlink \
 	Range \
@@ -49,18 +49,18 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel
 	Worksheet \
 ))
 
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\
 	ControlProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/msforms,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/msforms,\
 	MSFormReturnTypes \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\
 	Button \
 	SheetObjects \
 ))
 
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
     FormShowConstants \
     VbAppWinStyle \
     VbCalendar \
@@ -110,7 +110,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
 	XVBAToOOEventDescGen \
 	XWindowBase \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\
     AcCloseSave \
     AcColorIndex \
     AcCommand \
@@ -165,7 +165,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\
     ProcKind \
     RefKind \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\
     ADCPROP_ASYNCTHREADPRIORITY_ENUM \
     ADCPROP_AUTORECALC_ENUM \
     ADCPROP_UPDATECRITERIA_ENUM \
@@ -200,7 +200,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\
     StringFormatEnum \
     XactAttributeEnum \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\
     CollatingOrderEnum \
     CommitTransOptionsEnum \
     CursorDriverEnum \
@@ -227,7 +227,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\
     UpdateTypeEnum \
     WorkspaceTypeEnum \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
     Constants \
 	XApplication \
 	XAxes \
@@ -492,7 +492,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
 	XWorksheetFunction \
 	XWorksheets \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
     fmAction \
     fmAlignment \
     fmBackStyle \
@@ -565,7 +565,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
 	XToggleButton \
 	XUserForm \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\
     DocProperties \
     MailFormat \
     MsoAlertButtonType \
@@ -689,7 +689,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\
     MsoWizardMsgType \
     MsoZOrderCmd \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\
     MsoAnimAccumulate \
     MsoAnimAdditive \
     MsoAnimAfterEffect \
@@ -760,11 +760,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,
     PpViewType \
     PpWindowState \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/stdole,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/stdole,\
     LoadPictureConstants \
     OLE_TRISTATE \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/word,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/word,\
     WdAlertLevel \
     WdAnimation \
     WdArabicNumeral \

solenv/gbuild/TargetLocations.mk

@@ -46,8 +46,8 @@ gb_PackagePart_get_target = $(OUTDIR)/$(1)
 gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
 gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
 gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
-gb_TypesRdb_get_outdir_target = $(OUTDIR)/rdb/$(1).rdb
-gb_UnoApiTarget_get_outdir_target = $(OUTDIR)/bin/$(1).rdb
+gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb
+gb_UnoApiMerge_get_target = $(OUTDIR)/bin/$(1).rdb
 gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
 gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
 # outdir targets: $(1) is path
@@ -119,10 +119,14 @@ gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
 gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
 gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
 gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
-gb_TypesRdb_get_target = $(WORKDIR)/TypesRdb/$(1).rdb
-gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).done
+gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
+gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive
+gb_UnoApiHeadersTarget_get_lightweight_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/lightweight
+gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal
+gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.done
+gb_UnoApiHeadersTarget_get_lightweight_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/lightweight.done
+gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done
 gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
-gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
 gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
 # workdir targets: $(1) is prefix/path
 gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
@@ -174,10 +178,10 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	SdiTarget \
 	SrsTarget \
 	SrsTemplateTarget \
-	TypesRdb \
 	CppunitTest \
 	CustomTarget \
 	ExternalLib \
+	UnoApiHeadersTarget \
 	UnoApiTarget \
 	WinResTarget \
 	YaccTarget \
@@ -195,6 +199,8 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
 	Executable \
 	Library \
 	StaticLibrary \
+	UnoApi \
+	UnoApiMerge \
 ))
 
 $(eval $(call gb_Helper_make_dep_targets,\

solenv/gbuild/UnoApi.mk

+# -*- 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 Red Hat, Inc., David Tardon <dtardon@redhat.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.
+
+$(call gb_UnoApi_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),UNO,4)
+	$(call gb_Deliver_deliver,$(call gb_UnoApiTarget_get_target,$*),$@)
+
+.PHONY : $(call gb_UnoApi_get_clean_target,%)
+$(call gb_UnoApi_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),UNO,4)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		rm -f $(call gb_UnoApi_get_target,$*))
+
+define gb_UnoApi_UnoApi
+$(call gb_UnoApiTarget_UnoApiTarget,$(1))
+$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
+$(call gb_Package_Package,$(1)_idl,$(SRCDIR))
+$(call gb_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_lightweight_dir,$(1)))
+
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1))
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_inc)
+$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
+$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
+$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl)
+$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_inc)
+
+$(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1))
+
+$(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
+
+$$(eval $$(call gb_Module_register_target,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApi_get_clean_target,$(1))))
+
+endef
+
+define gb_UnoApi__add_idlfile
+$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(2)),$(2))
+
+endef
+
+define gb_UnoApi__add_headerfile_impl
+$(call gb_Package_add_file,$(1)_inc,inc/$(2),$(3))
+$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(3))
+
+endef
+
+# Note: the expression in 3rd arg of call of gb_UnoApi__add_headerfile_impl
+# removes the leftmost dir in the subpath .-)
+define gb_UnoApi__add_headerfile
+$(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$(words $(subst /, ,$(2))),$(subst /, ,$(2)))))
+
+endef
+
+define gb_UnoApi__add_idlfile_noheader
+$(call gb_UnoApi__add_idlfile,$(1),$(2).idl)
+
+endef
+
+define gb_UnoApi__add_idlfile_nohdl
+$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2))
+$(call gb_UnoApi__add_headerfile,$(1),$(2).hpp)
+
+endef
+
+define gb_UnoApi__add_idlfile_full
+$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2))
+$(call gb_UnoApi__add_headerfile,$(1),$(2).hdl)
+
+endef
+
+# for interfaces, exceptions, structs, enums, constant groups
+define gb_UnoApi_add_idlfile
+$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
+$(call gb_UnoApi__add_idlfile_full,$(1),$(2)/$(3))
+
+endef
+
+define gb_UnoApi_add_idlfiles
+$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_full,$(1),$(2)/$(idl)))
+
+endef
+
+# for new-style services
+define gb_UnoApi_add_idlfile_nohdl
+$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
+$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2)/$(3))
+
+endef
+
+define gb_UnoApi_add_idlfiles_nohdl
+$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2)/$(idl)))
+
+endef
+
+# for old-style services and modules
+define gb_UnoApi_add_idlfile_noheader
+$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
+$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(3))
+
+endef
+
+define gb_UnoApi_add_idlfiles_noheader
+$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl)))
+
+endef
+
+define gb_UnoApi__add_api
+$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(2))
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
+
+endef
+
+define gb_UnoApi_add_api
+$(foreach rdb,$(2),$(call gb_UnoApi__add_api,$(1),$(rdb)))
+
+endef
+
+define gb_UnoApi_add_reference_rdbfile
+$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2))
+
+endef
+
+define gb_UnoApi_set_include
+$(call gb_UnoApiTarget_set_include,$(1),$(2))
+
+endef
+
+# vim: set noet sw=4 ts=4:

solenv/gbuild/TypesRdb.mk → solenv/gbuild/UnoApiMerge.mk

@@ -12,7 +12,7 @@
 # License.
 #
 # Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
 #  (initial developer)
 #
 # All Rights Reserved.
@@ -25,64 +25,34 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-gb_TypesRdb_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge)
-gb_TypesRdb_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_TypesRdb_REGMERGETARGET)
+# Note: targets for this class are the same as for UnoApi, therefore
+# there is no need to define them again (and if we did, they would
+# overwrite the UnoApi targets anyway...)
 
-define gb_TypesRdb__command_impl
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(1) $(2) $(3))) && \
-$(gb_TypesRdb_REGMERGECOMMAND) @$${RESPONSEFILE} && \
-rm -f $${RESPONSEFILE}
-endef
-
-define gb_TypesRdb__command
-$(call gb_Output_announce,$*,$(true),RDB,3)
-mkdir -p $(dir $(1)) && \
-$(if $(TYPESRDB_FILES),$(call gb_TypesRdb__command_impl,$(1),UCR,$(TYPESRDB_FILES)),true) && \
-$(if $(TYPESRDB_MERGE),$(call gb_TypesRdb__command_impl,$(1),/,$(TYPESRDB_MERGE)),true)
-endef
-
-$(call gb_TypesRdb_get_outdir_target,%) :
-	$(call gb_Deliver_deliver,$(call gb_TypesRdb_get_target,$*),$@)
-
-$(call gb_TypesRdb_get_target,%) :
-	$(call gb_TypesRdb__command,$@,$*,$<,$?)
+define gb_UnoApiMerge_UnoApiMerge
+$(call gb_UnoApiTarget_UnoApiTarget,$(1))
 
-.PHONY : $(call gb_TypesRdb_get_clean_target,%)
-$(call gb_TypesRdb_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),RDB,3)
-	$(call gb_Helper_convert_native,\
-		rm -f $(call gb_TypesRdb_get_target,$*) $(call gb_TypesRdb_get_outdir_target,$*))
+$(call gb_UnoApiMerge_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiMerge_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
 
-define gb_TypesRdb_TypesRdb
-$(call gb_TypesRdb_get_outdir_target,$(1)) : $(call gb_TypesRdb_get_target,$(1))
-$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_FILES :=
-$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_MERGE :=
-
-$(call gb_Deliver_add_deliverable,$(call gb_TypesRdb_get_outdir_target,$(1)),$(call gb_TypesRdb_get_target,$(1)),$(1))
-
-$$(eval $$(call gb_Module_register_target,$(call gb_TypesRdb_get_outdir_target,$(1)),$(call gb_TypesRdb_get_clean_target,$(1))))
-
-endef
+$(call gb_Deliver_add_deliverable,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
 
-define gb_TypesRdb_add_urdfile
-$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_FILES += $(2)
-$(call gb_TypesRdb_get_target,$(1)) : $(2)
+$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1))))
 
 endef
 
-define gb_TypesRdb_add_urdfiles
-$(foreach urd,$(2),$(call gb_TypesRdb_add_urdfile,$(1),$(urd)))
+define gb_UnoApiMerge_add_rdbfile
+$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(2))
 
 endef
 
-define gb_TypesRdb_add_rdbfile
-$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_MERGE += $(call gb_TypesRdb_get_outdir_target,$(2))
-$(call gb_TypesRdb_get_target,$(1)) : $(call gb_TypesRdb_get_outdir_target,$(2))
+define gb_UnoApiMerge_add_rdbfiles
+$(foreach rdb,$(2),$(call gb_UnoApiMerge_add_rdbfile,$(1),$(rdb)))
 
 endef
 
-define gb_TypesRdb_add_rdbfiles
-$(foreach rdb,$(2),$(call gb_TypesRdb_add_rdbfile,$(1),$(rdb)))
+define gb_UnoApiMerge_add_reference_rdbfile
+$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2))
 
 endef
 

solenv/gbuild/gbuild.mk

@@ -289,8 +289,9 @@ include $(foreach class, \
 	JavaClassSet \
 	JunitTest \
 	Module \
-	TypesRdb \
 	UnoApiTarget \
+	UnoApi \
+	UnoApiMerge \
 	Zip \
 	Configuration \
 	Extension \

udkapi/Module_udkapi.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Module_Module,udkapi))
 
 $(eval $(call gb_Module_add_targets,udkapi,\
 	UnoApi_udkapi \
-	UnoApi_uretypes \
-	Package_udkapi_inc \
-	Package_udkapi_idl \
+	UnoApiMerge_uretypes \
 ))
 
 # vim: set noet sw=4 ts=4:

udkapi/Package_udkapi_idl.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_UnoApiTarget_autopackage_idl,udkapi))
-
-# vim: set noet sw=4 ts=4:

udkapi/Package_udkapi_inc.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_UnoApiTarget_autopackage_inc,udkapi))
-
-# vim: set noet sw=4 ts=4:

udkapi/UnoApi_uretypes.mk → udkapi/UnoApiMerge_uretypes.mk

@@ -26,9 +26,9 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types))
+$(eval $(call gb_UnoApiMerge_UnoApiMerge,ure/types))
 
-$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\
+$(eval $(call gb_UnoApiMerge_add_rdbfiles,ure/types,\
     udkapi \
 ))