Author: damjan
Date: Sun Dec 4 08:17:37 2016
New Revision: 1772508
URL: http://svn.apache.org/viewvc?rev=1772508&view=rev
Log:
Port main/io to gbuild.
Patch by: me
Added:
openoffice/trunk/main/io/Library_acceptor.mk
openoffice/trunk/main/io/Library_connector.mk
openoffice/trunk/main/io/Library_streams.mk
openoffice/trunk/main/io/Library_textinstream.mk
openoffice/trunk/main/io/Library_textoutstream.mk
openoffice/trunk/main/io/Makefile (with props)
openoffice/trunk/main/io/Module_io.mk
openoffice/trunk/main/io/inc/io/
openoffice/trunk/main/io/inc/io/dllapi.h (with props)
openoffice/trunk/main/io/prj/makefile.mk
Removed:
openoffice/trunk/main/io/source/TextInputStream/makefile.mk
openoffice/trunk/main/io/source/TextOutputStream/makefile.mk
openoffice/trunk/main/io/source/acceptor/makefile.mk
openoffice/trunk/main/io/source/connector/makefile.mk
openoffice/trunk/main/io/source/stm/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/io/prj/build.lst
openoffice/trunk/main/io/prj/d.lst
openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx
openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx
openoffice/trunk/main/io/source/acceptor/acceptor.cxx
openoffice/trunk/main/io/source/stm/factreg.cxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/ure/source/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Sun Dec 4 08:17:37 2016
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,o
formula \
framework \
idl \
+ io \
linguistic \
offapi \
oovbaapi \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Sun Dec 4 08:17:37 2016
@@ -146,8 +146,10 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ acceptor \
cairocanvas \
canvasfactory \
+ connector \
directx5canvas \
directx9canvas \
expwrap \
@@ -158,6 +160,9 @@ $(eval $(call gb_Helper_register_librari
nullcanvas \
passwordcontainer \
simplecanvas \
+ streams \
+ textinstream \
+ textoutstream \
vbaswobj \
msforms \
vclcanvas \
Added: openoffice/trunk/main/io/Library_acceptor.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_acceptor.mk?rev=1772508&view=auto
==============================================================================
--- openoffice/trunk/main/io/Library_acceptor.mk (added)
+++ openoffice/trunk/main/io/Library_acceptor.mk Sun Dec 4 08:17:37 2016
@@ -0,0 +1,58 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,acceptor))
+
+$(eval $(call
gb_Library_add_precompiled_header,acceptor,$(SRCDIR)/io/inc/pch/precompiled_io))
+
+$(eval $(call
gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor))
+
+$(eval $(call gb_Library_set_include,acceptor,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/io/inc \
+ -I$(SRCDIR)/io/inc/pch \
+))
+
+$(eval $(call gb_Library_add_defs,acceptor,\
+ -DIO_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,acceptor,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,acceptor,\
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,acceptor,\
+ io/source/acceptor/acc_pipe \
+ io/source/acceptor/acc_socket \
+ io/source/acceptor/acceptor \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/io/Library_connector.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_connector.mk?rev=1772508&view=auto
==============================================================================
--- openoffice/trunk/main/io/Library_connector.mk (added)
+++ openoffice/trunk/main/io/Library_connector.mk Sun Dec 4 08:17:37 2016
@@ -0,0 +1,58 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,connector))
+
+$(eval $(call
gb_Library_add_precompiled_header,connector,$(SRCDIR)/io/inc/pch/precompiled_io))
+
+$(eval $(call
gb_Library_set_componentfile,connector,io/source/connector/connector))
+
+$(eval $(call gb_Library_set_include,connector,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/io/inc \
+ -I$(SRCDIR)/io/inc/pch \
+))
+
+$(eval $(call gb_Library_add_defs,connector,\
+ -DIO_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,connector,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,connector,\
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,connector,\
+ io/source/connector/connector \
+ io/source/connector/ctr_pipe \
+ io/source/connector/ctr_socket \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/io/Library_streams.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_streams.mk?rev=1772508&view=auto
==============================================================================
--- openoffice/trunk/main/io/Library_streams.mk (added)
+++ openoffice/trunk/main/io/Library_streams.mk Sun Dec 4 08:17:37 2016
@@ -0,0 +1,61 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,streams))
+
+$(eval $(call
gb_Library_add_precompiled_header,streams,$(SRCDIR)/io/inc/pch/precompiled_io))
+
+$(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams))
+
+$(eval $(call gb_Library_set_include,streams,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/io/inc \
+ -I$(SRCDIR)/io/inc/pch \
+))
+
+$(eval $(call gb_Library_add_defs,streams,\
+ -DIO_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,streams,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,streams,\
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(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 noet sw=4 ts=4:
Added: openoffice/trunk/main/io/Library_textinstream.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_textinstream.mk?rev=1772508&view=auto
==============================================================================
--- openoffice/trunk/main/io/Library_textinstream.mk (added)
+++ openoffice/trunk/main/io/Library_textinstream.mk Sun Dec 4 08:17:37 2016
@@ -0,0 +1,56 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,textinstream))
+
+$(eval $(call
gb_Library_add_precompiled_header,textinstream,$(SRCDIR)/io/inc/pch/precompiled_io))
+
+$(eval $(call
gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream))
+
+$(eval $(call gb_Library_set_include,textinstream,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/io/inc \
+ -I$(SRCDIR)/io/inc/pch \
+))
+
+$(eval $(call gb_Library_add_defs,textinstream,\
+ -DIO_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,textinstream,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,textinstream,\
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,textinstream,\
+ io/source/TextInputStream/TextInputStream \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/io/Library_textoutstream.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_textoutstream.mk?rev=1772508&view=auto
==============================================================================
--- openoffice/trunk/main/io/Library_textoutstream.mk (added)
+++ openoffice/trunk/main/io/Library_textoutstream.mk Sun Dec 4 08:17:37 2016
@@ -0,0 +1,56 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,textoutstream))
+
+$(eval $(call
gb_Library_add_precompiled_header,textoutstream,$(SRCDIR)/io/inc/pch/precompiled_io))
+
+$(eval $(call
gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream))
+
+$(eval $(call gb_Library_set_include,textoutstream,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/io/inc \
+ -I$(SRCDIR)/io/inc/pch \
+))
+
+$(eval $(call gb_Library_add_defs,textoutstream,\
+ -DIO_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,textoutstream,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,textoutstream,\
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,textoutstream,\
+ io/source/TextOutputStream/TextOutputStream \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/io/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/Makefile?rev=1772508&view=auto
==============================================================================
--- openoffice/trunk/main/io/Makefile (added)
+++ openoffice/trunk/main/io/Makefile Sun Dec 4 08:17:37 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: openoffice/trunk/main/io/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/io/Module_io.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/Module_io.mk?rev=1772508&view=auto
==============================================================================
--- openoffice/trunk/main/io/Module_io.mk (added)
+++ openoffice/trunk/main/io/Module_io.mk Sun Dec 4 08:17:37 2016
@@ -0,0 +1,34 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,io))
+
+$(eval $(call gb_Module_add_targets,io,\
+ Library_acceptor \
+ Library_connector \
+ Library_streams \
+ Library_textinstream \
+ Library_textoutstream \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/io/inc/io/dllapi.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/inc/io/dllapi.h?rev=1772508&view=auto
==============================================================================
--- openoffice/trunk/main/io/inc/io/dllapi.h (added)
+++ openoffice/trunk/main/io/inc/io/dllapi.h Sun Dec 4 08:17:37 2016
@@ -0,0 +1,36 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef IO_DLLAPI_H
+#define IO_DLLAPI_H
+
+#include "sal/config.h"
+#include "sal/types.h"
+
+#if defined IO_DLLIMPLEMENTATION
+#define IO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define IO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
Propchange: openoffice/trunk/main/io/inc/io/dllapi.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openoffice/trunk/main/io/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/prj/build.lst?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/io/prj/build.lst (original)
+++ openoffice/trunk/main/io/prj/build.lst Sun Dec 4 08:17:37 2016
@@ -1,8 +1,2 @@
io io : LIBXSLT:libxslt rdbmaker 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
Modified: openoffice/trunk/main/io/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/prj/d.lst?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/io/prj/d.lst (original)
+++ openoffice/trunk/main/io/prj/d.lst Sun Dec 4 08:17:37 2016
@@ -1,12 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*
-..\source\acceptor\acceptor.xml %_DEST%\xml%_EXT%\acceptor.uno.xml
-..\source\connector\connectr.xml %_DEST%\xml%_EXT%\connector.uno.xml
-..\source\stm\stm.xml %_DEST%\xml%_EXT%\streams.uno.xml
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-..\%__SRC%\misc\acceptor.component %_DEST%\xml%_EXT%\acceptor.component
-..\%__SRC%\misc\connector.component %_DEST%\xml%_EXT%\connector.component
-..\%__SRC%\misc\streams.component %_DEST%\xml%_EXT%\streams.component
-..\%__SRC%\misc\textinstream.component %_DEST%\xml%_EXT%\textinstream.component
-..\%__SRC%\misc\textoutstream.component
%_DEST%\xml%_EXT%\textoutstream.component
Added: openoffice/trunk/main/io/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/prj/makefile.mk?rev=1772508&view=auto
==============================================================================
--- openoffice/trunk/main/io/prj/makefile.mk (added)
+++ openoffice/trunk/main/io/prj/makefile.mk Sun Dec 4 08:17:37 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
$(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx
(original)
+++ openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx Sun Dec
4 08:17:37 2016
@@ -44,6 +44,8 @@
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include "io/dllapi.h"
+
#define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextInputStream"
#define SERVICE_NAME "com.sun.star.io.TextInputStream"
@@ -505,19 +507,19 @@ static struct ImplementationEntry g_entr
extern "C"
{
-sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+IO_DLLPUBLIC sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+IO_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-void * SAL_CALL component_getFactory(
+IO_DLLPUBLIC void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey
)
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
Modified: openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx
(original)
+++ openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx Sun
Dec 4 08:17:37 2016
@@ -38,6 +38,8 @@
#include <rtl/tencinfo.h>
#include <rtl/unload.h>
+#include "io/dllapi.h"
+
#include <com/sun/star/io/XTextOutputStream.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -318,19 +320,19 @@ static struct ImplementationEntry g_entr
extern "C"
{
-sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+IO_DLLPUBLIC sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+IO_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-void * SAL_CALL component_getFactory(
+IO_DLLPUBLIC void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey
)
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
Modified: openoffice/trunk/main/io/source/acceptor/acceptor.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/source/acceptor/acceptor.cxx?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/io/source/acceptor/acceptor.cxx (original)
+++ openoffice/trunk/main/io/source/acceptor/acceptor.cxx Sun Dec 4 08:17:37
2016
@@ -37,6 +37,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "acceptor.hxx"
+#include "io/dllapi.h"
#define IMPLEMENTATION_NAME "com.sun.star.comp.io.Acceptor"
#define SERVICE_NAME "com.sun.star.connection.Acceptor"
@@ -350,19 +351,19 @@ static struct ImplementationEntry g_entr
extern "C"
{
-sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+IO_DLLPUBLIC sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+IO_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-void * SAL_CALL component_getFactory(
+IO_DLLPUBLIC void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey
)
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
Modified: openoffice/trunk/main/io/source/stm/factreg.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/io/source/stm/factreg.cxx?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/io/source/stm/factreg.cxx (original)
+++ openoffice/trunk/main/io/source/stm/factreg.cxx Sun Dec 4 08:17:37 2016
@@ -28,6 +28,8 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
+#include "io/dllapi.h"
+
#include <com/sun/star/registry/XRegistryKey.hpp>
using namespace ::rtl;
@@ -94,19 +96,19 @@ static struct ImplementationEntry g_entr
extern "C"
{
-sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+IO_DLLPUBLIC sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+IO_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-void * SAL_CALL component_getFactory(
+IO_DLLPUBLIC void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey
)
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Sun Dec 4
08:17:37 2016
@@ -35,10 +35,8 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --
.END
my_components = \
- acceptor \
binaryurp \
bootstrap \
- connector \
introspection \
invocadapt \
invocation \
@@ -49,9 +47,6 @@ my_components = \
proxyfac \
reflection \
stocservices \
- streams \
- textinstream \
- textoutstream \
uuresolver \
abp \
analysis \
@@ -83,6 +78,11 @@ my_components = \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
+ component/io/source/acceptor/acceptor \
+ component/io/source/connector/connector \
+ component/io/source/stm/streams \
+ component/io/source/TextInputStream/textinstream \
+ component/io/source/TextOutputStream/textoutstream \
component/linguistic/source/lng \
component/oox/util/oox \
component/reportdesign/util/rptxml \
Modified: openoffice/trunk/main/ure/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/makefile.mk?rev=1772508&r1=1772507&r2=1772508&view=diff
==============================================================================
--- openoffice/trunk/main/ure/source/makefile.mk (original)
+++ openoffice/trunk/main/ure/source/makefile.mk Sun Dec 4 08:17:37 2016
@@ -30,10 +30,10 @@ ZIP1FLAGS = -r
ZIP1LIST = uretest
my_components = \
- acceptor \
+ component/io/source/acceptor/acceptor \
binaryurp \
bootstrap \
- connector \
+ component/io/source/connector/connector \
introspection \
invocadapt \
invocation \
@@ -44,9 +44,9 @@ my_components = \
proxyfac \
reflection \
stocservices \
- streams \
- textinstream \
- textoutstream \
+ component/io/source/stm/streams \
+ component/io/source/TextInputStream/textinstream \
+ component/io/source/TextOutputStream/textoutstream \
uuresolver
.INCLUDE: settings.mk
