merge from develop

8 files changed, 0 insertions, 117 deletions

diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
deleted file mode 100644
index d5563dc..0000000
--- a/service/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-if(CAPTURE_MODE MATCHES "MARSIO")
-    #configure_file(sapp_marsio.service.in sapp.service)
-    install(FILES ${PROJECT_SOURCE_DIR}/service/sapp-env-marsio.service.in DESTINATION /usr/lib/systemd/system/ RENAME sapp-env.service)
-    install(FILES ${PROJECT_SOURCE_DIR}/service/sapp_marsio.service.in DESTINATION /usr/lib/systemd/system/ RENAME sapp.service)
-else()
-    #configure_file(sapp_default.service.in sapp.service)
-    install(FILES ${PROJECT_SOURCE_DIR}/service/sapp-env-default.service.in DESTINATION /usr/lib/systemd/system/ RENAME sapp-env.service)
-    install(FILES ${PROJECT_SOURCE_DIR}/service/sapp_default.service.in DESTINATION /usr/lib/systemd/system/ RENAME sapp.service)
-endif()
-
-install(PROGRAMS ${PROJECT_SOURCE_DIR}/service/setup.sh DESTINATION /opt/sapp/env)
-install(PROGRAMS ${PROJECT_SOURCE_DIR}/service/fake_sapp DESTINATION /opt/sapp/bin)
-
diff --git a/service/fake_sapp b/service/fake_sapp
deleted file mode 100644
index 0871d41..0000000
--- a/service/fake_sapp
+++ /dev/null
diff --git a/service/sapp-env-default.service.in b/service/sapp-env-default.service.in
deleted file mode 100644
index 9c7d986..0000000
--- a/service/sapp-env-default.service.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=set sapp environment
-Requires=network.target
-After=network.target
-Before=sapp.service
-
-[Service]
-ExecStart=/opt/sapp/env/setup.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
-RequiredBy=sapp.service
diff --git a/service/sapp-env-marsio.service.in b/service/sapp-env-marsio.service.in
deleted file mode 100644
index d04cb67..0000000
--- a/service/sapp-env-marsio.service.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=set sapp environment
-Requires=mrzcpd.service
-After=mrzcpd.service
-Before=sapp.service
-
-[Service]
-ExecStart=/opt/sapp/env/setup.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
-RequiredBy=sapp.service
diff --git a/service/sapp_default.service.in b/service/sapp_default.service.in
deleted file mode 100644
index 47e0dfa..0000000
--- a/service/sapp_default.service.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=sapp service
-Requires=sapp-env.service
-After=sapp-env.service
-
-[Service]
-WorkingDirectory=/opt/sapp/bin/
-ExecStart=/opt/sapp/bin/fake_sapp
-Restart=always
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/service/sapp_marsio.service.in b/service/sapp_marsio.service.in
deleted file mode 100644
index 47e0dfa..0000000
--- a/service/sapp_marsio.service.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=sapp service
-Requires=sapp-env.service
-After=sapp-env.service
-
-[Service]
-WorkingDirectory=/opt/sapp/bin/
-ExecStart=/opt/sapp/bin/fake_sapp
-Restart=always
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/service/setup.sh b/service/setup.sh
deleted file mode 100644
index e840df1..0000000
--- a/service/setup.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-systemctl enable sapp-env
-
-systemctl daemon-reload
-
-#sapp_install_dir=`rpm -qa --queryformat '%{name}-%{version} %{instprefixes}\n' sapp`
-sapp_install_dir=`rpm -qa --queryformat '%{instprefixes}\n' sapp`
-
-echo "[Unit]" > /opt/sapp/env/sapp.service.tmp
-echo "Description=sapp service" >> /opt/sapp/env/sapp.service.tmp
-echo "Wants=network-online.target" >> /opt/sapp/env/sapp.service.tmp
-echo "Requires=sapp-env.service" >> /opt/sapp/env/sapp.service.tmp
-echo "After=sapp-env.service" >> /opt/sapp/env/sapp.service.tmp
-echo "[Service]" >> /opt/sapp/env/sapp.service.tmp
-echo "WorkingDirectory=$sapp_install_dir" >> /opt/sapp/env/sapp.service.tmp
-echo "ExecStart=$sapp_install_dir/sapp" >> /opt/sapp/env/sapp.service.tmp
-echo "Restart=always" >> /opt/sapp/env/sapp.service.tmp
-echo "RestartSec=5s" >> /opt/sapp/env/sapp.service.tmp
-echo "[Install]" >> /opt/sapp/env/sapp.service.tmp
-echo "WantedBy=multi-user.target" >> /opt/sapp/env/sapp.service.tmp
-
-cp -f /opt/sapp/env/sapp.service.tmp /usr/lib/systemd/system/sapp.service
-
-#systemctl enable sapp
-systemctl daemon-reload
-
-
-
-
diff --git a/version.txt b/version.txt
deleted file mode 100644
index 9b3fd6d..0000000
--- a/version.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by autorevision - do not hand-hack!
-
-VCS_TYPE="git"
-VCS_BASENAME="v4.0"
-VCS_UUID="efa070923d8398b49f41acda82b839d11eb75230"
-VCS_NUM="148"
-VCS_DATE="2020-01-03T20:49:13+0800"
-VCS_BRANCH="feature_inbound_outbound"
-VCS_TAG="v4.0.7"
-VCS_TICK="4"
-VCS_EXTRA=""
-
-VCS_ACTION_STAMP=""
-VCS_FULL_HASH="b1be93eab82732af57ab8c9bd7fea6554085985b"
-VCS_SHORT_HASH="b1be93e"
-
-VCS_WC_MODIFIED="1"
-
-# end