[Libreoffice-commits] .: Branch 'feature/gbuild_components' - io/inc io/InternalUnoApi_acceptor.mk io/InternalUnoApi_connectr.mk io/InternalUnoApi_stm.mk io/Library_acceptor.mk io/Library_connector.mk io/Library_streams.mk io/Library_textinstream.mk io/Library_textoutstream.mk io/Makefile io/Module_io.mk io/Package_xml.mk io/prj io/source Repository.mk ure/Rdb_ure.mk
David Tardon
dtardon at kemper.freedesktop.org
Mon Mar 12 11:51:47 PDT 2012
Repository.mk | 5 +
io/InternalUnoApi_acceptor.mk | 32 ++++++++++++
io/InternalUnoApi_connectr.mk | 32 ++++++++++++
io/InternalUnoApi_stm.mk | 32 ++++++++++++
io/Library_acceptor.mk | 48 +++++++++++++++++++
io/Library_connector.mk | 48 +++++++++++++++++++
io/Library_streams.mk | 51 ++++++++++++++++++++
io/Library_textinstream.mk | 46 ++++++++++++++++++
io/Library_textoutstream.mk | 46 ++++++++++++++++++
io/Makefile | 40 +++++++++++++++
io/Module_io.mk | 42 ++++++++++++++++
io/Package_xml.mk | 34 +++++++++++++
io/inc/makefile.mk | 40 ---------------
io/prj/build.lst | 7 --
io/prj/d.lst | 12 ----
io/prj/makefile.mk | 1
io/source/TextInputStream/makefile.mk | 69 ---------------------------
io/source/TextOutputStream/makefile.mk | 70 ---------------------------
io/source/acceptor/makefile.mk | 80 -------------------------------
io/source/connector/makefile.mk | 80 -------------------------------
io/source/stm/makefile.mk | 83 ---------------------------------
ure/Rdb_ure.mk | 10 +--
22 files changed, 463 insertions(+), 445 deletions(-)
New commits:
commit 59162c85c269e247dc0c07fabb8b67d361d6392c
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 12 19:51:20 2012 +0100
gbuildize io
diff --git a/Repository.mk b/Repository.mk
index 3167d77..4aa91bb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -475,7 +475,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
endif
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
+ acceptor \
binaryurp \
+ connector \
introspection \
invocadapt \
invocation \
@@ -483,6 +485,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
javavm \
namingservice \
proxyfac \
+ streams \
+ textinstream \
+ textoutstream \
))
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
diff --git a/io/InternalUnoApi_acceptor.mk b/io/InternalUnoApi_acceptor.mk
new file mode 100644
index 0000000..ddd31d2
--- /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 at 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 0000000..4896069
--- /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 at 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 0000000..723e5fa
--- /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 at 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 0000000..9c558bb
--- /dev/null
+++ b/io/Library_acceptor.mk
@@ -0,0 +1,48 @@
+# -*- 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 at 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 \
+))
+
+$(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 0000000..1111aa6
--- /dev/null
+++ b/io/Library_connector.mk
@@ -0,0 +1,48 @@
+# -*- 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 at 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 \
+))
+
+$(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 0000000..8c9a889
--- /dev/null
+++ b/io/Library_streams.mk
@@ -0,0 +1,51 @@
+# -*- 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 at 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 \
+))
+
+$(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 0000000..2a25262
--- /dev/null
+++ b/io/Library_textinstream.mk
@@ -0,0 +1,46 @@
+# -*- 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 at 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 \
+))
+
+$(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 0000000..0034208
--- /dev/null
+++ b/io/Library_textoutstream.mk
@@ -0,0 +1,46 @@
+# -*- 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 at 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 \
+))
+
+$(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/Makefile b/io/Makefile
new file mode 100644
index 0000000..7bbbe6c
--- /dev/null
+++ b/io/Makefile
@@ -0,0 +1,40 @@
+# -*- 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.
+#
+#*************************************************************************
+
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
+
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.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 0000000..f0a3ebf
--- /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 at 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 0000000..a310dc0
--- /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 at 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/inc/makefile.mk b/io/inc/makefile.mk
deleted file mode 100644
index 1a0bae8..0000000
--- a/io/inc/makefile.mk
+++ /dev/null
@@ -1,40 +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=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
diff --git a/io/prj/build.lst b/io/prj/build.lst
index 4d54cc5..061791b 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 40eb9ab..e69de29 100644
--- a/io/prj/d.lst
+++ b/io/prj/d.lst
@@ -1,12 +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%\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 0000000..0997622
--- /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 3c7ed2b..0000000
--- 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 37c913c..0000000
--- 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 2473aad..0000000
--- a/io/source/acceptor/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=io
-TARGET = $(ENFORCEDSHLPREFIX)acceptor.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = acceptor
-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-DLLPRE =
-# ------------------------------------------------------------------
-
-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)
-
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/acceptor.component
-
-$(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
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
deleted file mode 100644
index c254e36..0000000
--- a/io/source/connector/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=io
-TARGET = $(ENFORCEDSHLPREFIX)connector.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = connectr
-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-DLLPRE =
-# ------------------------------------------------------------------
-
-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)
-
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-
-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
diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk
deleted file mode 100644
index 5094fb0..0000000
--- 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/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index baf8a9b..5566d4a 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -28,10 +28,10 @@
$(eval $(call gb_Rdb_Rdb,ure/services))
$(eval $(call gb_Rdb_add_components,ure/services,\
- acceptor \
+ io/source/acceptor/acceptor \
binaryurp/source/binaryurp \
stoc/util/bootstrap \
- connector \
+ io/source/connector/connector \
stoc/source/inspect/introspection \
stoc/source/invocation_adapterfactory/invocadapt \
stoc/source/invocation/invocation \
@@ -39,9 +39,9 @@ $(eval $(call gb_Rdb_add_components,ure/services,\
stoc/source/proxy_factory/proxyfac \
stoc/source/corereflection/reflection \
stoc/util/stocservices \
- streams \
- textinstream \
- textoutstream \
+ io/source/stm/streams \
+ io/source/TextInputStream/textinstream \
+ io/source/TextOutputStream/textoutstream \
uuresolver \
))
More information about the Libreoffice-commits
mailing list