CivetServer with swig is now working.

include/trick/WebSocketSession.hh

@@ -5,7 +5,9 @@ PURPOSE: (Represent Websocket connection.)
 #define WEB_SOCKET_SESSION_HH
 
 #include <string>
+#ifndef SWIG
 #include "civet/CivetServer.h"
+#endif
 
 class WebSocketSession {
     public:

include/trick/files_to_ICG.hh

@@ -103,7 +103,7 @@
 #include "trick/WebServer.hh"
 #include "trick/WebSocketSession.hh"
 #endif
-#include "trick/CivetServer.hh"
+#include "trick/MyCivetServer.hh"
 #include "trick/WebSocketSession.hh"
 
 #endif

share/trick/makefiles/Makefile.common

@@ -180,7 +180,6 @@ endif
 
 TRICK_LIBS += ${TRICK_LIB_DIR}/libcivetweb.a ${TRICK_LIB_DIR}/libtrickCivet.a
 TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/civet
-TRICK_SWIG_EXCLUDE += ${TRICK_HOME}/include/civet
 
 # We pipe the output of compiler through tee.  If the user wanted gcc color, make sure they get it.
 ifdef GCC_COLORS

share/trick/sim_objects/CivetServer.sm

@@ -1,13 +1,7 @@
 /************************TRICK HEADER*************************
-PURPOSE: 
-    (Trick HTTP Server)
-LIBRARY DEPENDENCIES:
-    (
-     (../../../lib/libcivetweb.a)
-    )
-
+PURPOSE: (Trick HTTP Server)
 *************************************************************/
-##include "trick/CivetServer.hh"
+##include "trick/MyCivetServer.hh"
 
 class MyCivetServerSimObject : public Trick::SimObject {
 

trick_source/trick_swig/sim_services.i

@@ -145,7 +145,7 @@
 #include "trick/Flag.h"
 #include "trick/UdUnits.hh"
 #include "trick/WebServer.hh"
-// #include "trick/CivetServer.hh"
+#include "trick/MyCivetServer.hh"
 
 #ifdef USE_ER7_UTILS_INTEGRATORS
 #include "er7_utils/integration/core/include/integrator_constructor_factory.hh"

trick_source/web/CivetServer/include/VariableServerSession.hh

@@ -8,7 +8,9 @@ PURPOSE: (Represent the state of a variable server websocket connection.)
 #include <vector>
 #include <string>
 
+#ifndef SWIG
 #include "civet/CivetServer.h"
+#endif
 
 #include "trick/WebSocketSession.hh"
 #include "VariableServerVariable.hh"

trick_source/web/CivetServer/include/VariableServerVariable.hh

@@ -9,7 +9,9 @@ LIBRARY DEPENDENCIES:
 #include <time.h>
 #include <vector>
 
+#ifndef SWIG
 #include "civet/CivetServer.h"
+#endif
 
 #include <iostream>
 #include <trick/reference.h>

trick_source/web/CivetServer/include/http_GET_handlers.hh

@@ -7,7 +7,9 @@ LIBRARY DEPENDENCIES:
 #define HANDLE_HTTP_GET_HANDLERS_HH
 #include <cstddef>
 
+#ifndef SWIG
 #include "civet/CivetServer.h"
+#endif
 
 int parent_http_handler(struct mg_connection* conn, void *cbdata);
 void handle_hello_world(struct mg_connection* conn, void* ignore);

trick_source/web/CivetServer/makefile

@@ -23,7 +23,7 @@ TRICK_HTTP_OBJS = \
        ${OBJDIR}/VariableServerSession.o \
        ${OBJDIR}/VariableServerVariable.o \
        ${OBJDIR}/http_GET_handlers.o \
-       ${OBJDIR}/CivetServer.o \
+       ${OBJDIR}/MyCivetServer.o \
        ${OBJDIR}/simpleJSON.o
 
 #############################################################################

trick_source/web/CivetServer/src/MyCivetServer.cpp

@@ -9,7 +9,7 @@ PURPOSE: (Represent the state and initial conditions for my server)
 #include <dirent.h>   // for opendir(), readdir()
 #include <iostream>
 #include <fstream>
-#include "trick/CivetServer.hh"
+#include "trick/MyCivetServer.hh"
 #include <string.h>
 #include <string>
 
@@ -21,7 +21,9 @@ PURPOSE: (Represent the state and initial conditions for my server)
 #include "../include/VariableServerSession.hh"
 #include "trick/WebSocketSession.hh"
 
+#ifndef SWIG
 #include "civet/CivetServer.h"
+#endif
 
 #include "../include/http_GET_handlers.hh"
 

trick_source/web/CivetServer/src/http_GET_handlers.cpp

@@ -5,9 +5,11 @@ LIBRARY DEPENDENCIES:
 **************************************************************************/
 
 #include "../include/http_GET_handlers.hh"
-#include "trick/CivetServer.hh"
+#include "trick/MyCivetServer.hh"
 
+#ifndef SWIG
 #include "civet/CivetServer.h"
+#endif
 
 #include <sstream>
 

trick_source/web/HttpServer/src/_CivetServer.cpp

@@ -7,7 +7,7 @@ PURPOSE: (Represent the state and initial conditions for my server)
 #include <dirent.h>   // for opendir(), readdir()
 #include <iostream>
 #include <fstream>
-#include "trick/CivetServer.hh"
+#include "trick/MyCivetServer.hh"
 #include <string.h>
 #include <string>
 
@@ -19,7 +19,9 @@ PURPOSE: (Represent the state and initial conditions for my server)
 #include "../include/VariableServerSession.hh"
 #include "trick/WebSocketSession.hh"
 
+#ifndef SWIG
 #include "civet/CivetServer.h"
+#endif
 
 #include "handlers.cpp"