ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-22 09:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

exclude webserver from icg by default #943

Browse Source
This commit is contained in:
Scott Fennell 2020-02-05 13:57:56 -06:00
parent 558c744c28
commit dc71d7cd19
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -222,7 +222,6 @@ webserver: ${TRICK_LIB_DIR}/libmongoose.a ${TRICK_HOME}/include/mongoose/mongoos
$(MAKE) -C ${TRICK_HOME}/trick_source/web/HttpServer $(MAKE) -C ${TRICK_HOME}/trick_source/web/HttpServer
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/mongoose
mongoose.h: mongoose.h:
curl --retry 4 -O https://raw.githubusercontent.com/cesanta/mongoose/6.16/mongoose.h curl --retry 4 -O https://raw.githubusercontent.com/cesanta/mongoose/6.16/mongoose.h

2
include/trick/WebServer.hh
View File

@ -4,7 +4,7 @@ PURPOSE: (Represent the state and initial conditions of an http server.)
#ifndef WEB_SERVER_H #ifndef WEB_SERVER_H
#define WEB_SERVER_H #define WEB_SERVER_H
#if !defined(SWIG) || defined(USE_MONGOOSE) #ifdef USE_MONGOOSE
#include <string> #include <string>
#include <map> #include <map>

2
include/trick/WebSocketSession.hh
View File

@ -4,7 +4,7 @@ PURPOSE: (Represent Websocket connection.)
#ifndef WEB_SOCKET_SESSION_HH #ifndef WEB_SOCKET_SESSION_HH
#define WEB_SOCKET_SESSION_HH #define WEB_SOCKET_SESSION_HH
#if !defined(SWIG) || defined(USE_MONGOOSE) #ifdef USE_MONGOOSE
#include <string> #include <string>
#ifndef SWIG #ifndef SWIG
#include "mongoose/mongoose.h" #include "mongoose/mongoose.h"

8
include/trick/files_to_ICG.hh
View File

@ -36,8 +36,7 @@
#include "trick/RealtimeSync.hh" #include "trick/RealtimeSync.hh"
#include "trick/ITimer.hh" #include "trick/ITimer.hh"
#include "trick/VariableServer.hh" #include "trick/VariableServer.hh"
#include "trick/WebServer.hh"
#include "trick/WebSocketSession.hh"
#include "trick/regula_falsi.h" #include "trick/regula_falsi.h"
#include "trick/Integrator.hh" #include "trick/Integrator.hh"
#include "trick/IntegAlgorithms.hh" #include "trick/IntegAlgorithms.hh"
@ -100,4 +99,9 @@
#include "trick/lqueue.h" #include "trick/lqueue.h"
#include "trick/lstack.h" #include "trick/lstack.h"
#ifdef USE_MONGOOSE
#include "trick/WebServer.hh"
#include "trick/WebSocketSession.hh"
#endif
#endif #endif

2
share/trick/makefiles/Makefile.common
View File

@ -174,6 +174,8 @@ endif
ifeq (${TRICK_MONGOOSE},1) ifeq (${TRICK_MONGOOSE},1)
TRICK_LIBS += -ltrickHTTP ${TRICK_LIB_DIR}/libmongoose.a TRICK_LIBS += -ltrickHTTP ${TRICK_LIB_DIR}/libmongoose.a
TRICK_SWIG_FLAGS += -DUSE_MONGOOSE TRICK_SWIG_FLAGS += -DUSE_MONGOOSE
TRICK_SYSTEM_CXXFLAGS += -DUSE_MONGOOSE
TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/mongoose
endif endif
# We pipe the output of compiler through tee. If the user wanted gcc color, make sure they get it. # We pipe the output of compiler through tee. If the user wanted gcc color, make sure they get it.