summaryrefslogtreecommitdiff
path: root/tools/monit_stream
diff options
context:
space:
mode:
authorsongyanchao <[email protected]>2023-06-15 11:48:31 +0000
committersongyanchao <[email protected]>2023-06-16 06:25:31 +0000
commitec05f44cea7763e72654b7b9b3161db8322912b7 (patch)
tree8aa746c6fc8be54096ae96e4677bf5ecf1605976 /tools/monit_stream
parenta6fb6bb69f99d7dac3037882568c1e05044ff013 (diff)
🐎 ci(DPISDN-9): 修改py脚本编译流程,以解决build-id相同导致无法在同一台设备上安装多个rpm的问题
修改py脚本编译流程,以解决build-id相同导致无法在同一台设备上安装多个rpm的问题
Diffstat (limited to 'tools/monit_stream')
-rw-r--r--tools/monit_stream/CMakeLists.txt16
-rwxr-xr-x[-rw-r--r--]tools/monit_stream/monit_stream.py2
2 files changed, 3 insertions, 15 deletions
diff --git a/tools/monit_stream/CMakeLists.txt b/tools/monit_stream/CMakeLists.txt
index bcf004c..c68acc1 100644
--- a/tools/monit_stream/CMakeLists.txt
+++ b/tools/monit_stream/CMakeLists.txt
@@ -1,14 +1,2 @@
-
-set(PI_DIST_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_dist)
-set(PI_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_build)
-set(PI_SPEC_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_spec)
-
-add_custom_command(OUTPUT ${PI_DIST_PATH}/monit_stream
- COMMAND pyinstaller -F -y --distpath ${PI_DIST_PATH}
- --workpath ${PI_BUILD_PATH}
- --specpath ${PI_SPEC_PATH}
- --noconsole ${CMAKE_CURRENT_SOURCE_DIR}/monit_stream.py
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/monit_stream.py)
-
-add_custom_target(monit_stream ALL DEPENDS ${PI_DIST_PATH}/monit_stream)
-install(PROGRAMS ${PI_DIST_PATH}/monit_stream DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program)
+configure_file(monit_stream.py monit_stream)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/monit_stream DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program)
diff --git a/tools/monit_stream/monit_stream.py b/tools/monit_stream/monit_stream.py
index 1d2fe2c..f98e35c 100644..100755
--- a/tools/monit_stream/monit_stream.py
+++ b/tools/monit_stream/monit_stream.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python2
import argparse
import json