diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-06 14:24:47 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-06 14:31:05 +0200 |
| commit | 7545dbbf64e959cfb166556935946f442199e92b (patch) | |
| tree | 8ffd1c318cd4c3ff1efc54b0683660033c6d0002 | |
| parent | 7d82fb18fe6ae68f6eb6a33c6030105f9e2fe232 (diff) | |
| parent | 7e94a37403aa4470bd7dad7c549ba8bc7485620a (diff) | |
merge feature/gbuild_components
105 files changed, 2757 insertions, 2579 deletions
@@ -65,6 +65,7 @@ hwpfilter\ i18npool\ i18nutil\ idl\ +io\ javaunohelper\ jurt\ jvmaccess\ @@ -103,6 +104,7 @@ slideshow\ smoketest\ sot\ starmath\ +stoc\ svl\ svtools\ svx\ @@ -174,7 +176,6 @@ icc\ icu\ idlc\ instsetoo_native\ -io\ jfreereport\ jpeg\ l10ntools\ @@ -227,7 +228,6 @@ solenv\ soltools\ stax\ stlport\ -stoc\ store\ sysui\ testtools\ diff --git a/Repository.mk b/Repository.mk index a1126692132e..4484e5f944d3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -505,10 +505,22 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ endif $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ + acceptor \ binaryurp \ bootstrap \ + connector \ + introspection \ + invocadapt \ + invocation \ + javaloader \ + javavm \ + namingservice \ + proxyfac \ reflection \ stocservices \ + streams \ + textinstream \ + textoutstream \ )) $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index ba71994f367a..2ad7f4189710 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -105,6 +105,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ smoketest \ sot \ starmath \ + stoc \ svl \ svtools \ svx \ diff --git a/io/InternalUnoApi_acceptor.mk b/io/InternalUnoApi_acceptor.mk new file mode 100644 index 000000000000..ddd31d2252b2 --- /dev/null +++ b/io/InternalUnoApi_acceptor.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,acceptor)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,acceptor,io/source/acceptor/acceptor.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/InternalUnoApi_connectr.mk b/io/InternalUnoApi_connectr.mk new file mode 100644 index 000000000000..489606978772 --- /dev/null +++ b/io/InternalUnoApi_connectr.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,connectr)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,connectr,io/source/connector/connectr.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/InternalUnoApi_stm.mk b/io/InternalUnoApi_stm.mk new file mode 100644 index 000000000000..723e5fa689d1 --- /dev/null +++ b/io/InternalUnoApi_stm.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,stm)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,stm,io/source/stm/stm.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk new file mode 100644 index 000000000000..12639b98baab --- /dev/null +++ b/io/Library_acceptor.mk @@ -0,0 +1,49 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,acceptor)) + +$(eval $(call gb_Library_add_internal_api,acceptor,\ + acceptor \ +)) + +$(eval $(call gb_Library_add_linked_libs,acceptor,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor)) + +$(eval $(call gb_Library_add_exception_objects,acceptor,\ + io/source/acceptor/acc_pipe \ + io/source/acceptor/acc_socket \ + io/source/acceptor/acceptor \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/Library_connector.mk b/io/Library_connector.mk new file mode 100644 index 000000000000..07ddfb9b705f --- /dev/null +++ b/io/Library_connector.mk @@ -0,0 +1,49 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,connector)) + +$(eval $(call gb_Library_add_internal_api,connector,\ + connectr \ +)) + +$(eval $(call gb_Library_add_linked_libs,connector,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connector)) + +$(eval $(call gb_Library_add_exception_objects,connector,\ + io/source/connector/connector \ + io/source/connector/ctr_pipe \ + io/source/connector/ctr_socket \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/Library_streams.mk b/io/Library_streams.mk new file mode 100644 index 000000000000..66d866371040 --- /dev/null +++ b/io/Library_streams.mk @@ -0,0 +1,52 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,streams)) + +$(eval $(call gb_Library_add_internal_api,streams,\ + stm \ +)) + +$(eval $(call gb_Library_add_linked_libs,streams,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams)) + +$(eval $(call gb_Library_add_exception_objects,streams,\ + io/source/stm/factreg \ + io/source/stm/odata \ + io/source/stm/omark \ + io/source/stm/opipe \ + io/source/stm/opump \ + io/source/stm/streamhelper \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk new file mode 100644 index 000000000000..b6d0f82ec9a7 --- /dev/null +++ b/io/Library_textinstream.mk @@ -0,0 +1,47 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,textinstream)) + +$(eval $(call gb_Library_add_api,textinstream,\ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,textinstream,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream)) + +$(eval $(call gb_Library_add_exception_objects,textinstream,\ + io/source/TextInputStream/TextInputStream \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk new file mode 100644 index 000000000000..6de90504ba73 --- /dev/null +++ b/io/Library_textoutstream.mk @@ -0,0 +1,47 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,textoutstream)) + +$(eval $(call gb_Library_add_api,textoutstream,\ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,textoutstream,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream)) + +$(eval $(call gb_Library_add_exception_objects,textoutstream,\ + io/source/TextOutputStream/TextOutputStream \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/inc/makefile.mk b/io/Makefile index 1a0bae8da30d..7bbbe6c703e6 100644 --- a/io/inc/makefile.mk +++ b/io/Makefile @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,17 +25,16 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=.. -PRJNAME=io -TARGET=inc +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk +else -# --- Settings ----------------------------------------------------- +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- -.ENDIF # L10N_framework +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -.INCLUDE : target.mk +endif +# vim: set noet sw=4 ts=4: diff --git a/io/Module_io.mk b/io/Module_io.mk new file mode 100644 index 000000000000..f0a3ebf88957 --- /dev/null +++ b/io/Module_io.mk @@ -0,0 +1,42 @@ +# -*- 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. + +$(eval $(call gb_Module_Module,io)) + +$(eval $(call gb_Module_add_targets,io,\ + InternalUnoApi_acceptor \ + InternalUnoApi_connectr \ + InternalUnoApi_stm \ + Library_acceptor \ + Library_connector \ + Library_streams \ + Library_textinstream \ + Library_textoutstream \ + Package_xml \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/Package_xml.mk b/io/Package_xml.mk new file mode 100644 index 000000000000..a310dc051890 --- /dev/null +++ b/io/Package_xml.mk @@ -0,0 +1,34 @@ +# -*- 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. + +$(eval $(call gb_Package_Package,io/source)) + +$(eval $(call gb_Package_add_file,xml/acceptor.uno.xml,acceptor/acceptor.xml)) +$(eval $(call gb_Package_add_file,xml/connector.uno.xml,connector/connectr.xml)) +$(eval $(call gb_Package_add_file,xml/streams.uno.xml,stm/stm.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/prj/build.lst b/io/prj/build.lst index 4d54cc5f099b..061791bde8b5 100644 --- a/io/prj/build.lst +++ b/io/prj/build.lst @@ -1,8 +1,3 @@ io io : LIBXSLT:libxslt DESKTOP:rdbmaker cppuhelper NULL io io usr1 - all io_mkout NULL -io io\inc nmake - all io_inc NULL -io io\source\acceptor nmake - all io_acceptor io_connector io_inc NULL -io io\source\connector nmake - all io_connector io_inc NULL -io io\source\stm nmake - all io_stm io_inc NULL -io io\source\TextInputStream nmake - all io_txtistr io_inc NULL -io io\source\TextOutputStream nmake - all io_txtostr io_inc NULL +io io\prj nmake - all io_prj NULL diff --git a/io/prj/d.lst b/io/prj/d.lst index 963dfa28644b..e69de29bb2d1 100644 --- a/io/prj/d.lst +++ b/io/prj/d.lst @@ -1,13 +0,0 @@ -..\%__SRC%\bin\*.dll %_DEST%\bin\* -..\%__SRC%\bin\*.rdb %_DEST%\rdb\* -..\source\acceptor\acceptor.xml %_DEST%\xml\acceptor.uno.xml -..\source\connector\connectr.xml %_DEST%\xml\connector.uno.xml -..\source\stm\stm.xml %_DEST%\xml\streams.uno.xml -..\%__SRC%\lib\*.so %_DEST%\lib\* -..\%__SRC%\lib\*.dylib %_DEST%\lib\* -..\%__SRC%\lib\*.a %_DEST%\lib\* -..\%__SRC%\misc\acceptor.component %_DEST%\xml\acceptor.component -..\%__SRC%\misc\connector.component %_DEST%\xml\connector.component -..\%__SRC%\misc\streams.component %_DEST%\xml\streams.component -..\%__SRC%\misc\textinstream.component %_DEST%\xml\textinstream.component -..\%__SRC%\misc\textoutstream.component %_DEST%\xml\textoutstream.component diff --git a/io/prj/makefile.mk b/io/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/io/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk deleted file mode 100644 index 3c7ed2b8362a..000000000000 --- a/io/source/TextInputStream/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=io -TARGET = $(ENFORCEDSHLPREFIX)textinstream.uno -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -DLLPRE = - -SLOFILES= \ - $(SLO)$/TextInputStream.obj - -SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1RPATH= URELIB - -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ -.ENDIF # L10N_framework - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/textinstream.component - -$(MISC)/textinstream.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt textinstream.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt textinstream.component diff --git a/io/source/TextOutputStream/makefile.mk b/io/source/TextOutputStream/makefile.mk deleted file mode 100644 index 37c913cea18d..000000000000 --- a/io/source/TextOutputStream/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=io -TARGET = $(ENFORCEDSHLPREFIX)textoutstream.uno -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -DLLPRE = -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/TextOutputStream.obj - -SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1RPATH= URELIB - -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ -.ENDIF # L10N_framework - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/textoutstream.component - -$(MISC)/textoutstream.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt textoutstream.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt textoutstream.component diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk deleted file mode 100644 index 6e23b3ceb77f..000000000000 --- a/io/source/acceptor/makefile.mk +++ /dev/null @@ -1,87 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=io -TARGET = $(ENFORCEDSHLPREFIX)acceptor.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = acceptor -COMPRDB=$(SOLARBINDIR)$/udkapi.rdb - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -DLLPRE = -# ------------------------------------------------------------------ - -.IF "$(OS)" != "IOS" - -UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb -UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb -UNOUCROUT=$(OUT)$/inc$/acceptor -INCPRE+= $(UNOUCROUT) - - -SLOFILES= \ - $(SLO)$/acceptor.obj \ - $(SLO)$/acc_pipe.obj \ - $(SLO)$/acc_socket.obj - -SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map -SHL1RPATH=URELIB - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - -.ENDIF # IOS - -.ENDIF # L10N_framework - -.INCLUDE : target.mk - -.IF "$(OS)" != "IOS" - -$(MISC)/acceptor.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - acceptor.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt acceptor.component - -ALLTAR : $(MISC)/acceptor.component - -.ENDIF # IOS diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk deleted file mode 100644 index a4f7956f8350..000000000000 --- a/io/source/connector/makefile.mk +++ /dev/null @@ -1,87 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=io -TARGET = $(ENFORCEDSHLPREFIX)connector.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = connectr -COMPRDB=$(SOLARBINDIR)$/udkapi.rdb - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -DLLPRE = -# ------------------------------------------------------------------ - -.IF "$(OS)" != "IOS" - -UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb -UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb -UNOUCROUT=$(OUT)$/inc$/connector -INCPRE+= $(UNOUCROUT) - - -SLOFILES= \ - $(SLO)$/connector.obj\ - $(SLO)$/ctr_pipe.obj\ - $(SLO)$/ctr_socket.obj - -SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map -SHL1RPATH=URELIB - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - -.ENDIF # IOS - -.ENDIF # L10N_framework - -.INCLUDE : target.mk - -.IF "$(OS)" != "IOS" - -ALLTAR : $(MISC)/connector.component - -$(MISC)/connector.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - connector.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt connector.component - -.ENDIF # IOS diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk deleted file mode 100644 index 5094fb081c9d..000000000000 --- a/io/source/stm/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=io -TARGET = $(ENFORCEDSHLPREFIX)streams.uno - -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = stm -COMPRDB=$(SOLARBINDIR)$/udkapi.rdb - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -DLLPRE = -# --- Files -------------------------------------------------------- -UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb -UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb -UNOUCROUT=$(OUT)$/inc$/stm -INCPRE+= $(UNOUCROUT) - - -SLOFILES = $(SLO)$/opipe.obj\ - $(SLO)$/factreg.obj\ - $(SLO)$/omark.obj\ - $(SLO)$/odata.obj \ - $(SLO)$/streamhelper.obj \ - $(SLO)$/opump.obj - -SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1RPATH= URELIB - -DEF1NAME= $(SHL1TARGET) - - -# --- Targets ------------------------------------------------------ -.ENDIF # L10N_framework - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/streams.component - -$(MISC)/streams.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - streams.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt streams.component diff --git a/offapi/Module_offapi.mk b/offapi/Module_offapi.mk index 6f77ab6d8633..a78b14126846 100644 --- a/offapi/Module_offapi.mk +++ b/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: diff --git a/offapi/Package_offapi_idl.mk b/offapi/Package_offapi_idl.mk deleted file mode 100644 index e1a01fb6c9f1..000000000000 --- a/offapi/Package_offapi_idl.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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: diff --git a/offapi/Package_offapi_inc.mk b/offapi/Package_offapi_inc.mk deleted file mode 100644 index f7f7634f16c6..000000000000 --- a/offapi/Package_offapi_inc.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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: diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApiMerge_types.mk index df0da0603c27..a97945d3dfe5 100644 --- a/offapi/UnoApi_types.mk +++ b/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: diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index ffe8d7732245..1a47d4943c59 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -26,23 +26,23 @@ # #************************************************************************* -$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi)) +$(eval $(call gb_UnoApi_UnoApi,offapi)) -$(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\ +$(eval $(call gb_UnoApi_add_api,offapi,\ udkapi \ )) -$(eval $(call gb_UnoApiTarget_set_include,offapi,\ +$(eval $(call gb_UnoApi_set_include,offapi,\ $$(INCLUDE) \ -I$(SRCDIR)/offapi \ -I$(OUTDIR)/idl \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\ TargetPropertiesCreator \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ AsyncCallback \ ContainerWindowProvider \ DialogProvider \ @@ -52,53 +52,53 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt, TabController \ UnoControlDialogModelProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\ DefaultGridDataModel \ SortableGridDataModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\ UnoControlTabPageModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\ MutableTreeDataModel \ MutableTreeNode \ TreeControl \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\ DatabaseDataProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\ ReadOnlyAccess \ ReadWriteAccess \ Update \ theDefaultProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\ ExtensionManager \ PackageInformationProvider \ PackageRegistryBackend \ UpdateInformationProvider \ thePackageManagerFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\ SmoketestCommandEnvironment \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\ LicenseDialog \ PackageManagerDialog \ UpdateRequiredDialog \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\ DocumentProperties \ DocumentRevisionListPersistence \ OleEmbeddedServerRegistration \ OOXMLDocumentPropertiesImporter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\ SlideRenderer \ SlideSorter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\ BasicPaneFactory \ BasicToolBarFactory \ BasicViewFactory \ @@ -107,42 +107,42 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/draw ModuleController \ ResourceId \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\ DocumentCloser \ FileSystemStorageFactory \ InstanceLocker \ OLESimpleStorage \ StorageFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\ DefaultFormComponentInspectorModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\ FormOperations \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ DispatchHelper \ DispatchRecorderSupplier \ DocumentTemplates \ MediaTypeDetectionHelper \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\ GraphicObject \ GraphicProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\ DefaultHelpProvider \ GenericPropertyHandler \ ObjectInspector \ ObjectInspectorModel \ StringRepresentation \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\ LanguageGuessing \ Proofreader \ ProofreadingIterator \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\ ConsoleHandler \ CsvLogFormatter \ DocumentIOLogRing \ @@ -151,35 +151,35 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logg PlainTextFormatter \ SimpleLogRing \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\ MailMessage \ MailServiceProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\ Manager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\ MozillaBootstrap \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\ PluginManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\ SlideShow \ TransitionFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\ BlankNode \ Literal \ Repository \ URI \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\ Canvas \ CanvasFactory \ MtfRenderer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\ FixedLine \ FixedText \ FormatCondition \ @@ -194,45 +194,45 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/repo Section \ Shape \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\ DefaultComponentInspectorModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\ OfficeResourceLoader \ StringResource \ StringResourceWithLocation \ StringResourceWithStorage \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\ ScannerManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\ DocumentDialogLibraryContainer \ DocumentScriptLibraryContainer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\ ScriptURIHelper \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\ VBAEventProcessor \ VBAMacroResolver \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\ DataAccessDescriptorFactory \ DatabaseInteractionHandler \ InteractionHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\ CopyTableWizard \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\ ConnectionPool \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\ CertificateContainer \ SerialNumberAdapter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ ExternalDocLink \ ExternalDocLinks \ ExternalSheetCache \ @@ -241,20 +241,20 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/shee RecentFunctions \ Solver \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\ SmartTagAction \ SmartTagRecognizer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ InteractionRequestStringResolver \ JobExecutor \ OfficeRestartManager \ PasswordContainerInteractionHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\ DefaultNumberingProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ AnyCompareFactory \ CachedContentResultSetFactory \ CachedContentResultSetStubFactory \ @@ -267,40 +267,40 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb, SortedDynamicResultSetFactory \ Store \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ GlobalAcceleratorConfiguration \ WindowContentFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\ Wizard \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\ JobManager \ PathSubstitution \ TextSearch \ UriAbbreviation \ URLTransformer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\ FastShapeContextHandler \ FastTokenHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\ modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\ AccessBridge \ Accessible \ AccessibleContext \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\ SSOExceptions \ SSOManagerFactory \ SSOPasswordCache \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ AccessibleButton \ AccessibleCheckBox \ AccessibleComboBox \ @@ -396,21 +396,21 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/a UnoControlTimeField \ UnoControlTimeFieldModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\ DefaultGridColumnModel \ GridColumn \ UnoControlGrid \ UnoControlGridModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\ UnoControlTabPage \ UnoControlTabPageContainer \ UnoControlTabPageContainerModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\ TreeControlModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\ AccessibleChartDocumentView \ AccessibleChartElement \ AreaDiagram \ @@ -447,7 +447,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c StockDiagram \ XYDiagram \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\ Axis \ CandleStickChartType \ ChartDocument \ @@ -477,7 +477,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c StandardDiagramCreationParameters \ Title \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\ DataFilter \ DataProvider \ DataSequence \ @@ -488,7 +488,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c RangeHighlightListener \ TabularDataProviderArguments \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\ AccessRootElement \ AdministrationProvider \ ConfigurationAccess \ @@ -509,7 +509,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c SimpleSetUpdate \ UpdateRootElement \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\ Backend \ BackendAdapter \ CopyImporter \ @@ -544,30 +544,30 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c SystemIntegration \ UpdatableLayer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend/xml,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend/xml,\ LayerParser \ LayerWriter \ SchemaParser \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\ BootstrapContext \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer,\ DataFormatTranslator \ MimeContentTypeFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\ ClipboardManager \ GenericClipboard \ SystemClipboard \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\ OleDragSource \ OleDropTarget \ X11DragSource \ X11DropTarget \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\ DocumentInfo \ EventDescriptor \ Events \ @@ -591,7 +591,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d XMLOasisBasicExporter \ XMLOasisBasicImporter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\ AccessibleDrawDocumentView \ AccessibleGraphControl \ AccessibleGraphicShape \ @@ -662,14 +662,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d TransparencyGradientTable \ modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\ BaseStorage \ EmbeddedObjectDescriptor \ FileSystemStorage \ Storage \ StorageStream \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\ DataAwareControlModel \ FormComponent \ FormComponents \ @@ -680,7 +680,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f PropertyBrowserController \ modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\ BindableControlModel \ BindableDataAwareControlModel \ BindableDatabaseCheckBox \ @@ -696,7 +696,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f ListEntrySource \ ValueBinding \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\ CheckBox \ ComboBox \ CommandButton \ @@ -736,7 +736,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f TextField \ TimeField \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\ CheckBox \ ComboBox \ CommandButton \ @@ -757,7 +757,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f TextField \ TimeField \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\ ButtonNavigationHandler \ CellBindingPropertyHandler \ EditPropertyHandler \ @@ -767,19 +767,19 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f XMLFormsPropertyHandler \ XSDValidationPropertyHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/runtime,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/runtime,\ FormController \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\ ValidatableBindableControlModel \ ValidatableControlModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\ AccessibleFormulaText \ AccessibleFormulaView \ FormulaProperties \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ Components \ ContentHandler \ ContentHandlerFactory \ @@ -810,19 +810,19 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f ToolbarController \ TransientDocumentsDocumentContentFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\ GalleryItem \ GalleryTheme \ GalleryThemeProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\ Graphic \ GraphicDescriptor \ GraphicRasterizer \ GraphicRendererVCL \ MediaProperties \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\ BreakIterator \ ChapterCollator \ CharacterClassification \ @@ -837,21 +837,21 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/i TextConversion \ Transliteration \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\ ImageMap \ ImageMapCircleObject \ ImageMapObject \ ImageMapPolygonObject \ ImageMapRectangleObject \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/installation,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/installation,\ InstallationCheck \ InstallationCheckService \ InternetSettings \ ProtocolHandlerCheck \ ProtocolHandlerCheckService \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\ ConversionDictionary \ ConversionDictionaryList \ Dictionary \ @@ -863,20 +863,20 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/l SpellChecker \ Thesaurus \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\ MenuProxy \ MenuProxyListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\ Package \ PackageFolder \ PackageFolderEnumeration \ PackageStream \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\ ZipFileAccess \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\ ChartShape \ CustomPresentation \ CustomPresentationAccess \ @@ -905,30 +905,26 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/p SubtitleShape \ TitleTextShape \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation/textfield,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation/textfield,\ DateTime \ Footer \ Header \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\ BitmapCanvas \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\ modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\ DataProviderHandler \ ReportComponentHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/scaddins,\ - analysisadd \ - dateadd \ -)) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\ BrowseNode \ BrowseNodeFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\ LanguageScriptProvider \ MasterScriptProvider \ MasterScriptProviderFactory \ @@ -938,11 +934,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s ScriptProviderForJava \ ScriptProviderForJavaScript \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\ VBASpreadsheetEventProcessor \ VBATextEventProcessor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\ CallableStatement \ Column \ ColumnDescriptorControl \ @@ -990,10 +986,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s TableDescriptor \ TableDesign \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\ DefaultViewController \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\ CallableStatement \ Connection \ ConnectionProperties \ @@ -1009,7 +1005,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s RowSet \ Statement \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\ Column \ ColumnDescriptor \ Container \ @@ -1037,14 +1033,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s View \ ViewDescriptor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/security,\ DocumentDigitalSignatures \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\ ProductRegistration \ Setup \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\ AccessibleCell \ AccessibleCsvCell \ AccessibleCsvRuler \ @@ -1156,7 +1152,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s UniqueCellFormatRangesEnumeration \ VolatileResult \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\ CellStyle \ CharacterProperties \ CharacterPropertiesAsian \ @@ -1175,11 +1171,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s StyleFamilies \ StyleFamily \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sync,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sync,\ SyncCollector \ Synchronizer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/system,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/system,\ ProxySettings \ SOffice52ProxySettings \ SimpleCommandMail \ @@ -1187,7 +1183,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s SystemProxySettings \ SystemShellExecute \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\ AccessibleCellView \ AccessibleTableView \ Cell \ @@ -1209,13 +1205,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t TableSortDescriptor \ TableSortDescriptor2 \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\ AsyncJob \ InteractionHandler \ Job \ PasswordContainer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\ AccessibleEndnoteView \ AccessibleFootnoteView \ AccessibleHeaderFooterView \ @@ -1326,14 +1322,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t ViewSettings \ WebDocument \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/fieldmaster,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/fieldmaster,\ Bibliography \ DDE \ Database \ SetExpression \ User \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\ Annotation \ Author \ Bibliography \ @@ -1376,7 +1372,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t User \ WordCount \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\ ChangeAuthor \ ChangeDateTime \ CreateAuthor \ @@ -1395,7 +1391,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t Subject \ Title \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\ + AnyCompareFactory \ CachedContentResultSet \ CachedContentResultSetStub \ CachedDynamicResultSet \ @@ -1446,7 +1443,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u WebDAVDocumentContent \ WebDAVFolderContent \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\ ActionTrigger \ ActionTriggerContainer \ ActionTriggerSeparator \ @@ -1466,12 +1463,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u UIElementSettings \ WindowStateConfiguration \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\ FilePicker \ FilterOptionsDialog \ FolderPicker \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\ NumberFormatProperties \ NumberFormatSettings \ NumberFormats \ @@ -1485,7 +1482,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u SortDescriptor2 \ Sortable \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\ OfficeDocumentView \ PrintOptions \ PrintSettings \ @@ -1494,10 +1491,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/v RenderOptions \ ViewSettings \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\ Binding \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\ AttributeContainer \ ExportFilter \ ImportFilter \ @@ -1509,7 +1506,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x XMLExportFilter \ XMLImportFilter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\ SEInitializer \ SecurityEnvironment \ XMLEncryption \ @@ -1518,29 +1515,29 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x XMLSignature \ XMLSignatureTemplate \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\ Decryptor \ Encryptor \ SAXEventKeeper \ SignatureCreator \ SignatureVerifier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/dom,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/dom,\ SAXDocumentBuilder \ DocumentBuilder \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\ SaxDocumentHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\ XMLDocumentWrapper \ XMLElementWrapper \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/xpath,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/xpath,\ XPathAPI \ XPathExtension \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\ Boolean \ Date \ DateTime \ @@ -1553,7 +1550,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\ AccessibleEventId \ AccessibleEventObject \ AccessibleRelation \ @@ -1587,7 +1584,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/accessibil XAccessibleTextMarkup \ XAccessibleValue \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/animations,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\ AnimationAdditiveMode \ AnimationCalcMode \ AnimationColorSpace \ @@ -1620,7 +1617,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/animations XTimeContainer \ XTransitionFilter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/auth,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/auth,\ AuthenticationFailedException \ InvalidArgumentException \ InvalidContextException \ @@ -1635,7 +1632,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/auth,\ XSSOManagerFactory \ XSSOPasswordCache \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\ ActionEvent \ AdjustmentEvent \ AdjustmentType \ @@ -1832,7 +1829,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt,\ XWindowListener2 \ XWindowPeer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\ GridColumnEvent \ GridDataEvent \ GridInvalidDataException \ @@ -1852,7 +1849,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\ XSortableGridData \ XSortableMutableGridDataModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\ TabPageActivatedEvent \ XTabPage \ XTabPageContainer \ @@ -1860,7 +1857,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\ XTabPageContainerModel \ XTabPageModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\ ExpandVetoException \ TreeDataModelEvent \ TreeExpansionEvent \ @@ -1873,7 +1870,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\ XTreeExpansionListener \ XTreeNode \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart,\ ChartAxisArrangeOrderType \ ChartAxisAssign \ ChartAxisLabelPosition \ @@ -1922,7 +1919,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart,\ XTwoAxisXSupplier \ XTwoAxisYSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\ AxisOrientation \ AxisType \ CoordinateSystemTypeID \ @@ -1975,7 +1972,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2,\ XTitled \ XTransformation \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\ DataSequenceRole \ HighlightedRange \ LabelOrigin \ @@ -1992,7 +1989,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2/dat XSheetDataProvider \ XTextualDataSequence \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configuration,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration,\ CannotLoadConfigurationException \ CorruptedConfigurationException \ CorruptedUIConfigurationException \ @@ -2004,7 +2001,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configurat XTemplateInstance \ XUpdate \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\ AuthenticationFailedException \ BackendAccessException \ BackendSetupException \ @@ -2038,7 +2035,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configurat XUpdateHandler \ XVersionedSchemaSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\ DataFlavor \ UnsupportedFlavorException \ XDataFormatTranslator \ @@ -2051,7 +2048,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransf XTransferableSource \ XTransferableSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\ ClipboardEvent \ RenderingCapabilities \ XClipboard \ @@ -2063,7 +2060,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransf XClipboardOwner \ XFlushableClipboard \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\ DNDConstants \ DragGestureEvent \ DragSourceDragEvent \ @@ -2085,7 +2082,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransf XDropTargetDropContext \ XDropTargetListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/deployment,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/deployment,\ DependencyException \ DeploymentException \ ExtensionRemovedException \ @@ -2105,7 +2102,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/deployment XPackageTypeInfo \ XUpdateInformationProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/document,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\ AmbigousFilterRequest \ BrokenPackageRequest \ ChangedByOthersRequest \ @@ -2173,7 +2170,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/document,\ XVbaMethodParameter \ XViewDataSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\ Alignment \ Arrangement \ BezierPoint \ @@ -2290,7 +2287,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing,\ XSlideSorterBase \ XUniversalShapeDescriptor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\ AnchorBindingMode \ BorderType \ ConfigurationChangeEvent \ @@ -2316,7 +2313,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing/fr XToolBar \ XView \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/embed,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/embed,\ Actions \ Aspects \ ElementModes \ @@ -2383,7 +2380,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/embed,\ XVisualObject \ XWindowSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form,\ DataSelectionType \ DatabaseDeleteEvent \ DatabaseParameterEvent \ @@ -2434,7 +2431,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form,\ XUpdateBroadcaster \ XUpdateListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\ IncompatibleTypesException \ InvalidBindingStateException \ ListEntryEvent \ @@ -2444,7 +2441,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/bindi XListEntrySource \ XValueBinding \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\ FeatureState \ FilterEvent \ FormFeature \ @@ -2455,22 +2452,22 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/runti XFormControllerContext \ XFormOperations \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/submission,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/submission,\ XSubmission \ XSubmissionSupplier \ XSubmissionVetoListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/validation,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/validation,\ XFormComponentValidityListener \ XValidatable \ XValidatableFormComponent \ XValidator \ XValidityConstraintListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/formula,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/formula,\ SymbolDescriptor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ BorderWidths \ CommandGroup \ ControlCommand \ @@ -2563,7 +2560,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XUrlList \ XWindowArranger \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\ ClipboardFormats \ FontHeight \ ItemState \ @@ -2575,13 +2572,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame/stat Verb \ Visibility \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/gallery,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/gallery,\ GalleryItemType \ XGalleryItem \ XGalleryTheme \ XGalleryThemeProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/geometry,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\ AffineMatrix2D \ AffineMatrix3D \ EllipticalArc \ @@ -2597,7 +2594,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/geometry,\ RealSize2D \ XMapping2D \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/graphic,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/graphic,\ GraphicColorMode \ GraphicType \ XGraphic \ @@ -2610,7 +2607,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/graphic,\ XPrimitive3D \ XPrimitiveFactory2D \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/i18n,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\ AmPmValue \ Boundary \ BreakType \ @@ -2688,7 +2685,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/i18n,\ XTransliteration \ reservedWords \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/inspection,\ InteractiveSelectionResult \ LineDescriptor \ PropertyCategoryDescriptor \ @@ -2707,17 +2704,17 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/inspection XStringListControl \ XStringRepresentation \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/installation,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/installation,\ ProtDlgRes \ XInstallationCheck \ XProtocolHandlerCheck \ protocols \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ldap,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ldap,\ LdapConnectionException \ LdapGenericException \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\ ConversionDictionaryType \ ConversionDirection \ ConversionPropertyType \ @@ -2761,7 +2758,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/linguistic XSupportedLocales \ XThesaurus \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/logging,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/logging,\ LogLevel \ LogRecord \ XConsoleHandler \ @@ -2772,7 +2769,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/logging,\ XLoggerPool \ XSimpleLogRing \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mail,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mail,\ MailAttachment \ MailException \ MailServiceType \ @@ -2786,14 +2783,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mail,\ XMailServiceProvider \ XSmtpService \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/media,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/media,\ XFrameGrabber \ XManager \ XPlayer \ XPlayerWindow \ ZoomLevel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\ MenuMultipleChange \ MenuSingleChange \ MozillaProductType \ @@ -2812,30 +2809,30 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\ XProxyRunner \ XRemoteServiceManagerProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/office,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/office,\ XAnnotation \ XAnnotationAccess \ XAnnotationEnumeration \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/packages,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages,\ EncryptionNotAllowedException \ NoEncryptionException \ NoRawFormatException \ WrongPasswordException \ XDataSinkEncrSupport \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\ XManifestReader \ XManifestWriter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\ XZipFileAccess \ ZipConstants \ ZipEntry \ ZipException \ ZipIOException \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/plugin,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\ PluginDescription \ PluginException \ PluginMode \ @@ -2844,7 +2841,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/plugin,\ XPluginContext \ XPluginManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/presentation,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation,\ AnimationEffect \ AnimationSpeed \ ClickAction \ @@ -2870,7 +2867,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/presentati XTransition \ XTransitionFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rdf,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/qa,\ + XDumper \ +)) +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\ FileFormat \ ParseException \ QueryException \ @@ -2891,7 +2891,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rdf,\ XResource \ XURI \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rendering,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rendering,\ ARGBColor \ AnimationAttributes \ AnimationRepeat \ @@ -2969,7 +2969,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rendering, XTextLayout \ XVolatileBitmap \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/report,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report,\ Calculation \ ForceNewPage \ GroupKeepTogether \ @@ -2995,13 +2995,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/report,\ XSection \ XShape \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/report/meta,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report/meta,\ XFormulaParser \ XFunctionCategory \ XFunctionDescription \ XFunctionManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/resource,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/resource,\ MissingResourceException \ XLocale \ XResourceBundle \ @@ -3013,17 +3013,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/resource,\ XStringResourceWithLocation \ XStringResourceWithStorage \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/qa,\ - XDumper \ -)) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/scanner,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/scanner,\ ScanError \ ScannerContext \ ScannerException \ XScannerManager \ XScannerManager2 \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script,\ LibraryNotLoadedException \ ModuleInfo \ ModuleSizeExceededRequest \ @@ -3038,13 +3035,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script,\ XPersistentLibraryContainer \ XStorageBasedLibraryContainer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/browse,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/browse,\ BrowseNodeFactoryViewTypes \ BrowseNodeTypes \ XBrowseNode \ XBrowseNodeFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\ ScriptErrorRaisedException \ ScriptExceptionRaisedException \ ScriptFrameworkErrorException \ @@ -3056,7 +3053,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/pro XScriptProviderSupplier \ XScriptURIHelper \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\ VBAEventId \ VBAScriptEvent \ VBAScriptEventId \ @@ -3066,7 +3063,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/vba XVBAModuleInfo \ XVBAScriptListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\ BooleanComparisonMode \ CommandType \ DatabaseRegistrationEvent \ @@ -3118,7 +3115,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb,\ XSingleSelectQueryComposer \ XSubDocument \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\ CopyTableContinuation \ CopyTableOperation \ CopyTableRowEvent \ @@ -3130,7 +3127,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/applic XDatabaseDocumentUI \ XTableUIProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\ CompositionType \ XConnectionSupplier \ XConnectionTools \ @@ -3143,7 +3140,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools, XTableRename \ XViewAccess \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\ BatchUpdateException \ BestRowScope \ BestRowType \ @@ -3203,7 +3200,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\ XStruct \ XWarningsSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\ CheckOption \ CompareBookmark \ KeyType \ @@ -3230,7 +3227,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\ XUsersSupplier \ XViewsSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\ CertAltNameEntry \ CertificateCharacters \ CertificateContainerStatus \ @@ -3252,7 +3249,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/security,\ XSanExtension \ XSerialNumberAdapter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/setup,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/setup,\ ActionType \ BaseAction \ CopyFileAction \ @@ -3282,7 +3279,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/setup,\ WindowsRegistryAction \ XSetup \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ ActivationEvent \ AddressConvention \ Border \ @@ -3481,12 +3478,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ XVolatileResult \ _NamedRange \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\ SmartTagRecognizerMode \ XSmartTagAction \ XSmartTagRecognizer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/style,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\ BreakType \ CaseMap \ DropCapFormat \ @@ -3514,11 +3511,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/style,\ XStyleLoader \ XStyleSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/svg,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/svg,\ XSVGPrinter \ XSVGWriter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sync,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sync,\ FilterData \ SyncAction \ SyncElement \ @@ -3531,10 +3528,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sync,\ XSyncCollector \ XSynchronizer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sync2,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sync2,\ BadPartnershipException \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/system,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\ SimpleMailClientFlags \ SystemShellExecuteException \ SystemShellExecuteFlags \ @@ -3544,7 +3541,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/system,\ XSimpleMailMessage \ XSystemShellExecute \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/table,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\ BorderLine \ BorderLine2 \ BorderLineStyle \ @@ -3579,7 +3576,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/table,\ XTableColumns \ XTableRows \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/task,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\ ClassifiedInteractionRequest \ DocumentMSPasswordRequest \ DocumentMSPasswordRequest2 \ @@ -3618,7 +3615,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/task,\ XStatusIndicatorSupplier \ XUrlContainer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/text,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\ AuthorDisplayFormat \ BibliographyDataField \ BibliographyDataType \ @@ -3744,7 +3741,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/text,\ XTextViewCursorSupplier \ XWordCursor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ AlreadyInitializedException \ AuthenticationRequest \ CHAOSProgressStart \ @@ -3917,7 +3914,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ XSourceInitialization \ XWebDAVCommandEnvironment \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\ ActionTriggerSeparatorType \ ConfigurationEvent \ ContextMenuExecuteEvent \ @@ -3947,7 +3944,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui,\ XUIElementSettings \ XUIFunctionListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\ CommonFilePickerElementIds \ ControlActions \ DialogClosedEvent \ @@ -3978,7 +3975,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs XWizardController \ XWizardPage \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\ AliasProgrammaticPair \ AtomClassRequest \ AtomDescription \ @@ -4076,7 +4073,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/util,\ XUniqueIDFactory \ XUpdatable \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/view,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/view,\ DocumentZoomType \ DuplexMode \ PaperFormat \ @@ -4104,7 +4101,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/view,\ XViewCursor \ XViewSettingsSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xforms,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xforms,\ InvalidDataOnSubmitException \ XDataTypeRepository \ XFormsEvent \ @@ -4113,14 +4110,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xforms,\ XModel \ XSubmission \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml,\ Attribute \ AttributeData \ FastAttribute \ XExportFilter \ XImportFilter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\ CipherID \ DigestID \ SecurityOperationStatus \ @@ -4140,7 +4137,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto XXMLSignature \ XXMLSignatureTemplate \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\ ConstOfSecurityId \ ElementMarkPriority \ ElementMarkType \ @@ -4166,11 +4163,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto XSignatureVerifyResultBroadcaster \ XSignatureVerifyResultListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\ XCompressedDocumentHandler \ XMLAttribute \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\ DOMException \ DOMExceptionType \ NodeType \ @@ -4195,7 +4192,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\ XSAXDocumentBuilder \ XText \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\ AttrChangeType \ EventException \ EventType \ @@ -4208,17 +4205,17 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/ev XMutationEvent \ XUIEvent \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/views,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/views,\ XAbstractView \ XDocumentView \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/input,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/input,\ XAttributes \ XElement \ XNamespaceMapping \ XRoot \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\ FastToken \ InputSource \ SAXException \ @@ -4242,11 +4239,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\ XParser \ XSAXSerializable \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\ XXMLDocumentWrapper \ XXMLElementWrapper \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\ Libxml2ExtensionHandle \ XPathException \ XPathObjectType \ @@ -4254,7 +4251,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath, XXPathExtension \ XXPathObject \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xsd,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\ DataTypeClass \ WhiteSpaceTreatment \ XDataType \ diff --git a/oovbaapi/Module_oovbaapi.mk b/oovbaapi/Module_oovbaapi.mk index 7d35c00a68b5..dd1f94b27a40 100644 --- a/oovbaapi/Module_oovbaapi.mk +++ b/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: diff --git a/oovbaapi/Package_oovbaapi_idl.mk b/oovbaapi/Package_oovbaapi_idl.mk deleted file mode 100644 index 891f15a43198..000000000000 --- a/oovbaapi/Package_oovbaapi_idl.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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: diff --git a/oovbaapi/Package_oovbaapi_inc.mk b/oovbaapi/Package_oovbaapi_inc.mk deleted file mode 100644 index bb8b5e661532..000000000000 --- a/oovbaapi/Package_oovbaapi_inc.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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: diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk index 00eeb8890360..6447d9b62ae0 100644 --- a/oovbaapi/UnoApi_oovbaapi.mk +++ b/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 \ @@ -111,7 +111,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 \ @@ -166,7 +166,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 \ @@ -201,7 +201,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 \ @@ -228,7 +228,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 \ @@ -493,7 +493,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 \ @@ -566,7 +566,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 \ @@ -690,7 +690,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 \ @@ -761,11 +761,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 \ diff --git a/scaddins/InternalUnoApi_scaddins.mk b/scaddins/InternalUnoApi_scaddins.mk new file mode 100644 index 000000000000..ad796648fdfb --- /dev/null +++ b/scaddins/InternalUnoApi_scaddins.mk @@ -0,0 +1,54 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,scaddins)) + +$(eval $(call gb_InternalUnoApi_add_api,scaddins,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_add_api_dependencies,scaddins,offapi,\ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_set_include,scaddins,\ + -I$(SRCDIR)/scaddins/idl \ + -I$(OUTDIR)/idl \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_InternalUnoApi_add_idlfiles,scaddins,scaddins/idl/com/sun/star/sheet/addin,\ + Analysis \ + DateFunctions \ + XAnalysis \ + XCompatibilityNames \ + XDateFunctions \ + XMiscFunctions \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index 735709e97673..3401adbb9332 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -35,8 +35,9 @@ $(eval $(call gb_Library_set_include,analysis,\ -I$(WORKDIR)/UnoApiHeaders/offapi \ )) -$(eval $(call gb_Library_add_api,analysis,\ - offapi \ +$(eval $(call gb_Library_add_internal_comprehensive_api,analysis,\ + offapi \ + scaddins \ udkapi \ )) diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index 3552ca7741d3..72577fed3ed5 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -35,8 +35,9 @@ $(eval $(call gb_Library_set_include,date,\ -I$(WORKDIR)/UnoApiHeaders/offapi \ )) -$(eval $(call gb_Library_add_api,date,\ - offapi \ +$(eval $(call gb_Library_add_internal_comprehensive_api,date,\ + offapi \ + scaddins \ udkapi \ )) diff --git a/scaddins/Module_scaddins.mk b/scaddins/Module_scaddins.mk index 8d1e7c7c7981..2e0bb1969129 100644 --- a/scaddins/Module_scaddins.mk +++ b/scaddins/Module_scaddins.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Module_Module,scaddins)) $(eval $(call gb_Module_add_targets,scaddins,\ AllLangResTarget_analysis \ AllLangResTarget_date \ + InternalUnoApi_scaddins \ Library_analysis \ Library_date \ )) diff --git a/scaddins/idl/com/sun/star/sheet/addin/Analysis.idl b/scaddins/idl/com/sun/star/sheet/addin/Analysis.idl new file mode 100644 index 000000000000..2e1ad523e615 --- /dev/null +++ b/scaddins/idl/com/sun/star/sheet/addin/Analysis.idl @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +#ifndef com_sun_star_sheet_addin_Analysis_idl +#define com_sun_star_sheet_addin_Analysis_idl + +#include <com/sun/star/sheet/addin/XAnalysis.idl> +#include <com/sun/star/sheet/addin/XCompatibilityNames.idl> + +module com +{ +module sun +{ +module star +{ +module sheet +{ +module addin +{ + service Analysis + { + // exported interfaces: + interface XCompatibilityNames; + interface XAnalysis; + }; +}; +}; +}; +}; +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl new file mode 100644 index 000000000000..5411284b94f9 --- /dev/null +++ b/scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* +* + * 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. + * +************************************************************************/ + +#ifndef com_sun_star_sheet_addin_DateFunctions_idl +#define com_sun_star_sheet_addin_DateFunctions_idl + +#include <com/sun/star/sheet/addin/XDateFunctions.idl> +#include <com/sun/star/sheet/addin/XMiscFunctions.idl> + +module com +{ +module sun +{ +module star +{ +module sheet +{ +module addin +{ + service DateFunctions + { + // exported interfaces: + interface XDateFunctions; + interface XMiscFunctions; + }; +}; +}; +}; +}; +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/scaddins/analysisadd.idl b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl index 88ab78aada0d..1cb001851aaf 100644 --- a/offapi/com/sun/star/scaddins/analysisadd.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl @@ -26,13 +26,12 @@ * ************************************************************************/ -#ifndef __com_sun_star_sheet_NoConvergenceException_idl__ -#include <com/sun/star/sheet/NoConvergenceException.idl> -#endif +#ifndef com_sun_star_sheet_addin_XAnalysis_idl +#define com_sun_star_sheet_addin_XAnalysis_idl #include <com/sun/star/uno/XInterface.idl> #include <com/sun/star/beans/XPropertySet.idl> -#include <com/sun/star/sheet/LocalizedName.idl> +#include <com/sun/star/sheet/NoConvergenceException.idl> module com { @@ -44,12 +43,6 @@ module sheet { module addin { - interface XCompatibilityNames : com::sun::star::uno::XInterface - { - /// getCompatibilityNames. - sequence< com::sun::star::sheet::LocalizedName > getCompatibilityNames ( [in] string aProgrammaticName ); - }; - /** * Interface with analysis functions. */ @@ -580,17 +573,12 @@ module addin double getFvschedule( [in] double Principal, [in] sequence< sequence< double > > Schedule ) raises( com::sun::star::lang::IllegalArgumentException ); }; - - service Analysis - { - // exported interfaces: - interface XCompatibilityNames; - interface XAnalysis; - }; }; }; }; }; }; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl b/scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl new file mode 100644 index 000000000000..fade59e835b3 --- /dev/null +++ b/scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl @@ -0,0 +1,58 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* +* + * 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. + * +************************************************************************/ + +#ifndef com_sun_star_sheet_addin_XCompatibilityNames_idl +#define com_sun_star_sheet_addin_XCompatibilityNames_idl + +#include <com/sun/star/uno/XInterface.idl> +#include <com/sun/star/sheet/LocalizedName.idl> + +module com +{ +module sun +{ +module star +{ +module sheet +{ +module addin +{ + interface XCompatibilityNames : com::sun::star::uno::XInterface + { + /// @return a sequence with all localized names for a programmatic name + sequence< com::sun::star::sheet::LocalizedName > getCompatibilityNames ( [in] string aProgrammaticName ); + }; +}; +}; +}; +}; +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/scaddins/dateadd.idl b/scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl index 3c88517bef49..773a1ff67f57 100644 --- a/offapi/com/sun/star/scaddins/dateadd.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl @@ -26,10 +26,11 @@ * ************************************************************************/ +#ifndef com_sun_star_sheet_addin_XDateFunctions_idl +#define com_sun_star_sheet_addin_XDateFunctions_idl #include <com/sun/star/uno/XInterface.idl> #include <com/sun/star/beans/XPropertySet.idl> -#include <com/sun/star/sheet/LocalizedName.idl> module com { @@ -41,12 +42,6 @@ module sheet { module addin { - interface XCompatibilityNames : com::sun::star::uno::XInterface - { - /// @return a sequence with all localized names for a programmatic name - sequence< com::sun::star::sheet::LocalizedName > getCompatibilityNames ( [in] string aProgrammaticName ); - }; - /** * Interface with date functions. */ @@ -94,27 +89,12 @@ module addin [in] long nDate ) raises( com::sun::star::lang::IllegalArgumentException ); }; - - /** - * Interface with miscellaneous functions. - */ - interface XMiscFunctions : com::sun::star::uno::XInterface - { - /// Encrypts or decrypts a string using the ROT13 algorithm. - string getRot13( [in] string aSrcString ) - raises( com::sun::star::lang::IllegalArgumentException ); - }; - - service DateFunctions - { - // exported interfaces: - interface XDateFunctions; - interface XMiscFunctions; - }; }; }; }; }; }; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl new file mode 100644 index 000000000000..dd5189cc401f --- /dev/null +++ b/scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl @@ -0,0 +1,62 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* +* + * 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. + * +************************************************************************/ + +#ifndef com_sun_star_sheet_addin_XMiscFunctions_idl +#define com_sun_star_sheet_addin_XMiscFunctions_idl + +#include <com/sun/star/lang/IllegalArgumentException.idl> +#include <com/sun/star/uno/XInterface.idl> + +module com +{ +module sun +{ +module star +{ +module sheet +{ +module addin +{ + /** + * Interface with miscellaneous functions. + */ + interface XMiscFunctions : com::sun::star::uno::XInterface + { + /// Encrypts or decrypts a string using the ROT13 algorithm. + string getRot13( [in] string aSrcString ) + raises( com::sun::star::lang::IllegalArgumentException ); + }; +}; +}; +}; +}; +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 8a7fc2601f83..174ddb662216 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -105,6 +105,9 @@ $(eval $(foreach method,\ add_libs \ set_library_path_flags \ add_api \ + add_internal_api \ + add_internal_bootstrap_api \ + add_internal_comprehensive_api \ add_linked_libs \ add_linked_static_libs \ use_external \ diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk new file mode 100644 index 000000000000..163e7a064090 --- /dev/null +++ b/solenv/gbuild/InternalUnoApi.mk @@ -0,0 +1,112 @@ +# -*- 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. + +.PHONY : $(call gb_InternalUnoApi_get_clean_target,%) +$(call gb_InternalUnoApi_get_clean_target,%) : + $(call gb_Helper_abbreviate_dirs_native,\ + rm -f $(call gb_InternalUnoApi_get_target,$*)) + +# Note: The rdb root for the internal rdbs should be / . On the other +# side, UnoApiHeadersTarget expects UCR and it is really not easy to +# change, because the information would have to be duplicated at the +# calling side. So we simply do both .-) +# TODO: Should it come clear that these rdbs (installed into +# solver/$INPATH/rdb) are actually not needed for anything, this could +# be simplified. + +define gb_InternalUnoApi_InternalUnoApi +$(call gb_UnoApiTarget_UnoApiTarget,$(1)_out) +$(call gb_UnoApiTarget_UnoApiTarget,$(1)) +$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) + +$(call gb_UnoApiTarget_set_root,$(1)_out,/) +$(call gb_UnoApiTarget_set_root,$(1),UCR) +$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(1)_out) + +$(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir +$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)_out) +$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)_out) +$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) + +$(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(1)) + +$$(eval $$(call gb_Module_register_target,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1)))) + +endef + +define gb_InternalUnoApi_add_idlfile +$(call gb_UnoApiTarget_add_idlfile,$(1)_out,$(2),$(3)) + +endef + +define gb_InternalUnoApi_add_idlfiles +$(call gb_UnoApiTarget_add_idlfiles,$(1)_out,$(2),$(3)) + +endef + +define gb_InternalUnoApi__add_api +$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(2)) +$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) + +endef + +define gb_InternalUnoApi_add_api +$(foreach rdb,$(2),$(call gb_InternalUnoApi__add_api,$(1),$(rdb))) + +endef + +# Express that the rdb $(2) depends on rdb $(3). +# +# This information is already available in the UnoApiTarget definition +# for $(2), but this may not be loaded if we are building from a +# different module. Thus, this is a necessary hack to make generation of +# headers on demand work. +# +# I suppose it would be possible to store the list of required rdbs for +# a rdb to a file and then load it when headers' generation is requested, +# but it feels like overkill... +define gb_InternalUnoApi_add_api_dependency +$(call gb_UnoApiHeadersTarget_add_rdbfile,$(2),$(3)) + +endef + +define gb_InternalUnoApi_add_api_dependencies +$(foreach dep,$(3),$(call gb_InternalUnoApi_add_api_dependency,$(1),$(2),$(dep))) + +endef + +define gb_InternalUnoApi_set_xmlfile +$(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2)) + +endef + +define gb_InternalUnoApi_set_include +$(call gb_UnoApiTarget_set_include,$(1)_out,$(2)) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 2200add533ad..358a8e6aa6f8 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -181,6 +181,9 @@ $(eval $(foreach method,\ add_libs \ set_library_path_flags \ add_api \ + add_internal_api \ + add_internal_bootstrap_api \ + add_internal_comprehensive_api \ add_linked_libs \ add_linked_static_libs \ use_external \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index cda3f462bdef..02d51a34ce4e 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -611,6 +611,36 @@ endif endef +define gb_LinkTarget__add_internal_api_one +$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_UnoApiHeadersTarget_get_$(3)target,$(api))) +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(api)) +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(api)) +endif + +endef + +define gb_LinkTarget__add_internal_api +$(foreach api,$(2),$(call gb_LinkTarget__add_internal_api_one,$(1),$(api),$(3))) + +endef + +define gb_LinkTarget_add_internal_api +$(call gb_LinkTarget__add_internal_api,$(1),$(2)) + +endef + +define gb_LinkTarget_add_internal_bootstrap_api +$(call gb_LinkTarget__add_internal_api,$(1),$(2),bootstrap_) + +endef + +define gb_LinkTarget_add_internal_comprehensive_api +$(call gb_LinkTarget__add_internal_api,$(1),$(2),comprehensive_) + +endef + define gb_LinkTarget_add_linked_libs ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 7f5cefa866d5..27d19988e209 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -39,13 +39,17 @@ gb_PackagePart_get_destinations = \ $(OUTDIR)/inc \ $(OUTDIR)/lib \ $(OUTDIR)/pck \ + $(OUTDIR)/rdb \ $(OUTDIR)/unittest \ $(OUTDIR)/xml \ +gb_InternalUnoApi_get_target = $(OUTDIR)/rdb/$(1).rdb 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_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 @@ -122,9 +126,13 @@ 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_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb -gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb +gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap +gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive +gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal +gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap.done +gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.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 @@ -180,6 +188,7 @@ $(eval $(call gb_Helper_make_clean_targets,\ CppunitTest \ CustomTarget \ ExternalLib \ + UnoApiHeadersTarget \ UnoApiTarget \ WinResTarget \ YaccTarget \ @@ -195,9 +204,11 @@ $(eval $(call gb_Helper_make_clean_targets,\ $(eval $(call gb_Helper_make_outdir_clean_targets,\ Executable \ + InternalUnoApi \ Library \ StaticLibrary \ - UnoApiOutTarget \ + UnoApi \ + UnoApiMerge \ )) $(eval $(call gb_Helper_make_dep_targets,\ diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk new file mode 100644 index 000000000000..fba9b1f7643f --- /dev/null +++ b/solenv/gbuild/UnoApi.mk @@ -0,0 +1,154 @@ +# -*- 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. + +.PHONY : $(call gb_UnoApi_get_clean_target,%) +$(call gb_UnoApi_get_clean_target,%) : + $(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_dir,$(1))) + +$(call gb_UnoApiTarget_set_root,$(1),UCR) + +$(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir +$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_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_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: diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk new file mode 100644 index 000000000000..5b4fafb5f2fd --- /dev/null +++ b/solenv/gbuild/UnoApiMerge.mk @@ -0,0 +1,62 @@ +# -*- 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. + +# 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_UnoApiMerge_UnoApiMerge +$(call gb_UnoApiTarget_UnoApiTarget,$(1)) + +$(call gb_UnoApiTarget_set_root,$(1),/) + +$(call gb_UnoApiMerge_get_target,$(1)) :| $(dir $(call gb_UnoApiMerge_get_target,$(1))).dir +$(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)) + +$(call gb_Deliver_add_deliverable,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) + +$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1)))) + +endef + +define gb_UnoApiMerge_add_rdbfile +$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(2)) + +endef + +define gb_UnoApiMerge_add_rdbfiles +$(foreach rdb,$(2),$(call gb_UnoApiMerge_add_rdbfile,$(1),$(rdb))) + +endef + +define gb_UnoApiMerge_add_reference_rdbfile +$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2)) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 8d851ef2d5ac..d2adfe993c27 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -26,58 +26,175 @@ # #************************************************************************* -gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc$(gb_Executable_EXT_for_build) -gb_UnoApiTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET) -gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge$(gb_Executable_EXT_for_build) -gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET) -gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare$(gb_Executable_EXT_for_build) +# UnoApiPartTarget + +gb_UnoApiPartTarget_IDLCTARGET := $(call gb_Executable_get_target_for_build,idlc) +gb_UnoApiPartTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiPartTarget_IDLCTARGET) + +# The .urd files are actually created by the gb_UnoApiPartTarget__command, +# invoked for the per-directory .done files. +# The reason why .urd files are tracked is so new files that are added are +# picked up and cause a rebuild, even if older than the .done file (also, as a +# convenience for users who delete them from the workdir by hand; this dummy +# rule plus the dependency from the .done target to the .urd file plus the +# sort/patsubst call in gb_UnoApiPartTarget__command cause command to be +# invoked with the .idl file corresponding to the .urd in that case. +# Touch the .urd file, so it is newer than the .done file, causing that to +# be rebuilt and overwriting the .urd file again. +# the .dir is for make 3.81, which ignores trailing / +$(dir $(call gb_UnoApiPartTarget_get_target,))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(call gb_UnoApiPartTarget_get_target,%.urd) : + touch $@ + +# TODO: +# - get idlc switch "-P" (generate .urd into package dir) +# - empty $? in headertarget? + +define gb_UnoApiPartTarget__command + $(call gb_Output_announce,$(2),$(true),IDL,2) + mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ + $(call gb_Helper_convert_native,$(INCLUDE) $(DEFS) \ + -M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \ + -O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose -C \ + $(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3))))) && \ + $(gb_UnoApiPartTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \ + rm -f $${RESPONSEFILE} && \ + touch $(1) + +endef + +$(call gb_UnoApiPartTarget_get_target,%.done) : + $(call gb_UnoApiPartTarget__command,$@,$*,$?) + +ifeq ($(gb_FULLDEPS),$(true)) + +$(call gb_UnoApiPartTarget_get_dep_target,%) : + $(if $(wildcard $@),touch $@,\ + $(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd))) + +endif + +# UnoApiTarget + +gb_UnoApiTarget_RDBMAKERTARGET := $(call gb_Executable_get_target_for_build,rdbmaker) +gb_UnoApiTarget_RDBMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_RDBMAKERTARGET) +gb_UnoApiTarget_REGCOMPARETARGET := $(call gb_Executable_get_target_for_build,regcompare) gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) -gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker$(gb_Executable_EXT_for_build) -gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET) -gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview$(gb_Executable_EXT_for_build) -gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET) +gb_UnoApiTarget_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge) +gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET) +gb_UnoApiTarget_XML2CMPTARGET := $(call gb_Executable_get_target_for_build,xml2cmp) +gb_UnoApiTarget_XML2CMPCOMMAND := $(gb_Helper_set_ld_path) $(gb_UnoApiTarget_XML2CMPTARGET) -define gb_UnoApiTarget_autopackage_inc -$$(eval $$(call gb_Package_Package,$(1)_inc,$$(patsubst %/empty,%,$$(call gb_UnoApiTarget_get_header_target,empty)))) -$(foreach onefile,$(gb_UnoApiTarget_HPPFILES_$(1)), \ - $$(eval $$(call gb_Package_add_file,$(1)_inc,$(patsubst $(1)/%,inc/$(1)/%,$(onefile)),$(onefile)))) +gb_UnoApiTarget_XMLRDB := $(call gb_UnoApiTarget_get_target,types) -$(call gb_Package_get_target,$(1)_inc) : $(call gb_UnoApiTarget_get_target,$(1)) +define gb_UnoApiTarget__get_types +$(if $(1),$(foreach type,$(shell $(gb_UnoApiTarget_XML2CMPCOMMAND) -types stdout $(1)),$(addprefix -T,$(type)))) +endef + +define gb_UnoApiTarget__command_impl +RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(2))) && \ +$(1) @$${RESPONSEFILE} && \ +rm -f $${RESPONSEFILE} +endef + +define gb_UnoApiTarget__regmerge_command_impl +$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_REGMERGECOMMAND),$(1) $(2) $(3)) +endef +define gb_UnoApiTarget__rdbmaker_command_impl +$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -B$(2) -b$(3) $(4) $(5)) endef -define gb_UnoApiTarget_autopackage_idl -$$(eval $$(call gb_Package_Package,$(1)_idl,$(SRCDIR))) -$(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \ - $$(eval $$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(onefile)),$(onefile)))) +define gb_UnoApiTarget__command +$(call gb_Output_announce,$*,$(true),RDB,3) +mkdir -p $(dir $(1)) && \ +$(if $(UNOAPI_FILES),\ + $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)),\ + $(if $(UNOAPI_MERGE),\ + $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_MERGE)),\ + $(call gb_UnoApiTarget__rdbmaker_command_impl,$(1),UCR,$(UNOAPI_ROOT),\ + $(call gb_UnoApiTarget__get_types,$(UNOAPI_XML)),$(gb_UnoApiTarget_XMLRDB)))) \ +$(if $(UNOAPI_REFERENCE), \ + $(call gb_Output_announce,$*,$(true),DBc,3) \ + && $(gb_UnoApiTarget_REGCOMPARECOMMAND) \ + -f -t \ + -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) \ + -r2 $(call gb_Helper_convert_native,$(1))) +endef +define gb_UnoApiTarget__check_mode +$(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3))),\ + $(error More than one mode of function of UnoApiTarget used: this is not supported),\ + $(if $(or $(1),$(2),$(3)),,\ + $(error Neither IDL files nor merged RDBs nor XML desc. were used: nothing will be produced))) +$(if $(4),,$(error No root has been set for the rdb file)) endef +$(call gb_UnoApiTarget_get_target,%): + $(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT)) + $(call gb_UnoApiTarget__command,$@,$*,$<,$?) + +.PHONY : $(call gb_UnoApiTarget_get_clean_target,%) +$(call gb_UnoApiTarget_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),RDB,3) + -$(call gb_Helper_abbreviate_dirs,\ + rm -f $(call gb_UnoApiTarget_get_target,$*)) + -rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \ + $(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \ + $(call gb_UnoApiPartTarget_get_target,$*) + +# cat the deps of all IDLs in one file, then we need only open that one file +define gb_UnoApiTarget__command_dep +$(call gb_Output_announce,IDL:$(2),$(true),DEP,1) +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ + $(foreach idl,$(patsubst %.idl,%,$(3)),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \ + $(SOLARENV)/bin/concat-deps $${RESPONSEFILE} > $(1)) && \ + rm -f $${RESPONSEFILE} + +endef + +ifeq ($(gb_FULLDEPS),$(true)) + +$(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_UnoApiTarget_get_target,%) + $(call gb_UnoApiTarget__command_dep,$@,$*,$(UNOAPI_IDLFILES)) + +endif + define gb_UnoApiTarget_UnoApiTarget -$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1)))) -$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) \ - | $(dir $(call gb_UnoApiOutTarget_get_target,$(1))).dir -$(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_XML := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := -gb_UnoApiTarget_HPPFILES_$(1) := -gb_UnoApiTarget_IDLFILES_$(1) := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT := + ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES := -include $(call gb_UnoApiTarget_get_dep_target,$(1)) endif endef +define gb_UnoApiTarget__add_urdfile +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES += $(2) +$(call gb_UnoApiTarget_get_target,$(1)) : $(2) + +endef + define gb_UnoApiTarget__add_idlfile $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \ $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) +$(call gb_UnoApiTarget__add_urdfile,$(1),$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)) $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) :| \ $(call gb_UnoApiPartTarget_get_target,$(2)/.dir) -gb_UnoApiTarget_IDLFILES_$(1) += $(2)/$(3).idl ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES += $(2)/$(3).idl $(call gb_UnoApiTarget_get_dep_target,$(1)) : \ $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) : \ @@ -100,69 +217,27 @@ $(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3)) endef -# for interfaces, exceptions, structs, enums, constant groups define gb_UnoApiTarget_add_idlfile -gb_UnoApiTarget_HPPFILES_$(1) += $(2)/$(3).hdl $(2)/$(3).hpp - -$(call gb_UnoApiTarget_get_header_target,$(2)/$(3).hpp) :| \ - $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApiTarget_get_header_target,$(2)/$(3).hdl) :| \ - $(call gb_UnoApiTarget_get_target,$(1)) - -$(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3)) - -endef - -define gb_UnoApiTarget_add_idlfiles_noheader -$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(2),$(idl))) -$(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3)) - -endef - -# for old-style services and modules -define gb_UnoApiTarget_add_idlfile_noheader -$(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3)) - -endef - -define gb_UnoApiTarget_add_idlfiles_nohdl -$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(2),$(idl))) -$(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3)) - -endef - -# for new-style services -define gb_UnoApiTarget_add_idlfile_nohdl -gb_UnoApiTarget_HPPFILES_$(1) += $(2)/$(3).hpp - -$(call gb_UnoApiTarget_get_header_target,$(2)/$(3).hpp) :| \ - $(call gb_UnoApiTarget_get_target,$(1)) - $(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3)) endef -define gb_UnoApiTarget_add_rdbfiles -$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_rdbfile,$(1),$(rdb))) +define gb_UnoApiTarget_merge_rdbfiles +$(foreach rdb,$(2),$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(rdb))) endef -define gb_UnoApiTarget_add_rdbfile -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiOutTarget_get_target,$(2)) -$(call gb_UnoApiTarget_get_target,$(1)) : \ - $(call gb_UnoApiOutTarget_get_target,$(2)) \ - $(call gb_Package_get_target,$(2)_idl) +define gb_UnoApiTarget_merge_rdbfile +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiTarget_get_target,$(2)) +$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) endef -define gb_UnoApiTarget_add_merge_rdbfiles -$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_merge_rdbfile,$(1),$(rdb))) - -endef - -define gb_UnoApiTarget_add_merge_rdbfile -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiOutTarget_get_target,$(2)) -$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$(2)) +# Set XML component dependencies description. +define gb_UnoApiTarget_set_xmlfile +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_XML := $(SRCDIR)/$(2) +$(call gb_UnoApiTarget_get_target,$(1)) : $(SRCDIR)/$(2) +$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XMLRDB) endef @@ -176,109 +251,82 @@ $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(2) endef -.PHONY : $(call gb_UnoApiOutTarget_get_clean_target,%) -$(call gb_UnoApiOutTarget_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),UNO,1) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_UnoApiOutTarget_get_target,$*)) - -.PHONY : $(call gb_UnoApiTarget_get_clean_target,%) -$(call gb_UnoApiTarget_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),UNO,1) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_UnoApiTarget_get_target,$*)) - -rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\ - $(call gb_UnoApiTarget_get_dep_target,$*) \ - $(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \ - $(call gb_UnoApiPartTarget_get_target,$*) - -# The .urd files are actually created by the gb_UnoApiPartTarget__command, -# invoked for the per-directory .done files. -# The reason why .urd files are tracked is so new files that are added are -# picked up and cause a rebuild, even if older than the .done file (also, as a -# convenience for users who delete them from the workdir by hand; this dummy -# rule plus the dependency from the .done target to the .urd file plus the -# sort/patsubst call in gb_UnoApiPartTarget__command cause command to be -# invoked with the .idl file corresponding to the .urd in that case. -# Touch the .urd file, so it is newer than the .done file, causing that to -# be rebuilt and overwriting the .urd file again. -# the .dir is for make 3.81, which ignores trailing / -$(dir $(call gb_UnoApiPartTarget_get_target,))%/.dir : - $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) +define gb_UnoApiTarget_set_root +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT := $(2) -$(call gb_UnoApiPartTarget_get_target,%.urd) : - touch $@ +endef -$(call gb_UnoApiPartTarget_get_target,%.done) : - $(call gb_UnoApiPartTarget__command,$@,$*,$?) +# UnoApiHeadersTarget +gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_build,cppumaker) +gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) -define gb_UnoApiPartTarget__command - $(call gb_Output_announce,$(2),$(true),IDL,2) - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ - $(call gb_Helper_convert_native,$(INCLUDE) $(DEFS) \ - -M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \ - -O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose -C \ - $(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3))))) && \ - $(gb_UnoApiTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \ - rm -f $${RESPONSEFILE} && \ - touch $(1) +define gb_UnoApiHeadersTarget__command +RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ + $(call gb_Helper_convert_native,-Gc $(4) -BUCR \ + -O$(3) $(call gb_UnoApiTarget_get_target,$(2)) $(UNOAPI_DEPS))) && \ +$(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \ +rm -f $${RESPONSEFILE} && \ +touch $(1) endef -define gb_UnoApiTarget__command - mkdir -p $(dir $(1)) && \ - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(1) $(4) $(5))) && \ - $(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \ - rm -f $${RESPONSEFILE} +$(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : + $(call gb_Output_announce,$*,$(true),HPB,3) + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*)) + +$(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : + $(call gb_Output_announce,$*,$(true),HPC,3) + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C) + +$(call gb_UnoApiHeadersTarget_get_target,%) : + $(call gb_Output_announce,$*,$(true),HPP,3) + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L) + +.PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%) +$(call gb_UnoApiHeadersTarget_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),HPP,3) + $(call gb_Helper_abbreviate_dirs_native,\ + rm -rf \ + $(call gb_UnoApiHeadersTarget_get_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_target,$*) \ + $(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*)) \ + $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$*) + +define gb_UnoApiHeadersTarget_UnoApiHeadersTarget +$(call gb_UnoApiHeadersTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiHeadersTarget_get_bootstrap_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) + +$(call gb_UnoApiHeadersTarget_get_target,$(1)) : UNOAPI_DEPS := +$(call gb_UnoApiHeadersTarget_get_bootstrap_target,$(1)) : UNOAPI_DEPS := +$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS := endef -define gb_UnoApiHeaderTarget__command - mkdir -p $(dir $(1)) && \ - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ - $(call gb_Helper_convert_native,-Gc -L -BUCR \ - -O$(call gb_UnoApiTarget_get_header_target,$(2)) $(3) $(1))) && \ - $(gb_UnoApiTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \ - rm -f $${RESPONSEFILE} +define gb_UnoApiHeadersTarget_add_headerfile endef -# cat the deps of all IDLs in one file, then we need only open that one file -define gb_UnoApiTarget__command_dep -$(call gb_Output_announce,IDL:$(2),$(true),DEP,1) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ - $(foreach idl,$(patsubst %.idl,%,$(3)),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \ - $(SOLARENV)/bin/concat-deps $${RESPONSEFILE} > $(1)) && \ - rm -f $${RESPONSEFILE} +define gb_UnoApiHeadersTarget__add_rdbfile +$(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) +$(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiTarget_get_target,$(2)) endef -ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_UnoApiPartTarget_get_dep_target,%) : - $(if $(wildcard $@),touch $@,\ - $(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd))) +define gb_UnoApiHeadersTarget_add_rdbfile +$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),target) +$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),bootstrap_target) +$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),comprehensive_target) -$(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_UnoApiTarget_get_target,%) - $(call gb_UnoApiTarget__command_dep,$@,$*,$(gb_UnoApiTarget_IDLFILES_$*)) - -endif +endef -# TODO: -# - get idlc switch "-P" (generate .urd into package dir) -# - empty $? in headertarget? +define gb_UnoApiHeadersTarget_add_rdbfiles +$(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(rdb))) -$(call gb_UnoApiTarget_get_target,%): $(gb_UnoApiTarget_CPPUMAKERTARGET) - $(call gb_Output_announce,$*,$(true),RDB,3) - $(if $(gb_UnoApiTarget_IDLFILES_$*),$(call gb_UnoApiTarget__command,$@,$*,$<,UCR,$(addprefix $(call gb_UnoApiPartTarget_get_target,),$(patsubst %.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*))))) - $(if $(UNOAPI_MERGE),$(call gb_UnoApiTarget__command,$@,$*,$<,/,$(UNOAPI_MERGE))) - $(if $(UNOAPI_REFERENCE), \ - $(call gb_Output_announce,$*,$(true),DBc,4) \ - $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$@)) - $(if $(gb_UnoApiTarget_IDLFILES_$*), \ - $(call gb_Output_announce,$*,$(true),HPP,4) \ - $(call gb_UnoApiHeaderTarget__command,$@,$*,$(UNOAPI_DEPS))) +endef # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 5186a371567a..45d3b4ad0b69 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -303,6 +303,9 @@ include $(foreach class, \ JunitTest \ Module \ UnoApiTarget \ + UnoApi \ + UnoApiMerge \ + InternalUnoApi \ Zip \ Configuration \ Extension \ diff --git a/stoc/InternalUnoApi_bootstrap.mk b/stoc/InternalUnoApi_bootstrap.mk new file mode 100644 index 000000000000..ff7f7e0f2a7e --- /dev/null +++ b/stoc/InternalUnoApi_bootstrap.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,bootstrap)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,bootstrap,stoc/source/bootstrap/bootstrap.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/InternalUnoApi_corefl.mk b/stoc/InternalUnoApi_corefl.mk new file mode 100644 index 000000000000..aee2d2807fcc --- /dev/null +++ b/stoc/InternalUnoApi_corefl.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,corefl)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,corefl,stoc/source/corereflection/corefl.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/InternalUnoApi_insp.mk b/stoc/InternalUnoApi_insp.mk new file mode 100644 index 000000000000..c22eb1dd3507 --- /dev/null +++ b/stoc/InternalUnoApi_insp.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,insp)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,insp,stoc/source/inspect/insp.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/InternalUnoApi_inv.mk b/stoc/InternalUnoApi_inv.mk new file mode 100644 index 000000000000..169bac64fff5 --- /dev/null +++ b/stoc/InternalUnoApi_inv.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,inv)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,inv,stoc/source/invocation/inv.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/InternalUnoApi_invadp.mk b/stoc/InternalUnoApi_invadp.mk new file mode 100644 index 000000000000..ddc3fdddeb9c --- /dev/null +++ b/stoc/InternalUnoApi_invadp.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,invadp)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,invadp,stoc/source/invocation_adapterfactory/invadp.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/InternalUnoApi_javaloader.mk b/stoc/InternalUnoApi_javaloader.mk new file mode 100644 index 000000000000..41e1bb21a59c --- /dev/null +++ b/stoc/InternalUnoApi_javaloader.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,javaloader)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,javaloader,stoc/source/javaloader/javaloader.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/InternalUnoApi_jen.mk b/stoc/InternalUnoApi_jen.mk new file mode 100644 index 000000000000..13767de69494 --- /dev/null +++ b/stoc/InternalUnoApi_jen.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,jen)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,jen,stoc/source/javavm/jen.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/InternalUnoApi_namingservice.mk b/stoc/InternalUnoApi_namingservice.mk new file mode 100644 index 000000000000..16e18c13a296 --- /dev/null +++ b/stoc/InternalUnoApi_namingservice.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,namingservice)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,namingservice,stoc/source/namingservice/namingservice.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/InternalUnoApi_proxyfac.mk b/stoc/InternalUnoApi_proxyfac.mk new file mode 100644 index 000000000000..c5b5d744051d --- /dev/null +++ b/stoc/InternalUnoApi_proxyfac.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,proxyfac)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,proxyfac,stoc/source/proxy_factory/proxyfac.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/InternalUnoApi_stocserv.mk b/stoc/InternalUnoApi_stocserv.mk new file mode 100644 index 000000000000..00dbbe986978 --- /dev/null +++ b/stoc/InternalUnoApi_stocserv.mk @@ -0,0 +1,32 @@ +# -*- 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. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,stocserv)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,stocserv,stoc/source/stocservices/stocserv.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk new file mode 100644 index 000000000000..490139bfa421 --- /dev/null +++ b/stoc/Library_bootstrap.mk @@ -0,0 +1,99 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,bootstrap)) + +ifneq ($(debug),) + +$(eval $(call gb_Library_add_defs,bootstrap,\ + $(if $(diag),\ + $(if $(filter $(diag),cache full),-D__CACHE_DIAGNOSE) \ + $(if $(filter-out $(diag),cache),-D__DIAGNOSE)) \ +)) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,bootstrap,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_set_include,bootstrap,\ + -I$(SRCDIR)/stoc/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_internal_bootstrap_api,bootstrap,\ + bootstrap \ +)) + +$(eval $(call gb_Library_add_linked_libs,bootstrap,\ + cppu \ + cppuhelper \ + reg \ + sal \ + salhelper \ + xmlreader \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap)) + +$(eval $(call gb_Library_add_exception_objects,bootstrap,\ + stoc/source/bootstrap/services \ + stoc/source/defaultregistry/defaultregistry \ + stoc/source/implementationregistration/implreg \ + stoc/source/implementationregistration/mergekeys \ + stoc/source/loader/dllcomponentloader \ + stoc/source/registry_tdprovider/functiondescription \ + stoc/source/registry_tdprovider/methoddescription \ + stoc/source/registry_tdprovider/rdbtdp_tdenumeration \ + stoc/source/registry_tdprovider/structtypedescription \ + stoc/source/registry_tdprovider/td \ + stoc/source/registry_tdprovider/tdcomp \ + stoc/source/registry_tdprovider/tdconsts \ + stoc/source/registry_tdprovider/tdef \ + stoc/source/registry_tdprovider/tdenum \ + stoc/source/registry_tdprovider/tdiface \ + stoc/source/registry_tdprovider/tdmodule \ + stoc/source/registry_tdprovider/tdprop \ + stoc/source/registry_tdprovider/tdprovider \ + stoc/source/registry_tdprovider/tdservice \ + stoc/source/registry_tdprovider/tdsingleton \ + stoc/source/security/access_controller \ + stoc/source/security/file_policy \ + stoc/source/security/permissions \ + stoc/source/servicemanager/servicemanager \ + stoc/source/simpleregistry/simpleregistry \ + stoc/source/simpleregistry/textualservices \ + stoc/source/tdmanager/tdmgr \ + stoc/source/tdmanager/tdmgr_check \ + stoc/source/tdmanager/tdmgr_tdenumeration \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk new file mode 100644 index 000000000000..1e9c97b42a01 --- /dev/null +++ b/stoc/Library_introspection.mk @@ -0,0 +1,58 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,introspection)) + +ifneq ($(debug),) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,introspection,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_add_internal_api,introspection,\ + insp \ +)) + +$(eval $(call gb_Library_add_linked_libs,introspection,\ + cppu \ + cppuhelper \ + sal \ + salhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection)) + +$(eval $(call gb_Library_add_exception_objects,introspection,\ + stoc/source/inspect/introspection \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk new file mode 100644 index 000000000000..1c5905071bf7 --- /dev/null +++ b/stoc/Library_invocadapt.mk @@ -0,0 +1,57 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,invocadapt)) + +ifneq ($(debug),) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,invocadapt,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_add_internal_api,invocadapt,\ + invadp \ +)) + +$(eval $(call gb_Library_add_linked_libs,invocadapt,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt)) + +$(eval $(call gb_Library_add_exception_objects,invocadapt,\ + stoc/source/invocation_adapterfactory/iafactory \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk new file mode 100644 index 000000000000..92ac438477d2 --- /dev/null +++ b/stoc/Library_invocation.mk @@ -0,0 +1,57 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,invocation)) + +ifneq ($(debug),) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,invocation,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_add_internal_api,invocation,\ + inv \ +)) + +$(eval $(call gb_Library_add_linked_libs,invocation,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation)) + +$(eval $(call gb_Library_add_exception_objects,invocation,\ + stoc/source/invocation/invocation \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk new file mode 100644 index 000000000000..e0f1a1391c3d --- /dev/null +++ b/stoc/Library_javaloader.mk @@ -0,0 +1,58 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,javaloader)) + +ifneq ($(debug),) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,javaloader,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_add_internal_api,javaloader,\ + javaloader \ +)) + +$(eval $(call gb_Library_add_linked_libs,javaloader,\ + cppu \ + cppuhelper \ + jvmaccess \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader)) + +$(eval $(call gb_Library_add_exception_objects,javaloader,\ + stoc/source/javaloader/javaloader \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk new file mode 100644 index 000000000000..2095def49dda --- /dev/null +++ b/stoc/Library_javavm.mk @@ -0,0 +1,62 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,javavm)) + +ifneq ($(debug),) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,javavm,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_add_internal_api,javavm,\ + jen \ +)) + +$(eval $(call gb_Library_add_linked_libs,javavm,\ + cppu \ + cppuhelper \ + jvmaccess \ + jvmfwk \ + sal \ + salhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm)) + +$(eval $(call gb_Library_add_exception_objects,javavm,\ + stoc/source/javavm/interact \ + stoc/source/javavm/javavm \ + stoc/source/javavm/jvmargs \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk new file mode 100644 index 000000000000..eaa4d7080c59 --- /dev/null +++ b/stoc/Library_namingservice.mk @@ -0,0 +1,57 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,namingservice)) + +ifneq ($(debug),) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,namingservice,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_add_internal_api,namingservice,\ + namingservice \ +)) + +$(eval $(call gb_Library_add_linked_libs,namingservice,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice)) + +$(eval $(call gb_Library_add_exception_objects,namingservice,\ + stoc/source/namingservice/namingservice \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk new file mode 100644 index 000000000000..fe1293beff29 --- /dev/null +++ b/stoc/Library_proxyfac.mk @@ -0,0 +1,57 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,proxyfac)) + +ifneq ($(debug),) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,proxyfac,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_add_internal_api,proxyfac,\ + proxyfac \ +)) + +$(eval $(call gb_Library_add_linked_libs,proxyfac,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac)) + +$(eval $(call gb_Library_add_exception_objects,proxyfac,\ + stoc/source/proxy_factory/proxyfac \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk new file mode 100644 index 000000000000..c56bf0a88a2b --- /dev/null +++ b/stoc/Library_reflection.mk @@ -0,0 +1,62 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,reflection)) + +ifneq ($(debug),) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,reflection,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_add_internal_api,reflection,\ + corefl \ +)) + +$(eval $(call gb_Library_add_linked_libs,reflection,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection)) + +$(eval $(call gb_Library_add_exception_objects,reflection,\ + stoc/source/corereflection/crarray \ + stoc/source/corereflection/crbase \ + stoc/source/corereflection/crcomp \ + stoc/source/corereflection/crefl \ + stoc/source/corereflection/crenum \ + stoc/source/corereflection/criface \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk new file mode 100644 index 000000000000..6fb777ee65fd --- /dev/null +++ b/stoc/Library_stocservices.mk @@ -0,0 +1,70 @@ +# -*- 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. + +$(eval $(call gb_Library_Library,stocservices)) + +ifneq ($(debug),) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_defs,stocservices,\ + -0b0 \ +)) +endif + +endif + +$(eval $(call gb_Library_set_include,stocservices,\ + -I$(SRCDIR)/stoc/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_internal_api,stocservices,\ + stocserv \ +)) + +$(eval $(call gb_Library_add_linked_libs,stocservices,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices)) + +$(eval $(call gb_Library_add_exception_objects,stocservices,\ + stoc/source/stocservices/stocservices \ + stoc/source/typeconv/convert \ + stoc/source/uriproc/ExternalUriReferenceTranslator \ + stoc/source/uriproc/UriReference \ + stoc/source/uriproc/UriReferenceFactory \ + stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand \ + stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript \ + stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory \ + stoc/source/uriproc/supportsService \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/inc/makefile.mk b/stoc/Makefile index 1fb6092e8286..7bbbe6c703e6 100644 --- a/stoc/inc/makefile.mk +++ b/stoc/Makefile @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,16 +25,16 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=.. -PRJNAME=stoc -TARGET=inc +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk +else -# --- Settings ----------------------------------------------------- +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk -.INCLUDE : settings.mk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk +endif +# vim: set noet sw=4 ts=4: diff --git a/stoc/Module_stoc.mk b/stoc/Module_stoc.mk new file mode 100644 index 000000000000..7169d456ba0a --- /dev/null +++ b/stoc/Module_stoc.mk @@ -0,0 +1,61 @@ +# -*- 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. + +$(eval $(call gb_Module_Module,stoc)) + +$(eval $(call gb_Module_add_targets,stoc,\ + InternalUnoApi_bootstrap \ + InternalUnoApi_corefl \ + InternalUnoApi_insp \ + InternalUnoApi_inv \ + InternalUnoApi_invadp \ + InternalUnoApi_javaloader \ + InternalUnoApi_jen \ + InternalUnoApi_namingservice \ + InternalUnoApi_proxyfac \ + InternalUnoApi_stocserv \ + Library_bootstrap \ + Library_introspection \ + Library_invocadapt \ + Library_invocation \ + Library_namingservice \ + Library_proxyfac \ + Library_reflection \ + Library_stocservices \ + Package_xml \ +)) + +ifeq ($(SOLAR_JAVA),TRUE) + +$(eval $(call gb_Module_add_targets,stoc,\ + Library_javaloader \ + Library_javavm \ +)) + +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Package_xml.mk b/stoc/Package_xml.mk new file mode 100644 index 000000000000..73dfcb4dc674 --- /dev/null +++ b/stoc/Package_xml.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 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. + +$(eval $(call gb_Package_Package,stoc_xml,$(SRCDIR)/stoc/source)) + +$(eval $(call gb_Package_add_file,stoc_xml,xml/module-description.dtd,module-description.dtd)) + +$(eval $(call gb_Package_add_file,stoc_xml,xml/reflection.uno.xml,corereflection/corefl.xml)) +$(eval $(call gb_Package_add_file,stoc_xml,xml/introspection.uno.xml,inspect/insp.xml)) +$(eval $(call gb_Package_add_file,stoc_xml,xml/invocation.uno.xml,invocation/inv.xml)) +$(eval $(call gb_Package_add_file,stoc_xml,xml/invocadapt.uno.xml,invocation_adapterfactory/invadp.xml)) +$(eval $(call gb_Package_add_file,stoc_xml,xml/javavm.uno.xml,javavm/jen.xml)) +$(eval $(call gb_Package_add_file,stoc_xml,xml/javaloader.uno.xml,javaloader/javaloader.xml)) +$(eval $(call gb_Package_add_file,stoc_xml,xml/namingservice.uno.xml,namingservice/namingservice.xml)) +$(eval $(call gb_Package_add_file,stoc_xml,xml/proxyfac.uno.xml,proxy_factory/proxyfac.xml)) +$(eval $(call gb_Package_add_file,stoc_xml,xml/bootstrap.uno.xml,bootstrap/bootstrap.xml)) +$(eval $(call gb_Package_add_file,stoc_xml,xml/stocserv.uno.xml,stocservices/stocserv.xml)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/prj/build.lst b/stoc/prj/build.lst index c7a1fe693919..a8e1a73033dc 100644 --- a/stoc/prj/build.lst +++ b/stoc/prj/build.lst @@ -1,25 +1,3 @@ tc stoc : DESKTOP:rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt registry NULL tc stoc usr1 - all tc_mkout NULL -tc stoc\inc nmake - all tc_inc NULL -tc stoc\source\defaultregistry nmake - all tc_defr tc_boot tc_inc NULL -tc stoc\source\implementationregistration nmake - all tc_ireg tc_boot tc_defr tc_inc NULL -tc stoc\source\loader nmake - all tc_loa tc_boot tc_ireg tc_inc NULL -tc stoc\source\bootstrap nmake - all tc_boot tc_inc NULL -tc stoc\source\stocservices nmake - all tc_stserv tc_inc NULL -tc stoc\source\servicemanager nmake - all tc_smgr tc_boot tc_loa tc_inc NULL -tc stoc\source\security nmake - all tc_sec tc_boot tc_loa tc_inc NULL -tc stoc\source\simpleregistry nmake - all tc_sreg tc_boot tc_smgr tc_inc NULL -tc stoc\source\registry_tdprovider nmake - all tc_regtd tc_boot tc_sreg tc_inc NULL -tc stoc\source\tdmanager nmake - all tc_tdmng tc_boot tc_regtd tc_inc NULL -tc stoc\source\corereflection nmake - all tc_corerefl tc_tdmng tc_inc NULL -tc stoc\source\inspect nmake - all tc_inspect tc_corerefl tc_inc NULL -tc stoc\source\invocation nmake - all tc_invocation tc_inspect tc_inc NULL -tc stoc\source\invocation_adapterfactory nmake - all tc_iadapter tc_invocation tc_inc NULL -tc stoc\source\namingservice nmake - all tc_nservice tc_iadapter tc_inc NULL -tc stoc\source\proxy_factory nmake - all tc_proxyfact tc_inc NULL -tc stoc\source\typeconv nmake - all tc_tcv tc_stserv tc_nservice tc_inc NULL -tc stoc\source\javavm nmake - all tc_jvm tc_inc NULL -tc stoc\source\javaloader nmake - all tc_jvload tc_inc NULL -tc stoc\source\uriproc nmake - all tc_uriproc tc_stserv tc_inc NULL -tc stoc\util nmake - all tc_util tc_boot tc_stserv tc_tcv tc_uriproc tc_smgr tc_inc tc_sreg tc_defr tc_ireg tc_regtd tc_tdmng tc_sec NULL -tc stoc\test\uriproc nmake - all tc_test_uriproc tc_util NULL +tc stoc\prj nmake - all tc_prj NULL diff --git a/stoc/prj/d.lst b/stoc/prj/d.lst index 7490b0229781..e69de29bb2d1 100644 --- a/stoc/prj/d.lst +++ b/stoc/prj/d.lst @@ -1,29 +0,0 @@ -mkdir: %_DEST%\inc\stoc - -..\%__SRC%\bin\*.dll %_DEST%\bin\* -..\%__SRC%\lib\*.so %_DEST%\lib\* -..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib -..\%__SRC%\lib\*.uno.a %_DEST%\lib\*.uno.a -..\%__SRC%\bin\*.rdb %_DEST%\rdb\* -..\%__SRC%\misc\bootstrap.component %_DEST%\xml\bootstrap.component -..\%__SRC%\misc\introspection.component %_DEST%\xml\introspection.component -..\%__SRC%\misc\invocadapt.component %_DEST%\xml\invocadapt.component -..\%__SRC%\misc\invocation.component %_DEST%\xml\invocation.component -..\%__SRC%\misc\javaloader.component %_DEST%\xml\javaloader.component -..\%__SRC%\misc\javavm.component %_DEST%\xml\javavm.component -..\%__SRC%\misc\namingservice.component %_DEST%\xml\namingservice.component -..\%__SRC%\misc\proxyfac.component %_DEST%\xml\proxyfac.component -..\%__SRC%\misc\reflection.component %_DEST%\xml\reflection.component -..\%__SRC%\misc\stocservices.component %_DEST%\xml\stocservices.component - -..\source\module-description.dtd %_DEST%\xml\module-description.dtd -..\source\corereflection\corefl.xml %_DEST%\xml\reflection.uno.xml -..\source\inspect\insp.xml %_DEST%\xml\introspection.uno.xml -..\source\invocation\inv.xml %_DEST%\xml\invocation.uno.xml -..\source\invocation_adapterfactory\invadp.xml %_DEST%\xml\invocadapt.uno.xml -..\source\javavm\jen.xml %_DEST%\xml\javavm.uno.xml -..\source\javaloader\javaloader.xml %_DEST%\xml\javaloader.uno.xml -..\source\namingservice\namingservice.xml %_DEST%\xml\namingservice.uno.xml -..\source\proxy_factory\proxyfac.xml %_DEST%\xml\proxyfac.uno.xml -..\source\bootstrap\bootstrap.xml %_DEST%\xml\bootstrap.uno.xml -..\source\typeconv\stocserv.xml %_DEST%\xml\stocserv.uno.xml diff --git a/stoc/prj/makefile.mk b/stoc/prj/makefile.mk new file mode 100755 index 000000000000..0997622e00f6 --- /dev/null +++ b/stoc/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk diff --git a/stoc/source/bootstrap/makefile.mk b/stoc/source/bootstrap/makefile.mk deleted file mode 100644 index 9eb1a11cbad9..000000000000 --- a/stoc/source/bootstrap/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = bootstrap -ENABLE_EXCEPTIONS=TRUE -BOOTSTRAP_SERVICE=TRUE -COMP1TYPELIST = bootstrap - -# --- openoffice.org.orig/Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -# --- openoffice.org.orig/Files ------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/services.obj - -# --- openoffice.org.orig/Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk deleted file mode 100644 index 1f4b4a5694c1..000000000000 --- a/stoc/source/corereflection/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = $(ENFORCEDSHLPREFIX)reflection.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = corefl - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES= \ - $(SLO)$/crefl.obj \ - $(SLO)$/crbase.obj \ - $(SLO)$/crarray.obj \ - $(SLO)$/crcomp.obj \ - $(SLO)$/criface.obj \ - $(SLO)$/crenum.obj - -SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1RPATH= URELIB - -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/reflection.component - -$(MISC)/reflection.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - reflection.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt reflection.component diff --git a/stoc/source/cppumaker.mk b/stoc/source/cppumaker.mk deleted file mode 100644 index 899c43292834..000000000000 --- a/stoc/source/cppumaker.mk +++ /dev/null @@ -1,41 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -.IF "$(BOOTSTRAP_SERVICE)" != "" -# fully functional C++-UNO (no bridging); no types.rdb needed at runtime -CPPUMAKERFLAGS = -.ENDIF - -.IF "$(debug)" != "" - -# MSVC++: no inlining -.IF "$(COM)" == "MSC" -CFLAGS += -Ob0 -.ENDIF - -.ENDIF - diff --git a/stoc/source/defaultregistry/makefile.mk b/stoc/source/defaultregistry/makefile.mk deleted file mode 100644 index 17f25999d169..000000000000 --- a/stoc/source/defaultregistry/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = nestedreg -ENABLE_EXCEPTIONS=TRUE -UNOUCROUT= $(OUT)$/inc$/bootstrap -BOOTSTRAP_SERVICE=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/defaultregistry.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/stoc/source/implementationregistration/makefile.mk b/stoc/source/implementationregistration/makefile.mk deleted file mode 100644 index 2de7fe91cb21..000000000000 --- a/stoc/source/implementationregistration/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = implreg -ENABLE_EXCEPTIONS=TRUE -BOOTSTRAP_SERVICE=TRUE -UNOUCROUT= $(OUT)$/inc$/bootstrap - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/mergekeys.obj \ - $(SLO)$/implreg.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk deleted file mode 100644 index 37b8ec682276..000000000000 --- a/stoc/source/inspect/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = $(ENFORCEDSHLPREFIX)introspection.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = insp - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES= \ - $(SLO)$/introspection.obj - -SHL1TARGET= $(TARGET) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(SALHELPERLIB) - -SHL1VERSIONMAP = $(SOLARENV)/src/component.map -SHL1RPATH=URELIB - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/introspection.component - -$(MISC)/introspection.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt introspection.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt introspection.component diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk deleted file mode 100644 index 214873d2c7c3..000000000000 --- a/stoc/source/invocation/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = $(ENFORCEDSHLPREFIX)invocation.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = inv - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES= \ - $(SLO)$/invocation.obj - -SHL1TARGET= $(TARGET) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1RPATH=URELIB - -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/invocation.component - -$(MISC)/invocation.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - invocation.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt invocation.component diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk deleted file mode 100644 index 49bbc1a76ac2..000000000000 --- a/stoc/source/invocation_adapterfactory/makefile.mk +++ /dev/null @@ -1,73 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=stoc -TARGET = $(ENFORCEDSHLPREFIX)invocadapt.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = invadp - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES= \ - $(SLO)$/iafactory.obj - -SHL1TARGET= $(TARGET) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map -SHL1RPATH=URELIB - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/invocadapt.component - -$(MISC)/invocadapt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - invocadapt.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt invocadapt.component diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk deleted file mode 100644 index 66baaa286b82..000000000000 --- a/stoc/source/javaloader/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=stoc -TARGET = $(ENFORCEDSHLPREFIX)javaloader.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = javaloader - -.IF "$(SOLAR_JAVA)" == "TRUE" -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES= $(SLO)$/javaloader.obj - -SHL1TARGET= $(TARGET) - -SHL1STDLIBS=\ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(JVMACCESSLIB) - -SHL1VERSIONMAP = $(SOLARENV)/src/component.map -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1RPATH= URELIB - -DEF1NAME= $(SHL1TARGET) - -.ELSE # SOLAR_JAVA -all: - @echo Nothing to do: SOLAR_JAVA not set -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/javaloader.component - -$(MISC)/javaloader.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - javaloader.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt javaloader.component diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk deleted file mode 100644 index 6c38f601cf58..000000000000 --- a/stoc/source/javavm/makefile.mk +++ /dev/null @@ -1,94 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=stoc -TARGET = $(ENFORCEDSHLPREFIX)javavm.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = jen - -.IF "$(SOLAR_JAVA)" == "TRUE" -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# --- Files -------------------------------------------------------- - -# Kollision zwischen bool.h aus Java und bool.h aus der STL. -# Das Problem tritt fuer alle Plattformen auf, aber anscheinend stolpert nur der -# GCC darueber -.IF "$(COM)" == "GCC" -CDEFS += -D__SGI_STL_BOOL_H -.ENDIF - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES= \ - $(SLO)$/javavm.obj \ - $(SLO)$/jvmargs.obj \ - $(SLO)$/interact.obj - -SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = $(SOLARENV)/src/component.map -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(JVMACCESSLIB) \ - $(SALHELPERLIB) \ - $(JVMFWKLIB) - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS += $(ADVAPI32LIB) -.ENDIF - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1RPATH= URELIB - -DEF1NAME= $(SHL1TARGET) - -.ELSE # SOLAR_JAVA -all: - @echo Nothing to do: SOLAR_JAVA not set -.ENDIF - -# --- Targets ------------------------------------------------------ - - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/javavm.component - -$(MISC)/javavm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - javavm.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt javavm.component diff --git a/stoc/source/loader/makefile.mk b/stoc/source/loader/makefile.mk deleted file mode 100644 index 24a39597a8cd..000000000000 --- a/stoc/source/loader/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = shlibloader -ENABLE_EXCEPTIONS=TRUE -BOOTSTRAP_SERVICE=TRUE -UNOUCROUT= $(OUT)$/inc$/bootstrap - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/dllcomponentloader.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk deleted file mode 100644 index 149874cb3c82..000000000000 --- a/stoc/source/namingservice/makefile.mk +++ /dev/null @@ -1,73 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = $(ENFORCEDSHLPREFIX)namingservice.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = namingservice - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES= \ - $(SLO)$/namingservice.obj - -SHL1TARGET= $(TARGET) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1RPATH= URELIB - -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/namingservice.component - -$(MISC)/namingservice.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt namingservice.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt namingservice.component diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk deleted file mode 100644 index 0a8a92397e18..000000000000 --- a/stoc/source/proxy_factory/makefile.mk +++ /dev/null @@ -1,73 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=stoc -TARGET = $(ENFORCEDSHLPREFIX)proxyfac.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = proxyfac - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES= \ - $(SLO)$/proxyfac.obj - -SHL1TARGET=$(TARGET) -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1RPATH=URELIB - -DEF1NAME=$(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/proxyfac.component - -$(MISC)/proxyfac.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - proxyfac.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt proxyfac.component diff --git a/stoc/source/registry_tdprovider/makefile.mk b/stoc/source/registry_tdprovider/makefile.mk deleted file mode 100644 index 6b59701541bb..000000000000 --- a/stoc/source/registry_tdprovider/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = regtypeprov -ENABLE_EXCEPTIONS=TRUE -BOOTSTRAP_SERVICE=TRUE -UNOUCROUT= $(OUT)$/inc$/bootstrap - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/tdprovider.obj \ - $(SLO)$/td.obj \ - $(SLO)$/tdef.obj \ - $(SLO)$/tdenum.obj \ - $(SLO)$/tdcomp.obj \ - $(SLO)$/tdconsts.obj \ - $(SLO)$/tdiface.obj \ - $(SLO)$/tdmodule.obj \ - $(SLO)$/tdprop.obj \ - $(SLO)$/tdservice.obj \ - $(SLO)$/tdsingleton.obj \ - $(SLO)$/rdbtdp_tdenumeration.obj \ - $(SLO)$/functiondescription.obj \ - $(SLO)$/methoddescription.obj \ - $(SLO)$/structtypedescription.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/stoc/source/security/makefile.mk b/stoc/source/security/makefile.mk deleted file mode 100644 index 25cddaa22539..000000000000 --- a/stoc/source/security/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=stoc -TARGET = security -ENABLE_EXCEPTIONS=TRUE -BOOTSTRAP_SERVICE=TRUE -UNOUCROUT=$(OUT)$/inc$/bootstrap - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/permissions.obj \ - $(SLO)$/access_controller.obj \ - $(SLO)$/file_policy.obj - -.IF "$(debug)" != "" - -# some diagnose -.IF "$(diag)" == "full" -CFLAGS += -D__DIAGNOSE -D__CACHE_DIAGNOSE -.ELIF "$(diag)" == "cache" -CFLAGS += -D__CACHE_DIAGNOSE -.ELIF "$(diag)" != "" -CFLAGS += -D__DIAGNOSE -.ENDIF - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/stoc/source/servicemanager/makefile.mk b/stoc/source/servicemanager/makefile.mk deleted file mode 100644 index f86c65d5f052..000000000000 --- a/stoc/source/servicemanager/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = servicemgr -ENABLE_EXCEPTIONS=TRUE -BOOTSTRAP_SERVICE=TRUE -UNOUCROUT=$(OUT)$/inc$/bootstrap - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/servicemanager.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/stoc/source/simpleregistry/makefile.mk b/stoc/source/simpleregistry/makefile.mk deleted file mode 100644 index bc0ddf7cc71a..000000000000 --- a/stoc/source/simpleregistry/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = simplereg -ENABLE_EXCEPTIONS=TRUE -BOOTSTRAP_SERVICE=TRUE -UNOUCROUT=$(OUT)$/inc$/bootstrap - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)/simpleregistry.obj \ - $(SLO)/textualservices.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/stoc/source/stocservices/makefile.mk b/stoc/source/stocservices/makefile.mk deleted file mode 100644 index 2d2444f8a996..000000000000 --- a/stoc/source/stocservices/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = stocservices -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = stocserv - -# --- openoffice.org.orig/Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -# --- openoffice.org.orig/Files ------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/stocservices.obj - -# --- openoffice.org.orig/Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/stoc/source/stocservices/stocserv.xml b/stoc/source/stocservices/stocserv.xml index 73de7da1bd54..3e55c4163d29 100644 --- a/stoc/source/stocservices/stocserv.xml +++ b/stoc/source/stocservices/stocserv.xml @@ -45,6 +45,12 @@ from one type to another if possible. <supported-service> com.sun.star.uri.ExternalUriReferenceTranslator </supported-service> + <type>com.sun.star.lang.WrappedTargetRuntimeException</type> + <type>com.sun.star.uri.RelativeUriExcessParentSegments</type> + <type>com.sun.star.uri.XExternalUriReferenceTranslator</type> + <type>com.sun.star.uri.XUriReference</type> + <type>com.sun.star.uri.XUriReferenceFactory</type> + <type>com.sun.star.uri.XUriSchemeParser</type> </component-description> <component-description> <author>Stephan Bergmann</author> @@ -74,6 +80,24 @@ from one type to another if possible. <supported-service> com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript </supported-service> + <type>com.sun.star.uri.XVndSunStarScriptUrlReference</type> + </component-description> + <component-description> + <author>Stephan Bergmann</author> + <name> + com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand + </name> + <description> + Instances of this service parse textual representations of absolute + “vnd.sun.star.expand” URLs. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>C++</language> + <status value="under_construction"/> + <supported-service> + com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand + </supported-service> + <type>com.sun.star.uri.XVndSunStarExpandUrlReference</type> </component-description> <component-description> <author>Stephan Bergmann</author> @@ -88,6 +112,9 @@ from one type to another if possible. <supported-service> com.sun.star.uri.VndSunStarPkgUrlReferenceFactory </supported-service> + <type>com.sun.star.uno.DeploymentException</type> + <type>com.sun.star.uri.UriReferenceFactory</type> + <type>com.sun.star.uri.XVndSunStarPkgUrlReferenceFactory</type> </component-description> <project-build-dependency> cppuhelper </project-build-dependency> <project-build-dependency> cppu </project-build-dependency> diff --git a/stoc/source/tdmanager/makefile.mk b/stoc/source/tdmanager/makefile.mk deleted file mode 100644 index dbc4e762afff..000000000000 --- a/stoc/source/tdmanager/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= stoc -TARGET = typemgr -ENABLE_EXCEPTIONS=TRUE -BOOTSTRAP_SERVICE=TRUE -UNOUCROUT= $(OUT)$/inc$/bootstrap - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/tdmgr.obj \ - $(SLO)$/tdmgr_check.obj \ - $(SLO)$/tdmgr_tdenumeration.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/stoc/source/typeconv/makefile.mk b/stoc/source/typeconv/makefile.mk deleted file mode 100644 index e84f51889b98..000000000000 --- a/stoc/source/typeconv/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=stoc -TARGET = typeconverter -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES= \ - $(SLO)$/convert.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/stoc/source/uriproc/makefile.mk b/stoc/source/uriproc/makefile.mk deleted file mode 100644 index 194da2219b6b..000000000000 --- a/stoc/source/uriproc/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=stoc -TARGET=uriproc -ENABLE_EXCEPTIONS := TRUE - -# --- openoffice.org.orig/Settings ----------------------------------------------------- - -.INCLUDE: settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : ..$/cppumaker.mk - -SLOFILES = \ - $(SLO)$/ExternalUriReferenceTranslator.obj \ - $(SLO)$/UriReference.obj \ - $(SLO)$/UriReferenceFactory.obj \ - $(SLO)$/UriSchemeParser_vndDOTsunDOTstarDOTexpand.obj \ - $(SLO)$/UriSchemeParser_vndDOTsunDOTstarDOTscript.obj \ - $(SLO)$/VndSunStarPkgUrlReferenceFactory.obj \ - $(SLO)$/supportsService.obj - -# ------------------------------------------------------------------ - -.INCLUDE: target.mk diff --git a/stoc/util/makefile.mk b/stoc/util/makefile.mk deleted file mode 100644 index 8f58e0998bb2..000000000000 --- a/stoc/util/makefile.mk +++ /dev/null @@ -1,110 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* -PRJ=.. - -PRJNAME= bootstrap -TARGET = bootstrap.uno -ENABLE_EXCEPTIONS=TRUE - -# --- openoffice.org.orig/Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -SHL1TARGET= $(ENFORCEDSHLPREFIX)$(TARGET) - -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1FILES= $(SLB)$/bootstrap.lib \ - $(SLB)$/security.lib \ - $(SLB)$/servicemgr.lib \ - $(SLB)$/simplereg.lib \ - $(SLB)$/nestedreg.lib \ - $(SLB)$/implreg.lib \ - $(SLB)$/shlibloader.lib \ - $(SLB)$/regtypeprov.lib \ - $(SLB)$/typemgr.lib - -SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(SALHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(REGLIB) \ - $(XMLREADERLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1RPATH= URELIB - -DEF1NAME= $(SHL1TARGET) - -SHL2TARGET= $(ENFORCEDSHLPREFIX)stocservices.uno - -LIB2TARGET= $(SLB)$/stocservices.uno.lib -LIB2FILES= \ - $(SLB)$/stocservices.lib \ - $(SLB)$/typeconverter.lib \ - $(SLB)$/uriproc.lib - -SHL2VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map - -SHL2STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL2DEPN= -SHL2IMPLIB= istocservices.uno -SHL2LIBS= $(SLB)$/stocservices.uno.lib -SHL2DEF= $(MISC)$/$(SHL2TARGET).def -SHL2RPATH= URELIB - -DEF2NAME= $(SHL2TARGET) - -# --- openoffice.org.orig/Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/bootstrap.component $(MISC)/stocservices.component - -$(MISC)/bootstrap.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - bootstrap.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt bootstrap.component - -$(MISC)/stocservices.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt stocservices.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_URE_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt stocservices.component diff --git a/udkapi/Module_udkapi.mk b/udkapi/Module_udkapi.mk index d25344355f66..e8bafe8308fe 100644 --- a/udkapi/Module_udkapi.mk +++ b/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: diff --git a/udkapi/Package_udkapi_idl.mk b/udkapi/Package_udkapi_idl.mk deleted file mode 100644 index 4c6591fb944a..000000000000 --- a/udkapi/Package_udkapi_idl.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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: diff --git a/udkapi/Package_udkapi_inc.mk b/udkapi/Package_udkapi_inc.mk deleted file mode 100644 index 3fc8a1b609d8..000000000000 --- a/udkapi/Package_udkapi_inc.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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: diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApiMerge_uretypes.mk index d61d07912ec2..3b01834f9c3a 100644 --- a/udkapi/UnoApi_uretypes.mk +++ b/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 \ )) diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index 09cc2f3fdcc6..2c3e1786d0cf 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -26,23 +26,23 @@ # #************************************************************************* -$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi)) +$(eval $(call gb_UnoApi_UnoApi,udkapi)) -$(eval $(call gb_UnoApiTarget_set_include,udkapi,\ +$(eval $(call gb_UnoApi_set_include,udkapi,\ $$(INCLUDE) \ -I$(SRCDIR)/udkapi \ -I$(OUTDIR)/idl \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\ udk-modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\ PropertyBag \ PropertySet \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\ Bridge \ BridgeFactory \ IiopBridge \ @@ -53,24 +53,24 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/b OleObjectFactory \ UrpBridge \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ ApplicationRegistration \ BridgeSupplier \ Factory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba,\ corba \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/giop,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/giop,\ giop \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iiop,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iiop,\ iiop \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iop,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iop,\ iop \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\ DataInputStream \ DataOutputStream \ MarkableInputStream \ @@ -82,84 +82,84 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/i TextInputStream \ TextOutputStream \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/java,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/java,\ JavaVirtualMachine \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\ MultiServiceFactory \ RegistryServiceManager \ ServiceManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\ Dynamic \ Java \ Java2 \ SharedLibrary \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\ CoreReflection \ ProxyFactory \ TypeDescriptionManager \ TypeDescriptionProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\ DefaultRegistry \ NestedRegistry \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\ Engine \ InvocationAdapterFactory \ JavaScript \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/test,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/test,\ TestFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\ BootstrapMacroExpander \ MacroExpander \ theMacroExpander \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util/logging,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util/logging,\ Logger \ LoggerRemote \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\ Introspection \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\ UnoUrlResolver \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\ Acceptor \ Connector \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\ EnumerableMap \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ SequenceInputStream \ SequenceOutputStream \ TempFile \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\ ImplementationRegistration \ SimpleRegistry \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\ AccessController \ Policy \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\ AllListenerAdapter \ Converter \ Invocation \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\ NamingService \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\ ExternalUriReferenceTranslator \ UriReferenceFactory \ UriSchemeParser_vndDOTsunDOTstarDOTexpand \ @@ -168,7 +168,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri, )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ Ambiguous \ Defaulted \ GetDirectPropertyTolerantResult \ @@ -224,7 +224,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ XTolerantMultiPropertySet \ XVetoableChangeListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ BridgeExistsException \ InvalidProtocolChangeException \ ModelDependent \ @@ -237,7 +237,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ XProtocolProperties \ XUnoUrlResolver \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ Currency \ Date \ Decimal \ @@ -246,7 +246,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/ole SCode \ XAutomationObject \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\ AlreadyAcceptingException \ ConnectionSetupException \ NoConnectException \ @@ -257,7 +257,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/connection XConnectionBroadcaster \ XConnector \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/container,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\ ContainerEvent \ ElementExistException \ NoSuchElementException \ @@ -296,7 +296,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/container, XStringKeyMap \ XUniqueIDAccess \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ AlreadyConnectedException \ BufferSizeExceededException \ ConnectException \ @@ -339,7 +339,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ XTruncate \ XXMLExtractor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ InvalidJavaSettingsException \ JavaDisabledException \ JavaInitializationException \ @@ -352,7 +352,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ XJavaThreadRegister_11 \ XJavaVM \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ ArrayIndexOutOfBoundsException \ ClassNotFoundException \ DisposedException \ @@ -389,11 +389,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ XTypeProvider \ XUnoTunnel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\ CannotActivateFactoryException \ XImplementationLoader \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\ FieldAccessMode \ InvalidTypeNameException \ InvocationTargetException \ @@ -439,7 +439,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/reflection XTypeDescriptionEnumerationAccess \ XUnionTypeDescription \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ CannotRegisterImplementationException \ InvalidRegistryException \ InvalidValueException \ @@ -451,7 +451,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ XRegistryKey \ XSimpleRegistry \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ AllEventObject \ ArrayWrapper \ BasicErrorException \ @@ -495,7 +495,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ XStarBasicModuleInfo \ XTypeConverter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ AccessControlException \ AllPermission \ RuntimePermission \ @@ -504,7 +504,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ XAction \ XPolicy \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ XInteractionAbort \ XInteractionContinuation \ XInteractionHandler \ @@ -512,19 +512,19 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ XInteractionRequest \ XInteractionRetry \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/test,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test,\ TestEvent \ XSimpleTest \ XTest \ XTestListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/test/bridge,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test/bridge,\ XBridgeTest \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/test/performance,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test/performance,\ XPerformanceTest \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ DeploymentException \ Exception \ RuntimeException \ @@ -541,7 +541,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ XUnloadingPreference \ XWeak \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ RelativeUriExcessParentSegments \ XExternalUriReferenceTranslator \ XUriReference \ @@ -553,11 +553,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ XVndSunStarScriptUrl \ XVndSunStarScriptUrlReference \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\ XMacroExpander \ XVeto \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/util/logging,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util/logging,\ LogLevel \ XLogger \ XLoggerRemote \ diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk index 464c747eb8c2..3b952318998e 100644 --- a/ure/Rdb_ure.mk +++ b/ure/Rdb_ure.mk @@ -29,28 +29,28 @@ $(eval $(call gb_Rdb_Rdb,ure/services)) $(eval $(call gb_Rdb_add_components,ure/services,\ $(if $(filter IOS,$(OS)),, \ - acceptor \ - connector) \ + io/source/acceptor/acceptor \ + io/source/connector/connector) \ binaryurp/source/binaryurp \ - bootstrap \ - introspection \ - invocadapt \ - invocation \ - namingservice \ - proxyfac \ - reflection \ - stocservices \ - streams \ - textinstream \ - textoutstream \ + stoc/util/bootstrap \ + stoc/source/inspect/introspection \ + stoc/source/invocation_adapterfactory/invocadapt \ + stoc/source/invocation/invocation \ + stoc/source/namingservice/namingservice \ + stoc/source/proxy_factory/proxyfac \ + stoc/source/corereflection/reflection \ + stoc/util/stocservices \ + io/source/stm/streams \ + io/source/TextInputStream/textinstream \ + io/source/TextOutputStream/textoutstream \ uuresolver \ )) ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Rdb_add_components,ure/services,\ - javaloader \ - javavm \ javaunohelper/util/juh \ + stoc/source/javaloader/javaloader \ + stoc/source/javavm/javavm \ )) endif |