From 99b29195f253678df7049cff85b4966558c4f357 Mon Sep 17 00:00:00 2001
From: fancy <springzfx@gmail.com>
Date: Mon, 18 May 2020 01:41:14 +0800
Subject: [PATCH] spearete package pack

---
 CMakeLists.txt             | 33 +++------------------------------
 pack/CMakeLists.txt        | 24 ++++++++++++++++++++++++
 {control => pack}/postinst |  0
 {control => pack}/prerm    |  0
 4 files changed, 27 insertions(+), 30 deletions(-)
 create mode 100644 pack/CMakeLists.txt
 rename {control => pack}/postinst (100%)
 rename {control => pack}/prerm (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ccadfb..0fdc319 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,14 +3,15 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 project(cgproxy VERSION 4.0)
+set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wno-unused-result")
+
 set(build_tools OFF)
-# set(build_tools ON)
 set(build_test  OFF)
-# set(build_test  ON)
 
 set(basic_permission OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 add_subdirectory(src)
+add_subdirectory(pack)
 if (build_tools)
     add_subdirectory(tools)
 endif()
@@ -18,36 +19,8 @@ if (build_test)
     add_subdirectory(test)
 endif()
 
-
 install(FILES cgnoproxy DESTINATION /usr/bin PERMISSIONS ${basic_permission})
 install(FILES cgproxy.service DESTINATION /usr/lib/systemd/system/)
 install(FILES config.json DESTINATION /etc/cgproxy/)
 install(FILES cgroup-tproxy.sh DESTINATION /usr/share/cgproxy/scripts/)
 install(FILES readme.md DESTINATION /share/doc/cgproxy/)
-
-## package for deb and rpm
-set(CPACK_GENERATOR "DEB;RPM")
-set(CPACK_PACKAGE_NAME "cgproxy")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "cgproxy will transparent proxy anything running in specific cgroup.It aslo supports global transparent proxy and gateway proxy")
-
-## deb pack
-set(CPACK_DEBIAN_PACKAGE_NAME "cgproxy")
-set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "x86_64")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "systemd")
-set(CPACK_DEBIAN_PACKAGE_SECTION "network")
-set(CPACK_DEBIAN_PACKAGE_PRIORITY "Optional")
-set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/springzfx/cgproxy")
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "springzfx@gmail.com")
-set(CONTROL_DIR ${CMAKE_SOURCE_DIR}/control)
-set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CONTROL_DIR}/postinst;${CONTROL_DIR}/prerm")
-
-## rpm pack
-set(CPACK_RPM_PACKAGE_ARCHITECTURE, "x86_64")
-set(CPACK_RPM_PACKAGE_REQUIRES "systemd")
-set(CPACK_RPM_PACKAGE_GROUP "network")
-set(CPACK_RPM_PACKAGE_URL "https://github.com/springzfx/cgproxy")
-set(CONTROL_DIR ${CMAKE_SOURCE_DIR}/control)
-set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CONTROL_DIR}/postinst")
-set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${CONTROL_DIR}/prerm")
-
-include(CPack)
diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt
new file mode 100644
index 0000000..f74e721
--- /dev/null
+++ b/pack/CMakeLists.txt
@@ -0,0 +1,24 @@
+## package for deb and rpm
+set(CPACK_GENERATOR "DEB;RPM")
+set(CPACK_PACKAGE_NAME "cgproxy")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "cgproxy will transparent proxy anything running in specific cgroup.It aslo supports global transparent proxy and gateway proxy")
+
+## deb pack
+set(CPACK_DEBIAN_PACKAGE_NAME "cgproxy")
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "x86_64")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "systemd")
+set(CPACK_DEBIAN_PACKAGE_SECTION "network")
+set(CPACK_DEBIAN_PACKAGE_PRIORITY "Optional")
+set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/springzfx/cgproxy")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "springzfx@gmail.com")
+set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm")
+
+## rpm pack
+set(CPACK_RPM_PACKAGE_ARCHITECTURE, "x86_64")
+set(CPACK_RPM_PACKAGE_REQUIRES "systemd")
+set(CPACK_RPM_PACKAGE_GROUP "network")
+set(CPACK_RPM_PACKAGE_URL "https://github.com/springzfx/cgproxy")
+set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/postinst")
+set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/prerm")
+
+include(CPack)
diff --git a/control/postinst b/pack/postinst
similarity index 100%
rename from control/postinst
rename to pack/postinst
diff --git a/control/prerm b/pack/prerm
similarity index 100%
rename from control/prerm
rename to pack/prerm