#IQRV #comment [Stand1S] 去除Chromium的内容打包

CMakeLists.txt

@@ -423,8 +423,6 @@ set(RVC_CONFIG_PATH    "${PACK_INSTALL_PREFIX_CUR_VER}/cfg")
 set(RVC_VENDOR_PATH  "${PACK_INSTALL_PREFIX_CUR_VER}/dep")
 set(RVC_SHARED_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/share")
 set(RVC_RESOURCE_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/res")
-set(RVC_CHROMIUM_PATH "${RVC_RUNTIME_PATH}/Chromium")
-
 
 set(CMAKE_INSTALL_INCLUDEDIR ${RVC_INCLUDE_PATH})
 set(CMAKE_INSTALL_BINDIR ${RVC_RUNTIME_PATH})
@@ -676,16 +674,6 @@ if(CONAN_LIB_DIRS_QT)
 	list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_QT})# 1.0.5-dev5
 endif(CONAN_LIB_DIRS_QT)
 
-if(CONAN_BIN_DIRS_CEFCLIENT_MUTABLE)
-	message(STATUS "remove cefclient dirs")
-	list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_CEFCLIENT_MUTABLE})# cly
-endif(CONAN_BIN_DIRS_CEFCLIENT_MUTABLE)
-
-if(CONAN_BIN_DIRS_CEFCLIENT_CONST)
-	message(STATUS "remove cefclient const dirs")
-	list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_CEFCLIENT_CONST})
-endif(CONAN_BIN_DIRS_CEFCLIENT_CONST)
-
 foreach(bin_dir ${RVC_CONAN_DEP_LIBS})
 	message(STATUS "bin dir: ${bin_dir}")
 	# file(GLOB RVC_CONAN_BIN_FILES  LIST_DIRECTORIES false "${bin_dir}/*.so" "${bin_dir}/*.dll")
@@ -739,19 +727,6 @@ if(CONAN_RES_DIRS_VENDORFILE)
 	install(DIRECTORY "${CONAN_RES_DIRS_VENDORFILE}" DESTINATION "${PACK_INSTALL_MISCS_DIR}" COMPONENT resources)
 endif(CONAN_RES_DIRS_VENDORFILE)
 
-if(CEF_BIN_DIR)
-	file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CEF_BIN_DIR}/*")
-	foreach(item ${RVC_CHROMIUM_BIN_FILES})
-		if(IS_DIRECTORY ${item})
-			install(DIRECTORY "${item}" DESTINATION "${RVC_CHROMIUM_PATH}" COMPONENT libraries )
-		else()
-			install(FILES ${item} DESTINATION "${RVC_CHROMIUM_PATH}" 
-			PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-			COMPONENT libraries)
-		endif()
-	endforeach()
-endif(CEF_BIN_DIR)
-
 if(NOT MSVC)
 	if(DEVOPS_ON)
 		set(CHANGELOG_HTML_PATH ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html)

Module/CMakeLists.txt

@@ -227,10 +227,6 @@ add_subdirectory(mod_CameraConfigManage)
 # 汇总要依赖拷贝的第三方库
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)
 
-if(TEST_CHROMIMU_DIR)
-    MESSAGE( STATUS "TEST_CHROMIMU_DIR = ${TEST_CHROMIMU_DIR}")
-    set (CEF_BIN_DIR ${TEST_CHROMIMU_DIR} PARENT_SCOPE)
-endif()
 
 
 

addin/cmake/DependencyConanFiles.cmake

@@ -22,8 +22,7 @@ set(CONAN_ALLPLATFORM_LIB_NAMES
 	#mod_CustMngrAuth mod_uplog
 	jsoncpp/1.9.0@LR04.02_ThirdParty/stable # !!!!support build missing!!!!
 	#mod_chromium
-	#cefclient_mutable/2.0@LR04.02_ThirdParty/testing   
-	cefclient_mutable/3.0@LR04.02_ThirdParty/testing
+	#cefclient_mutable/3.0@LR04.02_ThirdParty/testing
 	#mod_chromium mod_RomoteController mod_rpc
 	boost/1.69.0@LR04.02_ThirdParty/testing
 	#liblog4vendor
@@ -74,10 +73,6 @@ else()
 
 			cpprestsdk/2.10.15@LR04.02_ThirdParty/testing
 			)
-
-	if(PACK_AS_DEB_PKG)
-		list(APPEND CONAN_CURPLATFORM_LIB_NAMES cefclient_const/1.0@LR04.02_ThirdParty/testing)
-	endif(PACK_AS_DEB_PKG)
 		
 	if(WITH_ADDITIONAL_RES)
 		list(APPEND CONAN_CURPLATFORM_LIB_NAMES  sogouime/2.6.1.1539@LR04.02_MediaRes/testing)

addin/cmake/debian.cmake

@@ -37,9 +37,3 @@ install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/logo.png"
 install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1280.png"
 		"${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1920.png"
 	DESTINATION "/usr/share/wallpapers/deepin/" COMPONENT resources)
-
-if(CONAN_BIN_DIRS_CEFCLIENT_CONST)
-	message(STATUS "add cefclient depends to install action...")
-	file(GLOB CEFCLIENT_CONST_FILES LIST_DIRECTORIES false "${CONAN_BIN_DIRS_CEFCLIENT_CONST}/*")
-	install(PROGRAMS ${CEFCLIENT_CONST_FILES} DESTINATION /usr/lib COMPONENT libraries)
-endif(CONAN_BIN_DIRS_CEFCLIENT_CONST)

addin/packaging/DEBIAN/prerm

@@ -5,7 +5,6 @@ if [ "$1" = "remove" ]; then
     killall -9 spshell > /dev/null 2>&1
     killall -9 sphost > /dev/null 2>&1
     killall -9 guardian > /dev/null 2>&1
-    killall -9 cefclient > /dev/null 2>&1
     killall -9 uosbrowser > /dev/null 2>&1
     killall -s 9 `ps -aux | grep browser | awk '{print $2}'` > /dev/null 2>&1
 fi

addin/res/ManagerDesktop/js/webSocketBase.js

@@ -2,7 +2,7 @@
  * websocket核心模块，实现实体接口调用，消息广播，transid管理
  */ 
 var WebSocketBase = {};
-WebSocketBase.socket = new ws('ws://127.0.0.1:9002');
+WebSocketBase.socket = new ws('ws://192.168.31.143:9002');
 WebSocketBase.retryTimes = 0;
 WebSocketBase.interval = 0;
 WebSocketBase.isreconnecting = false;

addin/res/RunScript/startCEFClient.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-# test with sudo runuser -u root bash {script_path}
-set -x
-name=$(whoami)
-echo "start $0 with $name"
-
-bindir="${PWD}/bin" 
-echo "1"$bindir
-versiondir=${PWD} 
-echo "2"$versiondir
-cefpath="${bindir}/Chromium/cefclient"
-echo "3"$cefpath
-
-exec="${cefpath}"  # 使用传入的参数值作为要执行的命令
-echo "run $exec"
-# get env
-pid=$(pgrep startdde)
-# source env from $pid
-# shellcheck disable=SC1090
-. <(xargs -0 bash -c 'printf "export %q\n" "$@"' -- </proc/$pid/environ)
-name=$(ps -o uname= -p "${pid}")
-echo "run in $name"
-if [ $# -eq 0 ]
-then
-	runuser -u "$name" -- bash -c "$exec &" &  #无参数执行
-else
-	runuser -u "$name" -- bash -c "$exec $* &" &  # 将参数传递给命令
-fi
-exit $?

addin/res/RunScript/startSettingsCustom.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-bindir="${PWD}/bin" 
-echo "1"$bindir
-versiondir=${PWD} 
-echo "2"$versiondir
-cefpath="${bindir}/Chromium/cefclient"
-echo "3"$cefpath
-urlpath="${versiondir}/res/ManagerDesktop/page.html?entry=expire#basicinfo"
-echo "4"$urlpath
-cmdpath="${cefpath} --url=file:///${urlpath}  --no-sandbox --hide-tabs --hide-controls --always-on-top --disable-web-security --logextend=errPage"
-echo "5"$cmdpath
-exec ${cmdpath}