diff options
author | David Tardon <dtardon@redhat.com> | 2011-09-15 07:10:22 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-09-15 07:10:22 +0200 |
commit | 45589f1f27be2d93c250e900102d66af0d2b694d (patch) | |
tree | 065fd3eb1679c31c96f460a9d02c7ced4e65604c /automation/inc | |
parent | 6c8a7e0e6ad223051442ef6ce1d1103086c3f4a0 (diff) |
gbuildize automation
Diffstat (limited to 'automation/inc')
-rw-r--r-- | automation/inc/automation/automation.hxx | 4 | ||||
-rw-r--r-- | automation/inc/automation/communi.hxx | 16 | ||||
-rw-r--r-- | automation/inc/automation/communidllapi.h | 43 | ||||
-rw-r--r-- | automation/inc/automation/simplecm.hxx | 14 | ||||
-rw-r--r-- | automation/inc/automation/simplecmdllapi.h | 43 | ||||
-rw-r--r-- | automation/inc/automation/stsdllapi.h | 43 | ||||
-rw-r--r-- | automation/inc/makefile.mk | 47 |
7 files changed, 149 insertions, 61 deletions
diff --git a/automation/inc/automation/automation.hxx b/automation/inc/automation/automation.hxx index aaf54e24d564..8549bc777fa9 100644 --- a/automation/inc/automation/automation.hxx +++ b/automation/inc/automation/automation.hxx @@ -28,9 +28,11 @@ #ifndef AUTOMATION_HXX #define AUTOMATION_HXX +#include "automation/stsdllapi.h" + class ImplRemoteControl; -class RemoteControl +class STS_DLLPUBLIC RemoteControl { ImplRemoteControl* pImpl; public: diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx index c416d771af6f..14355124ecca 100644 --- a/automation/inc/automation/communi.hxx +++ b/automation/inc/automation/communi.hxx @@ -29,6 +29,8 @@ #ifndef _COMMUNI_HXX #define _COMMUNI_HXX +#include "automation/communidllapi.h" + #include <svl/svarray.hxx> #include <osl/thread.hxx> #include <osl/mutex.hxx> @@ -42,7 +44,7 @@ class SvMemoryStream; class CommunicationManagerServerAcceptThread; SV_DECL_PTRARR_SORT( CommunicationLinkList, CommunicationLink*, 1, 10 ) -class MultiCommunicationManager : public CommunicationManager +class COMMUNI_DLLPUBLIC MultiCommunicationManager : public CommunicationManager { public: MultiCommunicationManager( sal_Bool bUseMultiChannel = sal_False ); @@ -65,19 +67,19 @@ protected: sal_Bool bGracefullShutdown; }; -class CommunicationManagerServer : public MultiCommunicationManager +class COMMUNI_DLLPUBLIC CommunicationManagerServer : public MultiCommunicationManager { public: CommunicationManagerServer( sal_Bool bUseMultiChannel = sal_False ):MultiCommunicationManager( bUseMultiChannel ){;} }; -class CommunicationManagerClient : public MultiCommunicationManager, public ICommunicationManagerClient +class COMMUNI_DLLPUBLIC CommunicationManagerClient : public MultiCommunicationManager, public ICommunicationManagerClient { public: CommunicationManagerClient( sal_Bool bUseMultiChannel = sal_False ); }; -class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread +class COMMUNI_DLLPUBLIC CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread { public: CommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket ); @@ -113,7 +115,7 @@ protected: Link mlPutDataReceived; }; -class CommunicationManagerServerViaSocket : public CommunicationManagerServer +class COMMUNI_DLLPUBLIC CommunicationManagerServerViaSocket : public CommunicationManagerServer { friend class CommunicationManagerServerAcceptThread; public: @@ -134,7 +136,7 @@ private: void AddConnection( CommunicationLink *pNewConnection ); }; -class CommunicationManagerServerAcceptThread: public osl::Thread +class COMMUNI_DLLPUBLIC CommunicationManagerServerAcceptThread: public osl::Thread { public: CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, sal_uLong nPort, sal_uInt16 nMaxCon = CM_UNLIMITED_CONNECTIONS ); @@ -159,7 +161,7 @@ private: DECL_LINK( AddConnection, void* ); }; -class CommunicationManagerClientViaSocket : public CommunicationManagerClient, CommonSocketFunctions +class COMMUNI_DLLPUBLIC CommunicationManagerClientViaSocket : public CommunicationManagerClient, CommonSocketFunctions { public: using CommunicationManager::StartCommunication; diff --git a/automation/inc/automation/communidllapi.h b/automation/inc/automation/communidllapi.h new file mode 100644 index 000000000000..637d00d88900 --- /dev/null +++ b/automation/inc/automation/communidllapi.h @@ -0,0 +1,43 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef INCLUDED_AUTOMATION_COMMUNIDLLAPI_H +#define INCLUDED_AUTOMATION_COMMUNIDLLAPI_H + +#include <sal/types.h> + +#if defined(COMMUNI_DLLIMPLEMENTATION) +#define COMMUNI_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define COMMUNI_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define COMMUNI_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx index 96e55caef8b7..cc735a9de99c 100644 --- a/automation/inc/automation/simplecm.hxx +++ b/automation/inc/automation/simplecm.hxx @@ -28,6 +28,8 @@ #ifndef _SIMPLECM_HXX #define _SIMPLECM_HXX +#include "automation/simplecmdllapi.h" + #include <tools/link.hxx> #include <tools/string.hxx> #include <tools/stream.hxx> @@ -101,7 +103,7 @@ class CommunicationLink; SV_DECL_REF( CommunicationLink ) -class InfoString : public ByteString +class SIMPLECM_DLLPUBLIC InfoString : public ByteString { public: InfoString( ByteString &nMsg, CM_InfoType nIT, CommunicationLink *pCL = NULL ): ByteString( nMsg ), nInfoType( nIT ), pCommLink( pCL ) {;} @@ -116,7 +118,7 @@ class PacketHandler; class CommunicationManager; class MultiCommunicationManager; class CommunicationManagerServerAcceptThread; -class CommunicationLink : public SvRefBase +class SIMPLECM_DLLPUBLIC CommunicationLink : public SvRefBase { protected: friend class CommunicationManager; @@ -213,7 +215,7 @@ public: SV_IMPL_REF( CommunicationLink ); class CommonSocketFunctions; -class CommunicationManager +class SIMPLECM_DLLPUBLIC CommunicationManager { friend class CommunicationLink; friend class CommonSocketFunctions; @@ -281,7 +283,7 @@ private: sal_Bool bIsMultiChannel; }; -class ICommunicationManagerClient +class SIMPLECM_DLLPUBLIC ICommunicationManagerClient { friend class CommonSocketFunctions; protected: @@ -289,7 +291,7 @@ protected: }; class TCPIO; -class SimpleCommunicationLinkViaSocket : public CommunicationLink +class SIMPLECM_DLLPUBLIC SimpleCommunicationLinkViaSocket : public CommunicationLink { public: virtual sal_Bool IsCommunicationError(); @@ -322,7 +324,7 @@ protected: void SetNewPacketAsCurrent(); }; -class CommonSocketFunctions +class SIMPLECM_DLLPUBLIC CommonSocketFunctions { public: sal_Bool DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, sal_uLong nPort ); diff --git a/automation/inc/automation/simplecmdllapi.h b/automation/inc/automation/simplecmdllapi.h new file mode 100644 index 000000000000..08c262ac2c97 --- /dev/null +++ b/automation/inc/automation/simplecmdllapi.h @@ -0,0 +1,43 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef INCLUDED_AUTOMATION_SIMPLECMDLLAPI_H +#define INCLUDED_AUTOMATION_SIMPLECMDLLAPI_H + +#include <sal/types.h> + +#if defined(SIMPLECM_DLLIMPLEMENTATION) +#define SIMPLECM_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define SIMPLECM_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define SIMPLECM_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/inc/automation/stsdllapi.h b/automation/inc/automation/stsdllapi.h new file mode 100644 index 000000000000..e7c3c64942de --- /dev/null +++ b/automation/inc/automation/stsdllapi.h @@ -0,0 +1,43 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef INCLUDED_AUTOMATION_STSDLLAPI_H +#define INCLUDED_AUTOMATION_STSDLLAPI_H + +#include <sal/types.h> + +#if defined(STS_DLLIMPLEMENTATION) +#define STS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define STS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define STS_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/inc/makefile.mk b/automation/inc/makefile.mk deleted file mode 100644 index 782b6a805b9b..000000000000 --- a/automation/inc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=automation -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - |