Feature/shared config (#36)

* Increase version number to 1.2.2 * Add rt-common-shared submodule
5G-MAG · Nov 24, 2022 · 9ac66a0 · 9ac66a0
1 parent b6bdb76
commit 9ac66a0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,7 @@ docs
 
 # cmake build directory
 build
+cmake-build-debug
 
 # VIM files
 # Swap

diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,7 @@
 	path = lib/srsran
 	url = ../srsRAN
 	branch = fembms
+[submodule "supporting_files/rt-common-shared"]
+	path = supporting_files/rt-common-shared
+	url = https://github.com/5G-MAG/rt-common-shared
+	branch = feature/mbms
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project (modem VERSION 1.2.1)
+project (modem VERSION 1.2.2)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -68,8 +68,8 @@ target_link_libraries( modem
 
 install(TARGETS modem)
 install(FILES supporting_files/5gmag-rt-modem.service DESTINATION /usr/lib/systemd/system)
-install(FILES supporting_files/5gmag-rt.conf DESTINATION /etc)
-install(FILES supporting_files/5gmag-rt DESTINATION /etc/default)
+install(FILES supporting_files/rt-common-shared/mbms/common-config/5gmag-rt.conf DESTINATION /etc)
+install(FILES supporting_files/rt-common-shared/mbms/common-config/5gmag-rt DESTINATION /etc/default)
 install(FILES supporting_files/pre_modem.sh DESTINATION /usr/share/5gmag-rt
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
   )

diff --git a/supporting_files/5gmag-rt b/supporting_files/5gmag-rt
diff --git a/supporting_files/5gmag-rt.conf b/supporting_files/5gmag-rt.conf
diff --git a/supporting_files/rt-common-shared b/supporting_files/rt-common-shared
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ docs @@
     # cmake build directory
     build
+    cmake-build-debug
     # VIM files
     # Swap
@@ Expand Down @@