From 06f87636b9e3e54df9a22f55d34ebc9cfdbef7e7 Mon Sep 17 00:00:00 2001
From: Ezra Taimuty-Loomis <etaimutyloomis@gmail.com>
Date: Wed, 19 Aug 2020 14:10:39 -0400
Subject: [PATCH] Added install target

---
 .gitignore                 |  6 ++++--
 CMakeLists.txt             |  7 +------
 configure                  |  4 +++-
 data/defaults/config.json  | 23 +++++++++++++++++++++++
 data/defaults/state.json   | 15 +++++++++++++++
 data/defaults/systems.json | 34 ++++++++++++++++++++++++++++++++++
 proto_gen.sh               |  2 +-
 src/CMakeLists.txt         | 11 +++++++++++
 8 files changed, 92 insertions(+), 10 deletions(-)
 create mode 100644 data/defaults/config.json
 create mode 100644 data/defaults/state.json
 create mode 100644 data/defaults/systems.json

diff --git a/.gitignore b/.gitignore
index 7cbd8b6..45df042 100644
--- a/.gitignore
+++ b/.gitignore
@@ -245,6 +245,8 @@ ModelManifest.xml
 
 *.vscode
 
-[Dd]ata/
 src/external/live
-*.md5
\ No newline at end of file
+*.md5
+
+data/*.json
+data/logs
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a2d95c..ebe3d7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_BUILD_TYPE Debug)
 
 project(PiScan)
 
-set(PISCAN_BIN_DIR ${PROJECT_SOURCE_DIR}/bin)
+set(PISCAN_BIN_DIR ${PROJECT_SOURCE_DIR}/build)
 file(MAKE_DIRECTORY ${PISCAN_BIN_DIR})
 
 add_subdirectory(src)
@@ -96,8 +96,3 @@ set(LIVE_LIBS livemedia liveBUE liveUE liveGS)
 
 
 target_include_directories(server PUBLIC ${PROJECT_SOURCE_DIR}/proto)
-
-install(
-	TARGETS piscan_server
-	DESTINATION /usr/local/bin
-)
diff --git a/configure b/configure
index 512cb29..57a15ce 100644
--- a/configure
+++ b/configure
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-mkdir bin data
+sh proto_gen.sh
+
+mkdir build data
 cd bin && cmake ..
diff --git a/data/defaults/config.json b/data/defaults/config.json
new file mode 100644
index 0000000..0cbdf03
--- /dev/null
+++ b/data/defaults/config.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "general": {
+            "log_verbosity": "0"
+        },
+        "socket": {
+            "port": "1234",
+            "max_connections": "5",
+            "use_gui": "false",
+            "client_path": ".\/",
+            "python_path": "python"
+        },
+        "demod": {
+            "retune_delay": "225000",
+            "demod_delay": "10000",
+            "squelch_mode": "0"
+        },
+        "audio_stream": {
+            "rtsp_port": "8554",
+            "http_tunneling": "false"
+        }
+    }
+}
diff --git a/data/defaults/state.json b/data/defaults/state.json
new file mode 100644
index 0000000..c8af79d
--- /dev/null
+++ b/data/defaults/state.json
@@ -0,0 +1,15 @@
+{
+    "state": {
+        "demod": {
+            "gain": "-10",
+            "squelch": "0"
+        },
+        "scanner": {
+            "state": "2",
+            "manual_freq": "100000000",
+            "manual_mode": "NFM",
+            "hold_key": "",
+            "hold_index": ""
+        }
+    }
+}
diff --git a/data/defaults/systems.json b/data/defaults/systems.json
new file mode 100644
index 0000000..35b25c5
--- /dev/null
+++ b/data/defaults/systems.json
@@ -0,0 +1,34 @@
+{
+    "systems": [
+        {
+            "systype": "analog",
+            "tag": "Sample System",
+            "lockout": "false",
+            "channels": [
+                {
+                    "tag": "FM entry - CSQ",
+                    "lockout": "false",
+                    "delay": "2000",
+                    "freq": "453150000",
+                    "chantype": "fmc"
+                },
+                {
+                    "tag": "FM entry - PL",
+                    "lockout": "false",
+                    "delay": "2000",
+                    "freq": "471837500",
+                    "chantype": "plc",
+                    "tone": "103.5"
+                },
+                {
+                    "tag": "FM entry - DCS",
+                    "lockout": "false",
+                    "delay": "2000",
+                    "freq": "460287500",
+                    "chantype": "dcc",
+                    "code": "023"
+                }
+            ]
+        }
+    ]
+}
diff --git a/proto_gen.sh b/proto_gen.sh
index f319c99..ea305a0 100644
--- a/proto_gen.sh
+++ b/proto_gen.sh
@@ -2,4 +2,4 @@
 
 cd ./proto
 
-protoc -cpp_out=. *.proto
+protoc --cpp_out=. *.proto
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8e43dad..55a9503 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -149,3 +149,14 @@ set(APPLICATION_LIBS common external loguru proto scan server sigproc util ${APP
 
 target_link_libraries(piscan_server ${APPLICATION_LIBS})
 
+set(CPACK_GENERATOR "DEB")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "etaimutyloomis@gmail.com")
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+include(CPack)
+
+install(
+	TARGETS piscan_server
+	DESTINATION /usr/local/bin
+    LIBRARY DESTINATION /usr/local/bin
+)
+