Removed TableLoader and Boost dependency, adjust paths

lsst-ts · Oct 24, 2023 · a616d9e · a616d9e
1 parent 27ca580
commit a616d9e
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 158 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsstts/develop-env:c0028.004
+FROM lsstts/develop-env:develop
 
 USER root
 RUN chmod a+rwX -R /home/saluser/
@@ -7,13 +7,15 @@ USER saluser
 WORKDIR /home/saluser
 
 RUN source ~/.setup.sh \
-    && mamba install -y readline yaml-cpp boost-cpp catch2 spdlog \
+    && mamba install -y readline yaml-cpp boost-cpp catch2 spdlog fmt \
     && echo > .crio_setup.sh -e \
 echo "Configuring cRIO development environment" \\n\
 export SHELL=bash \\n\
 source /home/saluser/.setup_salobj.sh \\n\
 export PATH=\$CONDA_PREFIX/bin:\$PATH \\n\
 export LIBS="-L\$CONDA_PREFIX/lib" \\n\
-export CPP_FLAGS="-I\$CONDA_PREFIX/include" \\n
+export CPP_FLAGS="-I\$CONDA_PREFIX/include" \\n\
+export PKG_CONFIG_PATH=$CONDA_PREFIX/share/pkgconfig \\n\
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CONDA_PREFIX/lib \\n
 
 # SHELL ["/bin/bash", "-lc"]
diff --git a/Makefile.inc b/Makefile.inc
@@ -4,7 +4,7 @@ ifndef VERBOSE
   silence := --silence-errors
 endif
 
-c_opts :=  -fdata-sections -ffunction-sections -DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE
+c_opts :=  -fdata-sections -ffunction-sections -DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE -DSPDLOG_FMT_EXTERNAL
 
 ifdef DEBUG
   c_opts += -g
@@ -29,7 +29,6 @@ PKG_LIBS := $(shell pkg-config yaml-cpp --libs $(silence)) \
 
 LIBS += $(PKG_LIBS) -ldl -lpthread
 
-BOOST_CPPFLAGS := -I/usr/include/boost169
 PKG_CPP_FLAGS := $(shell pkg-config yaml-cpp --cflags $(silence)) \
         $(shell pkg-config spdlog --cflags $(silence)) \
         $(shell pkg-config fmt --cflags $(silence))

diff --git a/doc/version-history.rst b/doc/version-history.rst
@@ -0,0 +1,19 @@
+###############
+Version History
+###############
+
+v1.9.0
+======
+
+* MPU changed to SerialMultiplex
+
+v1.8.0
+======
+
+* LVDT ElectroMechanical readout
+
+v1.7.0
+======
+
+* offsets,.. ILC commands
+* improved re-heater gain management
diff --git a/include/cRIO/TableLoader.h b/include/cRIO/TableLoader.h
diff --git a/src/LSST/cRIO/TableLoader.cpp b/src/LSST/cRIO/TableLoader.cpp
diff --git a/src/Makefile b/src/Makefile
@@ -29,8 +29,8 @@ clean:
 # file targets
 %.cpp.o: %.cpp.d
 	@echo '[CPP] $(patsubst %.d,%,$<)'
-	${co}$(CPP) $(BOOST_CPPFLAGS) $(CPP_FLAGS) -c -fmessage-length=0 -o $@ $(patsubst %.d,%,$<)
+	${co}$(CPP) $(CPP_FLAGS) -c -fmessage-length=0 -o $@ $(patsubst %.d,%,$<)
 
 %.cpp.d: %.cpp
 	@echo '[DPP] $<'
-	${co}$(CPP) $(BOOST_CPPFLAGS) $(CPP_FLAGS) -M $< -MF $@ -MT '$(patsubst %.cpp,%.o,$<) $@'
+	${co}$(CPP)  $(CPP_FLAGS) -M $< -MF $@ -MT '$(patsubst %.cpp,%.o,$<) $@'
diff --git a/tests/Makefile b/tests/Makefile
@@ -18,9 +18,12 @@ endif
 
 TEST_CPPFLAGS := -I. \
 	-I"../include" \
-	$(shell pkg-config --cflags catch2-with-main)
+	$(shell pkg-config --cflags catch2-with-main $(silence)) \
+	$(shell pkg-config --cflags yaml-cpp $(silence))
 
-CPP_FLAGS += $(shell pkg-config --libs catch2-with-main)
+CPP_FLAGS += \
+	$(shell pkg-config --libs catch2-with-main $(silence)) \
+	$(shell pkg-config --libs yaml-cpp $(silence))
 
 compile: libcRIOtest.a $(BINARIES) $(TEST_REQ_READLINE)
 
@@ -38,17 +41,17 @@ clean:
 
 %.cpp.o: %.cpp.d
 	@echo '[CPP] $(patsubst %.d,%,$<)'
-	${co}$(CPP) $(BOOST_CPPFLAGS) $(CPP_FLAGS) $(TEST_CPPFLAGS) -c -fmessage-length=0 -o $@ -Wl,--gc-sections $(patsubst %.d,%,$<)
+	${co}$(CPP) $(CPP_FLAGS) $(TEST_CPPFLAGS) -c -fmessage-length=0 -o $@ -Wl,--gc-sections $(patsubst %.d,%,$<)
 
 %.cpp.d: %.cpp
 	@echo '[DPP] $<'
-	${co}$(CPP) $(BOOST_CPPFLAGS) $(CPP_FLAGS) $(TEST_CPPFLAGS) -M $< -MF $@ -MT '$(patsubst %.cpp,%.o,$<) $@'
+	${co}$(CPP) $(CPP_FLAGS) $(TEST_CPPFLAGS) -M $< -MF $@ -MT '$(patsubst %.cpp,%.o,$<) $@'
 
 $(TEST_REQ_READLINE): %: %.cpp.o ../lib/libcRIOcpp.a libcRIOtest.a
 	@echo '[TPR] $<'
 	${co}$(CPP) -o $@ $(LIBS_FLAGS) $(LIBS) $^ $(CPP_FLAGS) -lreadline # -lhistory
 
-${BINARIES}: %: %.cpp.o ../lib/libcRIOcpp.a libcRIOtest.a
+$(BINARIES): %: %.cpp.o ../lib/libcRIOcpp.a libcRIOtest.a
 	@echo '[TPP] $<'
 	${co}$(CPP) -o $@ -Wl,--gc-sections $(LIBS_FLAGS) $(LIBS) $^ $(CPP_FLAGS)
 

diff --git a/tests/test_ElectromechanicalPneumaticILC.cpp b/tests/test_ElectromechanicalPneumaticILC.cpp
@@ -140,7 +140,7 @@ TEST_CASE("Test SSA force set", "[ElectromechanicalPneumaticILC]") {
     REQUIRE_NOTHROW(ilc.processResponse(response.getBuffer(), response.getLength()));
 
     REQUIRE(ilc.primaryForce == Approx(31.45));
-    REQUIRE(isnan(ilc.secondaryForce));
+    REQUIRE(std::isnan(ilc.secondaryForce));
 }
 
 TEST_CASE("Test DAA force set", "[ElectromechanicalPneumaticILC]") {
@@ -197,7 +197,7 @@ TEST_CASE("Test SAA force actuator readout", "[ElectromechanicalPneumaticILC]")
     REQUIRE_NOTHROW(ilc.processResponse(response.getBuffer(), response.getLength()));
 
     REQUIRE(ilc.primaryForce == Approx(13.7));
-    REQUIRE(isnan(ilc.secondaryForce));
+    REQUIRE(std::isnan(ilc.secondaryForce));
 }
 
 TEST_CASE("Test DAA force actuator readout", "[ElectromechanicalPneumaticILC]") {