ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-31 00:24:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Default to not use Civet. Civet tests should fail

Browse Source
This commit is contained in:
Caleb Herpin 2021-07-29 11:24:53 -05:00
parent 730cd4cc76
commit 0590feeaa0
4 changed files with 1939 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
autoconf/configure.ac
View File

@ -346,32 +346,20 @@ AC_ARG_ENABLE([offline],
AC_SUBST([TRICK_OFFLINE])
# If offline is specified, set some compilation flags
#AC_ARG_ENABLE([mongoose],
# AS_HELP_STRING([--enable-mongoose], [Compile Trick with webserver capabilites.]),
# AS_IF([test "x$enable_mongoose" = xyes],
# [
# TRICK_MONGOOSE="1"
# AC_MSG_WARN($(tput setaf 1) --enable-mongoose Mongoose is released under GPLv2 and Trick is \
#released under NASA Open Source Agreement 1.3. Distribution must comply with \
#these agreements$(tput sgr0))
# ],
# [TRICK_MONGOOSE="0"]
# ),
# [TRICK_MONGOOSE="0"]
#)
#AC_SUBST([TRICK_MONGOOSE])
AC_ARG_ENABLE([civet],
AS_HELP_STRING([--disable-civet], [Compile Trick without webserver capabilites.]),
AS_IF([test "x$disable_civet" = xyes],
AC_ARG_ENABLE([mongoose],
AS_HELP_STRING([--enable-mongoose], [Compile Trick with webserver capabilites.]),
AS_IF([test "x$enable_mongoose" = xyes],
[
TRICK_CIVET="1"
TRICK_MONGOOSE="1"
AC_MSG_WARN($(tput setaf 1) --enable-mongoose Mongoose is released under GPLv2 and Trick is \
released under NASA Open Source Agreement 1.3. Distribution must comply with \
these agreements$(tput sgr0))
],
[TRICK_CIVET="0"]
[TRICK_MONGOOSE="0"]
),
[TRICK_CIVET="0"]
[TRICK_MONGOOSE="0"]
)
AC_SUBST([TRICK_CIVET])
AC_SUBST([TRICK_MONGOOSE])
# If offline is specified, set some compilation flags
AC_ARG_ENABLE([offline],

1988
configure vendored
View File

File diff suppressed because it is too large Load Diff

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

@ -178,11 +178,14 @@ endif
# TRICK_ICG_EXCLUDE += :${TRICK_HOME}/include/mongoose
#endif
ifeq (${TRICK_MONGOOSE},1)
ifeq (${TRICK_MONGOOSE},1) #TODO: Make this use a civet flag instead of a mongoose flag
TRICK_CIVET=1
TRICK_LIBS += ${TRICK_LIB_DIR}/libcivetweb.a ${TRICK_LIB_DIR}/libtrickCivet.a
TRICK_SWIG_FLAGS += DUSE_CIVET
TRICK_SYSTEM_CXXFLAGS += -DUSE_CIVET
TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/civet
else
TRICK_CIVET=0
endif
# We pipe the output of compiler through tee. If the user wanted gcc color, make sure they get it.

2
share/trick/makefiles/config_user.mk.in
View File

@ -18,7 +18,7 @@ JAVAC = @JAVA_CC@
TRICK_OFFLINE = @TRICK_OFFLINE@
TRICK_MONGOOSE = @TRICK_MONGOOSE@
TRICK_CIVET = @TRICK_CIVET@
TRICK_CIVET = @TRICK_MONGOOSE@
USE_X_WINDOWS = @USE_X_WINDOWS@