Changeset 156 for vtcross/branches/bhilburn/src

Timestamp:

03/13/09 14:43:25 (15 years ago)

Author:

bhilburn

Message:

Reorganized the socket functions to form a static library to link against since
we will be using that code everwhere. All autofoo stuff has been updated to
reflect this. Also, implemented the old policy engine demo with our new
component classes and fixed some bugs in that design.

Location:

vtcross/branches/bhilburn/src

Files:

• Makefile.am (modified) (1 diff)
• include/Makefile.am (modified) (1 diff)
• include/tinyxml (added)
• include/tinyxml/Makefile.am (added)
• include/tinyxml/tinystr.h (added)
• include/tinyxml/tinyxml.h (added)
• include/vtcross/Makefile.am (modified) (1 diff)
• include/vtcross/socketcomm.h (added)
• lib (added)
• lib/Makefile.am (added)
• lib/sockets (added)
• lib/sockets/Makefile.am (added)
• lib/sockets/socketcomm.cpp (added)
• lib/tinyxml (added)
• lib/tinyxml/Makefile.am (added)
• lib/tinyxml/tinystr.cpp (added)
• lib/tinyxml/tinyxml.cpp (added)
• lib/tinyxml/tinyxmlerror.cpp (added)
• lib/tinyxml/tinyxmlparser.cpp (added)
• policy_engines/Makefile.am (modified) (1 diff)
• policy_engines/PolicyEngine.cpp (modified) (1 diff)
• policy_engines/policy_demo.cpp (added)
• shell/Makefile.am (modified) (2 diffs)
• shell/cr_shell.cpp (modified) (1 diff)

vtcross/branches/bhilburn/src/Makefile.am

@@ -1 @@
-SUBDIRS = policy_engines cognitive_engines service_management_layer libvtcross \
-                  tinyxml shell include
+SUBDIRS = lib policy_engines cognitive_engines service_management_layer \
+                  libvtcross shell include

vtcross/branches/bhilburn/src/include/Makefile.am

@@ -1 @@
-SUBDIRS = vtcross
+SUBDIRS = vtcross tinyxml

vtcross/branches/bhilburn/src/include/vtcross/Makefile.am

@@ -1 @@
-include_HEADERS = error.h debug.h socket_comm.h cbr.h components.h \
+include_HEADERS = error.h debug.h socketcomm.h cbr.h components.h \
                                   containers.h libvtcross.h common.h config.h

vtcross/branches/bhilburn/src/policy_engines/Makefile.am

@@ -5 +5 @@
 bin_PROGRAMS = policy_demo
 
-policy_demo_SOURCES = PolicyEngine.cpp default_policy_engine.cpp
+policy_demo_SOURCES = PolicyEngine.cpp policy_demo.cpp
+policy_demo_LDADD = ../lib/sockets/libsocketcomm.a
 

vtcross/branches/bhilburn/src/policy_engines/PolicyEngine.cpp

@@ -18 +18 @@
 #include "vtcross/debug.h"
 #include "vtcross/error.h"
-#include "vtcross/socket_comm.h"
+#include "vtcross/socketcomm.h"
 
 

vtcross/branches/bhilburn/src/shell/Makefile.am

@@ -1 @@
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/tinyxml
+INCLUDES = -I$(top_srcdir)/src/include
 
 AM_CXXFLAGS = -Wall -g
@@ -6 +6 @@
 
 shell_demo_SOURCES = cr_shell.cpp
-shell_demo_LDADD = ../tinyxml/libtinyxml.a
+shell_demo_LDADD = ../lib/tinyxml/libtinyxml.a
 

vtcross/branches/bhilburn/src/shell/cr_shell.cpp

@@ -15 +15 @@
 #include "vtcross/containers.h"
 #include "vtcross/common.h"
-#include "tinyxml.h"
-#include "tinystr.h"
+#include "tinyxml/tinyxml.h"
+#include "tinyxml/tinystr.h"
 
 using namespace std;