You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/19 04:05:36 UTC
svn commit: r1774983 - in /openoffice/trunk/main: ./ automation/
automation/inc/ automation/inc/automation/ automation/prj/
automation/source/communi/ automation/source/server/
automation/source/simplecm/ automation/util/
Author: damjan
Date: Mon Dec 19 04:05:35 2016
New Revision: 1774983
URL: http://svn.apache.org/viewvc?rev=1774983&view=rev
Log:
Port main/automation to gbuild.
Patch by: me
Added:
openoffice/trunk/main/automation/Library_communi.mk
openoffice/trunk/main/automation/Library_communi.mk.old
openoffice/trunk/main/automation/Library_simplecm.mk
openoffice/trunk/main/automation/Library_sts.mk
openoffice/trunk/main/automation/Makefile (with props)
openoffice/trunk/main/automation/Module_automation.mk
openoffice/trunk/main/automation/Package_hid.mk
openoffice/trunk/main/automation/Package_inc.mk
openoffice/trunk/main/automation/inc/automation/automationdllapi.h (with props)
Removed:
openoffice/trunk/main/automation/inc/makefile.mk
openoffice/trunk/main/automation/source/communi/makefile.mk
openoffice/trunk/main/automation/source/server/makefile.mk
openoffice/trunk/main/automation/source/simplecm/makefile.mk
openoffice/trunk/main/automation/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/automation/inc/automation/automation.hxx
openoffice/trunk/main/automation/inc/automation/communi.hxx
openoffice/trunk/main/automation/inc/automation/simplecm.hxx
openoffice/trunk/main/automation/prj/build.lst
openoffice/trunk/main/automation/prj/d.lst
Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1774983&r1=1774982&r2=1774983&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Dec 19 04:05:35 2016
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
MathMLDTD \
animations \
+ automation \
avmedia \
basebmp \
basegfx \
Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1774983&r1=1774982&r2=1774983&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Mon Dec 19 04:05:35 2016
@@ -53,6 +53,7 @@ $(eval $(call gb_Helper_register_librari
basebmp \
basegfx \
canvastools \
+ communi \
cppcanvas \
cui \
dba \
@@ -100,10 +101,12 @@ $(eval $(call gb_Helper_register_librari
sdbc \
sdbt \
sfx \
+ simplecm \
sm \
smd \
sot \
spa \
+ sts \
svl \
svt \
svx \
Added: openoffice/trunk/main/automation/Library_communi.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/Library_communi.mk?rev=1774983&view=auto
==============================================================================
--- openoffice/trunk/main/automation/Library_communi.mk (added)
+++ openoffice/trunk/main/automation/Library_communi.mk Mon Dec 19 04:05:35 2016
@@ -0,0 +1,68 @@
+#**************************************************************
+#
+# 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,communi))
+
+$(eval $(call gb_Library_add_precompiled_header,communi,$(SRCDIR)/automation/inc/pch/precompiled_automation))
+
+$(eval $(call gb_Library_add_package_headers,communi,automation_inc))
+
+$(eval $(call gb_Library_set_include,communi,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,communi,\
+ -DAUTOMATION_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,communi,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,communi,\
+ sal \
+ simplecm \
+ svl \
+ tl \
+ vcl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,communi,\
+ advapi32 \
+ gdi32 \
+))
+endif
+
+$(eval $(call gb_Library_add_noexception_objects,communi,\
+ automation/source/communi/communi \
+))
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/automation/Library_communi.mk.old
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/Library_communi.mk.old?rev=1774983&view=auto
==============================================================================
--- openoffice/trunk/main/automation/Library_communi.mk.old (added)
+++ openoffice/trunk/main/automation/Library_communi.mk.old Mon Dec 19 04:05:35 2016
@@ -0,0 +1,99 @@
+#**************************************************************
+#
+# 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,communi))
+
+$(eval $(call gb_Library_add_precompiled_header,communi,$(SRCDIR)/automation/inc/pch/precompiled_automation))
+
+$(eval $(call gb_Library_add_package_headers,communi,automation_inc))
+
+$(eval $(call gb_Library_set_include,communi,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+))
+
+#$(eval $(call gb_Library_add_defs,communi,\
+# -DAVMEDIA_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_add_api,communi,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,communi,\
+ sal \
+ simplecm \
+ svl \
+ tl \
+ vcl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,communi,\
+ advapi32 \
+ gdi32 \
+))
+endif
+
+$(eval $(call gb_Library_add_noexception_objects,communi,\
+ automation/source/communi/communi \
+ automation/source/server/recorder \
+ automation/source/server/svcommstream \
+ automation/source/server/cmdbasestream \
+ automation/source/server/scmdstrm \
+ automation/source/server/sta_list \
+ automation/source/server/editwin \
+ automation/source/server/retstrm \
+ automation/source/server/profiler \
+ automation/source/simplecm/tcpio \
+ automation/source/simplecm/packethandler \
+ automation/source/simplecm/simplecm \
+))
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_noexception_objects,communi,\
+ automation/source/server/prof_usl \
+))
+else
+$(eval $(call gb_Library_add_noexception_objects,communi,\
+ automation/source/server/prof_nul \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,communi,\
+ automation/source/server/XMLParser \
+ automation/source/server/server \
+))
+
+$(eval $(call gb_Library_add_cxxobjects,dnd,\
+ automation/source/server/statemnt \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/automation/Library_simplecm.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/Library_simplecm.mk?rev=1774983&view=auto
==============================================================================
--- openoffice/trunk/main/automation/Library_simplecm.mk (added)
+++ openoffice/trunk/main/automation/Library_simplecm.mk Mon Dec 19 04:05:35 2016
@@ -0,0 +1,60 @@
+#**************************************************************
+#
+# 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,simplecm))
+
+$(eval $(call gb_Library_add_precompiled_header,simplecm,$(SRCDIR)/automation/inc/pch/precompiled_automation))
+
+$(eval $(call gb_Library_add_package_headers,simplecm,automation_inc))
+
+$(eval $(call gb_Library_set_include,simplecm,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,simplecm,\
+ -DAUTOMATION_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,simplecm,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,simplecm,\
+ sal \
+ tl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,simplecm,\
+ automation/source/simplecm/tcpio \
+ automation/source/simplecm/packethandler \
+ automation/source/simplecm/simplecm \
+))
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/automation/Library_sts.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/Library_sts.mk?rev=1774983&view=auto
==============================================================================
--- openoffice/trunk/main/automation/Library_sts.mk (added)
+++ openoffice/trunk/main/automation/Library_sts.mk Mon Dec 19 04:05:35 2016
@@ -0,0 +1,105 @@
+#**************************************************************
+#
+# 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,sts))
+
+$(eval $(call gb_Library_add_precompiled_header,sts,$(SRCDIR)/automation/inc/pch/precompiled_automation))
+
+$(eval $(call gb_Library_add_package_headers,sts,automation_inc))
+
+$(eval $(call gb_Library_set_include,sts,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,sts,\
+ -DAUTOMATION_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,sts,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sts,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sb \
+ sot \
+ svl \
+ svt \
+ tl \
+ vcl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,sts,\
+ advapi32 \
+ gdi32 \
+))
+endif
+
+$(eval $(call gb_Library_add_noexception_objects,sts,\
+ automation/source/communi/communi \
+ automation/source/server/recorder \
+ automation/source/server/svcommstream \
+ automation/source/server/cmdbasestream \
+ automation/source/server/scmdstrm \
+ automation/source/server/sta_list \
+ automation/source/server/editwin \
+ automation/source/server/retstrm \
+ automation/source/server/profiler \
+ automation/source/simplecm/tcpio \
+ automation/source/simplecm/packethandler \
+ automation/source/simplecm/simplecm \
+))
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_noexception_objects,sts,\
+ automation/source/server/prof_usl \
+))
+else
+$(eval $(call gb_Library_add_noexception_objects,sts,\
+ automation/source/server/prof_nul \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,sts,\
+ automation/source/server/XMLParser \
+ automation/source/server/server \
+))
+
+$(eval $(call gb_Library_add_cxxobjects,sts,\
+ automation/source/server/statemnt \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/automation/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/Makefile?rev=1774983&view=auto
==============================================================================
--- openoffice/trunk/main/automation/Makefile (added)
+++ openoffice/trunk/main/automation/Makefile Mon Dec 19 04:05:35 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/automation/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/automation/Module_automation.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/Module_automation.mk?rev=1774983&view=auto
==============================================================================
--- openoffice/trunk/main/automation/Module_automation.mk (added)
+++ openoffice/trunk/main/automation/Module_automation.mk Mon Dec 19 04:05:35 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,automation))
+
+$(eval $(call gb_Module_add_targets,automation,\
+ Library_communi \
+ Library_simplecm \
+ Library_sts \
+ Package_hid \
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/automation/Package_hid.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/Package_hid.mk?rev=1774983&view=auto
==============================================================================
--- openoffice/trunk/main/automation/Package_hid.mk (added)
+++ openoffice/trunk/main/automation/Package_hid.mk Mon Dec 19 04:05:35 2016
@@ -0,0 +1,26 @@
+#**************************************************************
+#
+# 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_Package_Package,automation_hid,$(SRCDIR)/automation/util))
+
+$(eval $(call gb_Package_add_file,automation_hid,bin/hid/manually_added_ids.hid,manually_added_ids.hid))
Added: openoffice/trunk/main/automation/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/Package_inc.mk?rev=1774983&view=auto
==============================================================================
--- openoffice/trunk/main/automation/Package_inc.mk (added)
+++ openoffice/trunk/main/automation/Package_inc.mk Mon Dec 19 04:05:35 2016
@@ -0,0 +1,31 @@
+#**************************************************************
+#
+# 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_Package_Package,automation_inc,$(SRCDIR)/automation/inc))
+
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/automationdllapi.h,automation/automationdllapi.h))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/automation.hxx,automation/automation.hxx))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/commdefines.hxx,automation/commdefines.hxx))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/commtypes.hxx,automation/commtypes.hxx))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/communi.hxx,automation/communi.hxx))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/simplecm.hxx,automation/simplecm.hxx))
Modified: openoffice/trunk/main/automation/inc/automation/automation.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/inc/automation/automation.hxx?rev=1774983&r1=1774982&r2=1774983&view=diff
==============================================================================
--- openoffice/trunk/main/automation/inc/automation/automation.hxx (original)
+++ openoffice/trunk/main/automation/inc/automation/automation.hxx Mon Dec 19 04:05:35 2016
@@ -23,9 +23,11 @@
#ifndef AUTOMATION_HXX
#define AUTOMATION_HXX
+#include <automation/automationdllapi.h>
+
class ImplRemoteControl;
-class RemoteControl
+class AUTOMATION_DLLPUBLIC RemoteControl
{
ImplRemoteControl* pImpl;
public:
Added: openoffice/trunk/main/automation/inc/automation/automationdllapi.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/inc/automation/automationdllapi.h?rev=1774983&view=auto
==============================================================================
--- openoffice/trunk/main/automation/inc/automation/automationdllapi.h (added)
+++ openoffice/trunk/main/automation/inc/automation/automationdllapi.h Mon Dec 19 04:05:35 2016
@@ -0,0 +1,39 @@
+/**************************************************************
+ *
+ * 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 INCLUDED_AUTOMATIONDLLAPI_H
+#define INCLUDED_AUTOMATIONDLLAPI_H
+
+#ifndef _SAL_TYPES_H_
+#include "sal/types.h"
+#endif
+
+#if defined(AUTOMATION_DLLIMPLEMENTATION)
+#define AUTOMATION_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define AUTOMATION_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define AUTOMATION_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_AUTOMATIONDLLAPI_H */
+
Propchange: openoffice/trunk/main/automation/inc/automation/automationdllapi.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openoffice/trunk/main/automation/inc/automation/communi.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/inc/automation/communi.hxx?rev=1774983&r1=1774982&r2=1774983&view=diff
==============================================================================
--- openoffice/trunk/main/automation/inc/automation/communi.hxx (original)
+++ openoffice/trunk/main/automation/inc/automation/communi.hxx Mon Dec 19 04:05:35 2016
@@ -29,6 +29,7 @@
#include <vos/mutex.hxx>
#include <vcl/timer.hxx>
#include <automation/simplecm.hxx>
+#include <automation/automationdllapi.h>
class SvStream;
class SvMemoryStream;
@@ -37,7 +38,7 @@ class SvMemoryStream;
class CommunicationManagerServerAcceptThread;
SV_DECL_PTRARR_SORT( CommunicationLinkList, CommunicationLink*, 1, 10 )
-class MultiCommunicationManager : public CommunicationManager
+class AUTOMATION_DLLPUBLIC MultiCommunicationManager : public CommunicationManager
{
public:
MultiCommunicationManager( sal_Bool bUseMultiChannel = sal_False );
@@ -60,19 +61,19 @@ protected:
sal_Bool bGracefullShutdown;
};
-class CommunicationManagerServer : public MultiCommunicationManager
+class AUTOMATION_DLLPUBLIC CommunicationManagerServer : public MultiCommunicationManager
{
public:
CommunicationManagerServer( sal_Bool bUseMultiChannel = sal_False ):MultiCommunicationManager( bUseMultiChannel ){;}
};
-class CommunicationManagerClient : public MultiCommunicationManager, public ICommunicationManagerClient
+class AUTOMATION_DLLPUBLIC CommunicationManagerClient : public MultiCommunicationManager, public ICommunicationManagerClient
{
public:
CommunicationManagerClient( sal_Bool bUseMultiChannel = sal_False );
};
-class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public vos::OThread
+class AUTOMATION_DLLPUBLIC CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public vos::OThread
{
public:
CommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket );
@@ -108,7 +109,7 @@ protected:
Link mlPutDataReceived;
};
-class CommunicationManagerServerViaSocket : public CommunicationManagerServer
+class AUTOMATION_DLLPUBLIC CommunicationManagerServerViaSocket : public CommunicationManagerServer
{
friend class CommunicationManagerServerAcceptThread;
public:
@@ -129,7 +130,7 @@ private:
void AddConnection( CommunicationLink *pNewConnection );
};
-class CommunicationManagerServerAcceptThread: public vos::OThread
+class AUTOMATION_DLLPUBLIC CommunicationManagerServerAcceptThread: public vos::OThread
{
public:
CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, sal_uLong nPort, sal_uInt16 nMaxCon = CM_UNLIMITED_CONNECTIONS );
@@ -154,7 +155,7 @@ private:
DECL_LINK( AddConnection, void* );
};
-class CommunicationManagerClientViaSocket : public CommunicationManagerClient, CommonSocketFunctions
+class AUTOMATION_DLLPUBLIC CommunicationManagerClientViaSocket : public CommunicationManagerClient, CommonSocketFunctions
{
public:
using CommunicationManager::StartCommunication;
Modified: openoffice/trunk/main/automation/inc/automation/simplecm.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/inc/automation/simplecm.hxx?rev=1774983&r1=1774982&r2=1774983&view=diff
==============================================================================
--- openoffice/trunk/main/automation/inc/automation/simplecm.hxx (original)
+++ openoffice/trunk/main/automation/inc/automation/simplecm.hxx Mon Dec 19 04:05:35 2016
@@ -31,6 +31,7 @@
#include <tools/datetime.hxx>
#include <automation/commdefines.hxx>
+#include <automation/automationdllapi.h>
// CM steht f�r CommunicationManager
#define CM_UNLIMITED_CONNECTIONS 0xffff
@@ -105,7 +106,7 @@ PRV_SV_DECL_REF_SIGNATURE(ClassName, Ref
SV_DECL_REF( CommunicationLink )
-class InfoString : public ByteString
+class AUTOMATION_DLLPUBLIC InfoString : public ByteString
{
public:
InfoString( ByteString &nMsg, CM_InfoType nIT, CommunicationLink *pCL = NULL ): ByteString( nMsg ), nInfoType( nIT ), pCommLink( pCL ) {;}
@@ -121,7 +122,7 @@ class CommunicationManager;
class SingleCommunicationManager;
class MultiCommunicationManager;
class CommunicationManagerServerAcceptThread;
-class CommunicationLink : public SvRefBase
+class AUTOMATION_DLLPUBLIC CommunicationLink : public SvRefBase
{
protected:
friend class CommunicationManager;
@@ -222,7 +223,7 @@ public:
SV_IMPL_REF( CommunicationLink );
class CommonSocketFunctions;
-class CommunicationManager
+class AUTOMATION_DLLPUBLIC CommunicationManager
{
friend class CommunicationLink;
friend class CommonSocketFunctions;
@@ -291,7 +292,7 @@ private:
sal_Bool bIsMultiChannel;
};
-class SingleCommunicationManager : public CommunicationManager
+class AUTOMATION_DLLPUBLIC SingleCommunicationManager : public CommunicationManager
{
public:
SingleCommunicationManager( sal_Bool bUseMultiChannel = sal_False );
@@ -309,7 +310,7 @@ protected:
virtual void DestroyingLink( CommunicationLink *pCL ); // Link tr�gt sich im Destruktor aus
};
-class ICommunicationManagerClient
+class AUTOMATION_DLLPUBLIC ICommunicationManagerClient
{
friend class CommonSocketFunctions;
protected:
@@ -317,7 +318,7 @@ protected:
};
class TCPIO;
-class SimpleCommunicationLinkViaSocket : public CommunicationLink
+class AUTOMATION_DLLPUBLIC SimpleCommunicationLinkViaSocket : public CommunicationLink
{
public:
virtual sal_Bool IsCommunicationError();
@@ -351,7 +352,7 @@ protected:
void SetNewPacketAsCurrent();
};
-class SimpleCommunicationLinkViaSocketWithReceiveCallbacks : public SimpleCommunicationLinkViaSocket
+class AUTOMATION_DLLPUBLIC SimpleCommunicationLinkViaSocketWithReceiveCallbacks : public SimpleCommunicationLinkViaSocket
{
public:
SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, vos::OStreamSocket *pSocket );
@@ -362,7 +363,7 @@ protected:
virtual void WaitForShutdown();
};
-class CommonSocketFunctions
+class AUTOMATION_DLLPUBLIC CommonSocketFunctions
{
public:
sal_Bool DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, sal_uLong nPort );
@@ -370,7 +371,7 @@ protected:
virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS )=0;
};
-class SingleCommunicationManagerClientViaSocket : public SingleCommunicationManager, public ICommunicationManagerClient, CommonSocketFunctions
+class AUTOMATION_DLLPUBLIC SingleCommunicationManagerClientViaSocket : public SingleCommunicationManager, public ICommunicationManagerClient, CommonSocketFunctions
{
public:
using CommunicationManager::StartCommunication;
Modified: openoffice/trunk/main/automation/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/prj/build.lst?rev=1774983&r1=1774982&r2=1774983&view=diff
==============================================================================
--- openoffice/trunk/main/automation/prj/build.lst (original)
+++ openoffice/trunk/main/automation/prj/build.lst Mon Dec 19 04:05:35 2016
@@ -1,8 +1,2 @@
-au automation : basic fpicker NULL
-au automation usr1 - all au_mkout NULL
-au automation\inc nmake - all au_inc NULL
-au automation\source\simplecm nmake - all au_scom au_inc NULL
-au automation\source\communi nmake - all au_comm au_inc NULL
-au automation\source\app nmake - all au_app au_inc NULL
-au automation\source\server nmake - all au_server au_inc NULL
-au automation\util nmake - all au_util au_scom au_comm au_app au_server NULL
+au automation : basic fpicker NULLx
+au automation\prj nmake - all au_prj NULL
Modified: openoffice/trunk/main/automation/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/prj/d.lst?rev=1774983&r1=1774982&r2=1774983&view=diff
==============================================================================
--- openoffice/trunk/main/automation/prj/d.lst (original)
+++ openoffice/trunk/main/automation/prj/d.lst Mon Dec 19 04:05:35 2016
@@ -1,27 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\automation
-
-#..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\util\manually_added_ids.hid %COMMON_DEST%\bin%_EXT%\hid\manually_added_ids.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib* %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\ists.lib %_DEST%\lib%_EXT%\ists.lib
-..\%__SRC%\lib\isimplecm.lib %_DEST%\lib%_EXT%\isimplecm.lib
-..\%__SRC%\lib\icommuni.lib %_DEST%\lib%_EXT%\icommuni.lib
-
-..\inc\automation\automation.hxx %_DEST%\inc%_EXT%\automation\automation.hxx
-..\inc\automation\commdefines.hxx %_DEST%\inc%_EXT%\automation\commdefines.hxx
-..\inc\automation\commtypes.hxx %_DEST%\inc%_EXT%\automation\commtypes.hxx
-..\inc\automation\communi.hxx %_DEST%\inc%_EXT%\automation\communi.hxx
-..\inc\automation\simplecm.hxx %_DEST%\inc%_EXT%\automation\simplecm.hxx
-
-..\%__SRC%\bin\testtool.exe %_DEST%\bin%_EXT%\testtool.bin
-..\%__SRC%\bin\testtool %_DEST%\bin%_EXT%\testtool.bin
-..\%__SRC%\inc\classes %_DEST%\bin%_EXT%\classes
-..\%__SRC%\inc\keycodes %_DEST%\bin%_EXT%\keycodes
-..\%__SRC%\inc\res_type %_DEST%\bin%_EXT%\res_type
-
-..\%COMMON_OUTDIR%\bin\images_tt.zip %COMMON_DEST%\bin%_EXT%\images_tt.zip
-
-..\%__SRC%\bin\testtoolrc %_DEST%\lib%_EXT%\testtoolrc
-..\%__SRC%\bin\testtool.ini %_DEST%\bin%_EXT%\testtool.ini