update project structure. Rename to feminos-daq

rest-for-physics · Aug 18, 2024 · 409f894 · 409f894
1 parent 7a1a65d
commit 409f894
Show file tree

Hide file tree

Showing 31 changed files with 53 additions and 28 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.17)
 
-project(mclient LANGUAGES CXX)
+project(feminos-daq LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -32,37 +32,49 @@ FetchContent_Declare(
     GIT_TAG v2.4.2)
 FetchContent_MakeAvailable(CLI11)
 
-add_executable(mclient src/minos/main.cpp)
+add_executable(${PROJECT_NAME} src/main.cpp)
 
 target_include_directories(
-    mclient
+    ${PROJECT_NAME}
     PRIVATE ${ROOT_INCLUDE_DIRS}
-            src/minos/bufmgr
-            src/minos/feminos
-            src/minos/mclient
-            src/minos/platforms
-            src/minos/platforms/linux
-            src/minos/util
-            src/minos/util/linux
-            src/minos/prometheus
-            src/minos/root)
+            src/bufmgr
+            src/feminos
+            src/mclient
+            src/platforms
+            src/platforms/linux
+            src/util
+            src/util/linux
+            src/prometheus
+            src/root)
 
 file(
     GLOB_RECURSE
     SOURCE_FILES
-    src/minos/mclient/femproxy.cpp
-    src/minos/mclient/evbuilder.cpp
-    src/minos/mclient/femarray.cpp
-    src/minos/mclient/cmdfetcher.cpp
-    src/minos/bufmgr/bufpool.cpp
-    src/minos/feminos/frame.cpp
-    src/minos/platforms/linux/os_al.cpp
-    src/minos/prometheus/prometheus.cpp
-    src/minos/root/storage.cpp
-    src/minos/root/graph.cpp)
+    src/mclient/femproxy.cpp
+    src/mclient/evbuilder.cpp
+    src/mclient/femarray.cpp
+    src/mclient/cmdfetcher.cpp
+    src/bufmgr/bufpool.cpp
+    src/feminos/frame.cpp
+    src/platforms/linux/os_al.cpp
+    src/prometheus/prometheus.cpp
+    src/root/storage.cpp
+    src/root/graph.cpp)
 
 target_link_libraries(
-    mclient PRIVATE CLI11::CLI11 prometheus-cpp::core prometheus-cpp::pull
-                    prometheus-cpp::push ${ROOT_LIBRARIES})
+    ${PROJECT_NAME}
+    PRIVATE CLI11::CLI11 prometheus-cpp::core prometheus-cpp::pull
+            prometheus-cpp::push ${ROOT_LIBRARIES})
 
-target_sources(mclient PRIVATE ${SOURCE_FILES})
+target_sources(${PROJECT_NAME} PRIVATE ${SOURCE_FILES})
+
+# Install the binary and the viewer script
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+install(
+    FILES viewer/feminos-viewer.py
+    DESTINATION bin
+    RENAME feminos-viewer)
+
+# Uninstall
+add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
+                                    ${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake)
diff --git a/cmake/uninstall.cmake b/cmake/uninstall.cmake
@@ -0,0 +1,13 @@
+if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt")
+    message(
+        FATAL_ERROR
+            "Cannot find install manifest: '${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt'"
+    )
+endif ()
+
+file(READ "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt" files)
+string(REPLACE "\n" ";" files "${files}")
+foreach (file ${files})
+    message(STATUS "Removing ${file}")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E remove "${file}")
+endforeach ()
diff --git a/src/minos/bufmgr/bufpool.cpp → src/bufmgr/bufpool.cpp b/src/minos/bufmgr/bufpool.cpp → src/bufmgr/bufpool.cpp
diff --git a/src/minos/bufmgr/bufpool.h → src/bufmgr/bufpool.h b/src/minos/bufmgr/bufpool.h → src/bufmgr/bufpool.h
diff --git a/src/minos/bufmgr/bufpool_err.h → src/bufmgr/bufpool_err.h b/src/minos/bufmgr/bufpool_err.h → src/bufmgr/bufpool_err.h
diff --git a/src/minos/feminos/frame.cpp → src/feminos/frame.cpp b/src/minos/feminos/frame.cpp → src/feminos/frame.cpp
diff --git a/src/minos/feminos/frame.h → src/feminos/frame.h b/src/minos/feminos/frame.h → src/feminos/frame.h
diff --git a/src/minos/main.cpp → src/main.cpp b/src/minos/main.cpp → src/main.cpp
diff --git a/src/minos/mclient/cmdfetcher.cpp → src/mclient/cmdfetcher.cpp b/src/minos/mclient/cmdfetcher.cpp → src/mclient/cmdfetcher.cpp
@@ -28,9 +28,9 @@ as 4th or 5th argument in any command
 #include "evbuilder.h"
 #include "femarray.h"
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
+#include <iostream>
 
 extern int verbose;
 

diff --git a/src/minos/mclient/cmdfetcher.h → src/mclient/cmdfetcher.h b/src/minos/mclient/cmdfetcher.h → src/mclient/cmdfetcher.h
diff --git a/src/minos/mclient/evbuilder.cpp → src/mclient/evbuilder.cpp b/src/minos/mclient/evbuilder.cpp → src/mclient/evbuilder.cpp
diff --git a/src/minos/mclient/evbuilder.h → src/mclient/evbuilder.h b/src/minos/mclient/evbuilder.h → src/mclient/evbuilder.h
diff --git a/src/minos/mclient/femarray.cpp → src/mclient/femarray.cpp b/src/minos/mclient/femarray.cpp → src/mclient/femarray.cpp
diff --git a/src/minos/mclient/femarray.h → src/mclient/femarray.h b/src/minos/mclient/femarray.h → src/mclient/femarray.h
diff --git a/src/minos/mclient/femproxy.cpp → src/mclient/femproxy.cpp b/src/minos/mclient/femproxy.cpp → src/mclient/femproxy.cpp
diff --git a/src/minos/mclient/femproxy.h → src/mclient/femproxy.h b/src/minos/mclient/femproxy.h → src/mclient/femproxy.h
diff --git a/src/minos/mclient/programflash.cpp → src/mclient/programflash.cpp b/src/minos/mclient/programflash.cpp → src/mclient/programflash.cpp
diff --git a/src/minos/mclient/programflash.h → src/mclient/programflash.h b/src/minos/mclient/programflash.h → src/mclient/programflash.h
diff --git a/src/minos/platforms/linux/os_al.cpp → src/platforms/linux/os_al.cpp b/src/minos/platforms/linux/os_al.cpp → src/platforms/linux/os_al.cpp
diff --git a/src/minos/platforms/linux/platform_spec.h → src/platforms/linux/platform_spec.h b/src/minos/platforms/linux/platform_spec.h → src/platforms/linux/platform_spec.h
diff --git a/src/minos/platforms/os_al.h → src/platforms/os_al.h b/src/minos/platforms/os_al.h → src/platforms/os_al.h
diff --git a/src/minos/prometheus/prometheus.cpp → src/prometheus/prometheus.cpp b/src/minos/prometheus/prometheus.cpp → src/prometheus/prometheus.cpp
diff --git a/src/minos/prometheus/prometheus.h → src/prometheus/prometheus.h b/src/minos/prometheus/prometheus.h → src/prometheus/prometheus.h
diff --git a/src/minos/root/graph.cpp → src/root/graph.cpp b/src/minos/root/graph.cpp → src/root/graph.cpp
diff --git a/src/minos/root/graph.h → src/root/graph.h b/src/minos/root/graph.h → src/root/graph.h
diff --git a/src/minos/root/storage.cpp → src/root/storage.cpp b/src/minos/root/storage.cpp → src/root/storage.cpp
diff --git a/src/minos/root/storage.h → src/root/storage.h b/src/minos/root/storage.h → src/root/storage.h
diff --git a/src/minos/util/linux/sock_util.h → src/util/linux/sock_util.h b/src/minos/util/linux/sock_util.h → src/util/linux/sock_util.h
diff --git a/src/minos/util/timerlib.h → src/util/timerlib.h b/src/minos/util/timerlib.h → src/util/timerlib.h
diff --git a/viewer/viewer.py → viewer/feminos-viewer.py b/viewer/viewer.py → viewer/feminos-viewer.py
diff --git a/viewer/requirements.txt b/viewer/requirements.txt
@@ -1,4 +1,4 @@
-uproot
 matplotlib
-tk
 requests
+tk
+uproot