[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  28bc7415c6aefffee7f9cb21ef9a05f38d52af4b (commit)
       via  9bda64533773d38752197f2d3372fd71fdef3d3f (commit)
      from  10f938698e0c42155dfd3630ef84a98ba578448c (commit)

Summary of changes:
 cmake                   |    2 +-
 include/Commands.h      |    3 ++-
 include/Config.h        |   16 ++++++++++++++++
 include/ConsoleDriver.h |    4 +++-
 include/TestEndpoint.h  |    3 ++-
 5 files changed, 24 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 include/Commands.h
 create mode 100644 include/Config.h
 mode change 100644 => 100755 include/ConsoleDriver.h
 mode change 100644 => 100755 include/TestEndpoint.h


- Log -----------------------------------------------------------------
commit 28bc7415c6aefffee7f9cb21ef9a05f38d52af4b
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Sep 14 16:38:59 2010 -0230

    Adding DLL support to the test channel driver.

diff --git a/include/Commands.h b/include/Commands.h
index af98719..5d48dd4 100755
--- a/include/Commands.h
+++ b/include/Commands.h
@@ -17,12 +17,7 @@
 #include <vector>
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
-
-#ifdef test_channel_lib_EXPORTS
-#define TEST_CHANNEL_EXPORT __declspec(dllexport)
-#else
-#define TEST_CHANNEL_EXPORT /**/
-#endif
+#include "Config.h"
 
 //
 // TODO: Add more commands.
diff --git a/include/Config.h b/include/Config.h
new file mode 100644
index 0000000..9c9c1cf
--- /dev/null
+++ b/include/Config.h
@@ -0,0 +1,16 @@
+/*
+* Asterisk Scalable Communications Framework
+*
+* Copyright (C) 2010 -- Digium, Inc.
+*
+* All rights reserved.
+*/
+#pragma once
+
+#include <IceUtil/Config.h>
+
+#ifdef test_channel_lib_EXPORTS
+#   define TEST_CHANNEL_EXPORT ICE_DECLSPEC_EXPORT
+#else
+#   define TEST_CHANNEL_EXPORT ICE_DECLSPEC_EXPORT
+#endif
diff --git a/include/ConsoleDriver.h b/include/ConsoleDriver.h
index abdca88..2f0bf2e 100755
--- a/include/ConsoleDriver.h
+++ b/include/ConsoleDriver.h
@@ -12,11 +12,7 @@
 #include <string>
 #include <Commands.h>
 
-#ifdef test_channel_lib_EXPORTS
-#define TEST_CHANNEL_EXPORT __declspec(dllexport)
-#else
-#define TEST_CHANNEL_EXPORT /**/
-#endif
+#include "Config.h"
 
 class TEST_CHANNEL_EXPORT ConsoleDriver : virtual public CommandDriver,
     virtual public IceUtil::Thread
diff --git a/include/TestEndpoint.h b/include/TestEndpoint.h
index 503bbdb..f8f85a2 100755
--- a/include/TestEndpoint.h
+++ b/include/TestEndpoint.h
@@ -12,12 +12,7 @@
 
 #include <boost/thread/shared_mutex.hpp>
 #include <Commands.h>
-
-#ifdef test_channel_lib_EXPORTS
-#define TEST_CHANNEL_EXPORT __declspec(dllexport)
-#else
-#define TEST_CHANNEL_EXPORT /**/
-#endif
+#include "Config.h"
 
 namespace AsteriskSCF
 {

commit 9bda64533773d38752197f2d3372fd71fdef3d3f
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Sep 14 16:19:49 2010 -0230

    Fixing windows export issue when building and using the library.

diff --git a/cmake b/cmake
index 22dfc54..2359fc7 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 22dfc54c50affccc06f25b6391b0bbd71f7da568
+Subproject commit 2359fc71589a0d868be966de0011f2fe242d504d
diff --git a/include/Commands.h b/include/Commands.h
old mode 100644
new mode 100755
index aa1a60e..af98719
--- a/include/Commands.h
+++ b/include/Commands.h
@@ -18,10 +18,16 @@
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
 
+#ifdef test_channel_lib_EXPORTS
+#define TEST_CHANNEL_EXPORT __declspec(dllexport)
+#else
+#define TEST_CHANNEL_EXPORT /**/
+#endif
+
 //
 // TODO: Add more commands.
 //
-class Commands : public virtual IceUtil::Shared
+class TEST_CHANNEL_EXPORT Commands : public virtual IceUtil::Shared
 {
 public:
     virtual ~Commands() {}
diff --git a/include/ConsoleDriver.h b/include/ConsoleDriver.h
old mode 100644
new mode 100755
index ab0fdaa..abdca88
--- a/include/ConsoleDriver.h
+++ b/include/ConsoleDriver.h
@@ -12,7 +12,13 @@
 #include <string>
 #include <Commands.h>
 
-class ConsoleDriver : virtual public CommandDriver,
+#ifdef test_channel_lib_EXPORTS
+#define TEST_CHANNEL_EXPORT __declspec(dllexport)
+#else
+#define TEST_CHANNEL_EXPORT /**/
+#endif
+
+class TEST_CHANNEL_EXPORT ConsoleDriver : virtual public CommandDriver,
     virtual public IceUtil::Thread
 {
 public:
diff --git a/include/TestEndpoint.h b/include/TestEndpoint.h
old mode 100644
new mode 100755
index 77abd5a..503bbdb
--- a/include/TestEndpoint.h
+++ b/include/TestEndpoint.h
@@ -13,13 +13,19 @@
 #include <boost/thread/shared_mutex.hpp>
 #include <Commands.h>
 
+#ifdef test_channel_lib_EXPORTS
+#define TEST_CHANNEL_EXPORT __declspec(dllexport)
+#else
+#define TEST_CHANNEL_EXPORT /**/
+#endif
+
 namespace AsteriskSCF
 {
 namespace TestUtil
 {
     //
     // For the moment basically a factory that creates 
-    class TestEndpoint
+    class TEST_CHANNEL_EXPORT TestEndpoint
     {
         //
         // TestEndpoint currently doesn't support any instance specific

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/test_channel.git