Ver Fonte

Z991239-5728 #comment 单独适配器编译改造

80374374 há 11 meses atrás
pai
commit
5b87fe4637

+ 165 - 155
CMakeLists.txt

@@ -66,7 +66,7 @@ set(DEVOPS_ON_CMAKE_DEV FALSE)
 set(DEVOPS_ON_CMAKE_PRD FALSE)
 set(COMPILED_ENV_TYPE 0)
 #only build devadapter flag
-set(ONLY_BUILD_DEVADAPTER FALSE)
+set(ONLY_BUILD_DEVADAPTER TRUE)
 if(MSVC)
 	set(TARGET_PLATFORM Windows)
 else()
@@ -689,24 +689,64 @@ else(MSVC)
 	endif(NOT DEVOPS_ON)
 
 	install(CODE "execute_process(COMMAND 'chmod 0777 ${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/*')")
-	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/spexplorerauto.desktop"
-		DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
+
 endif(MSVC)
 
-install(FILES "${CMAKE_SOURCE_DIR}/addin/assets/VTM.ico"
-	"${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1920.png"
-	DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
 
-install(FILES "${CMAKE_SOURCE_DIR}/addin/assets/VTM.ico"
-	"${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1920.png"
-	DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}/res/Media" COMPONENT resources)
+if(NOT ONLY_BUILD_DEVADAPTER)
 
-if(MSVC)
+	install(FILES "${CMAKE_SOURCE_DIR}/addin/assets/VTM.ico"
+		"${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1920.png"
+		DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
+
+	install(FILES "${CMAKE_SOURCE_DIR}/addin/assets/VTM.ico"
+		"${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1920.png"
+		DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}/res/Media" COMPONENT resources)
+
+	if(MSVC)
+		
+	else()
+		install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/spexplorerauto.desktop"
+			DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
+	endif(MSVC)
+
+	file(GLOB ENTITY_INTERFACE_XML_FILES "${MODULE_BASE_DIR}/mod_*/*.xml")
+	install(FILES ${ENTITY_INTERFACE_XML_FILES} DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}/res/StructConfig" COMPONENT resources)
+
+	file(GLOB RVC_RESOURCE_FILES LIST_DIRECTORIES FALSE "${CMAKE_SOURCE_DIR}/addin/assets/*")
+	install(FILES ${RVC_RESOURCE_FILES} DESTINATION ${RVC_RUNTIME_PATH} COMPONENT resources)
+
+	#if(CONAN_RES_DIRS_SOGOUIME)
+	#	message(STATUS "include sogou input installation.")
+	#	install(DIRECTORY "${CONAN_RES_DIRS_SOGOUIME}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
+	#endif(CONAN_RES_DIRS_SOGOUIME)
+
+	#if(CONAN_RES_DIRS_HYQIHEITTF)
+	#	message(STATUS "include font installation.")
+	#	install(DIRECTORY "${CONAN_RES_DIRS_HYQIHEITTF}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
+	#endif(CONAN_RES_DIRS_HYQIHEITTF)
+
+	#if(CONAN_RES_DIRS_UOSBROWSER)
+	#	message(STATUS "include uosbrowser installation.")
+	#	install(DIRECTORY "${CONAN_RES_DIRS_UOSBROWSER}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
+	#endif(CONAN_RES_DIRS_UOSBROWSER)
+
+	#if(CONAN_RES_DIRS_VENDORFILE)
+	#	message(STATUS "include vendor file installation.")
+	#	install(DIRECTORY "${CONAN_RES_DIRS_VENDORFILE}" DESTINATION "${PACK_INSTALL_MISCS_DIR}" COMPONENT resources)
+	#endif(CONAN_RES_DIRS_VENDORFILE)
+
+endif(NOT ONLY_BUILD_DEVADAPTER)
+
+
+
+if(MSVC AND NOT ONLY_BUILD_DEVADAPTER)
 	if(MSVC_RUNTIME STREQUAL "dynamic")
-	# the INSTALL command is not called. The user can use the variable 
-	# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS to use a custom install command and install them however they want.
+		# the INSTALL command is not called. The user can use the variable 
+		# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS to use a custom install command and install them however they want.
 		set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
 		include(InstallRequiredSystemLibraries)
+		message(STATUS "CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS: ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}")
 		install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
 			DESTINATION ${RVC_RUNTIME_PATH}
 			COMPONENT libraries)
@@ -715,19 +755,6 @@ if(MSVC)
 	endif()
 endif()
 
-if(MSVC)
-	file(GLOB BIN_FILES "${CMAKE_SOURCE_DIR}/addin/din/win/*")
-	install(PROGRAMS ${BIN_FILES} DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries)
-else()
-	file(GLOB BIN_FILES "${CMAKE_SOURCE_DIR}/addin/din/unix/*")
-endif(MSVC)
-
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/cfg" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" 
-	COMPONENT scripts FILES_MATCHING PATTERN "*.ini")
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/cfg" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" 
-	COMPONENT scripts FILES_MATCHING PATTERN "*.xml")
-install(FILES ${CMAKE_BINARY_DIR}/env.ini DESTINATION ${RVC_CONFIG_PATH} COMPONENT scripts)
-
 set(active_txt_file "${CMAKE_BINARY_DIR}/active.txt")
 message(STATUS "RVC_VERSION = ${RVC_VERSION}, RVC_VERSION_MAJOR=${RVC_VERSION_MAJOR}, RVC_VERSION_MINOR=${RVC_VERSION_MINOR}, RVC_VERSION_REVISION=${RVC_VERSION_REVISION}, RVC_VERSION_SUFFIX=${RVC_VERSION_SUFFIX}")
 file(WRITE ${active_txt_file} "${RVC_VERSION}")
@@ -742,134 +769,115 @@ if(DEVOPS_ON)
 	endif(DEVOPS_ON_CMAKE_PRD)
 endif(DEVOPS_ON)
 
-if(NOT DEVOPS_ON_CMAKE_PRD AND BUILD_DEVADAPTER)
-	install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/cfg/simulator/cmbsz.ini" DESTINATION ${RVC_VENDOR_PATH} COMPONENT scripts)
-endif(NOT DEVOPS_ON_CMAKE_PRD AND BUILD_DEVADAPTER)
+if(NOT ONLY_BUILD_DEVADAPTER)
+	if(MSVC)
+		configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/WIN/installbat.in" "${CMAKE_BINARY_DIR}/install.bat" @ONLY NEWLINE_STYLE CRLF)
+		install(PROGRAMS "${CMAKE_BINARY_DIR}/install.bat" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
+		install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
+		if(NOT DEVOPS_ON_CMAKE_PRD)
+			install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/kill.bat" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
+			install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/test.vbs" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
+		endif(NOT DEVOPS_ON_CMAKE_PRD)
+		file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/WIN/root*.ini")
+		install(FILES ${VENDOR_ROOT_CONFIG_FILES} DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" COMPONENT scripts)
+	else(MSVC)
+		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/spexplorer.sh" DESTINATION "${RVC_BASE_PATH}" COMPONENT scripts)
+		if(NOT DEVOPS_ON_CMAKE_PRD)
+			install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/kill.sh" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
+			install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/test.sh" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
+		endif(NOT DEVOPS_ON_CMAKE_PRD)
+		configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/UOS/installsub.in" "${CMAKE_BINARY_DIR}/installsub.sh" @ONLY NEWLINE_STYLE UNIX)
+		install(PROGRAMS "${CMAKE_BINARY_DIR}/installsub.sh" DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT scripts)
+
+		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/install.sh" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
+		install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
+		file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/UOS/root-*.ini")
+		install(FILES ${VENDOR_ROOT_CONFIG_FILES} DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" COMPONENT scripts)
+		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/spshellstart.sh" DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT scripts)
+	endif(MSVC)
 
-if(MSVC)
-	configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/WIN/installbat.in" "${CMAKE_BINARY_DIR}/install.bat" @ONLY NEWLINE_STYLE CRLF)
-	install(PROGRAMS "${CMAKE_BINARY_DIR}/install.bat" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
-	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
-	if(NOT DEVOPS_ON_CMAKE_PRD)
-		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/kill.bat" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
-		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/test.vbs" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
-	endif(NOT DEVOPS_ON_CMAKE_PRD)
-	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/WIN/root*.ini")
-	install(FILES ${VENDOR_ROOT_CONFIG_FILES} DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" COMPONENT scripts)
-else(MSVC)
-	install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/spexplorer.sh" DESTINATION "${RVC_BASE_PATH}" COMPONENT scripts)
-	if(NOT DEVOPS_ON_CMAKE_PRD)
-		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/kill.sh" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
-		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/test.sh" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
-	endif(NOT DEVOPS_ON_CMAKE_PRD)
-	configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/UOS/installsub.in" "${CMAKE_BINARY_DIR}/installsub.sh" @ONLY NEWLINE_STYLE UNIX)
-	install(PROGRAMS "${CMAKE_BINARY_DIR}/installsub.sh" DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT scripts)
-
-	install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/install.sh" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
-	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
-	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/UOS/root-*.ini")
-	install(FILES ${VENDOR_ROOT_CONFIG_FILES} DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" COMPONENT scripts)
-	install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/spshellstart.sh" DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT scripts)
-endif(MSVC)
+	if(DEVOPS_ON)
+		file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/root-*.ini")
+		install(FILES ${VENDOR_ROOT_CONFIG_FILES}
+			DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
+			COMPONENT scripts)
+	else()
+		install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" 
+			DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
+			RENAME "root.ini"
+			COMPONENT scripts)
+	endif(DEVOPS_ON)
 
-if(DEVOPS_ON)
-	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/root-*.ini")
-	install(FILES ${VENDOR_ROOT_CONFIG_FILES}
-		DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
-		COMPONENT scripts)
-else()
-	install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" 
-		DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
-		RENAME "root.ini"
-		COMPONENT scripts)
-endif(DEVOPS_ON)
+	install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/cfg" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" 
+		COMPONENT scripts FILES_MATCHING PATTERN "*.ini")
+	install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/cfg" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" 
+		COMPONENT scripts FILES_MATCHING PATTERN "*.xml")
+	install(FILES ${CMAKE_BINARY_DIR}/env.ini DESTINATION ${RVC_CONFIG_PATH} COMPONENT scripts)
+
+	install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/res" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" COMPONENT scripts)
+	file(GLOB RUN_SCRIPTS_FILES LIST_DIRECTORIES true "${CMAKE_SOURCE_DIR}/addin/res/RunScript/*")
+	foreach(item ${RUN_SCRIPTS_FILES})
+			install(FILES ${item} DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}/res/RunScript" 
+			PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+			COMPONENT scripts)
+	endforeach()
+endif(NOT ONLY_BUILD_DEVADAPTER)
 
 list(REMOVE_DUPLICATES RVC_CONAN_DEP_LIBS)
 
-if(MSVC)
-	if(CONAN_BIN_DIRS_CEFCLIENT_MUTABLE)
-		message(STATUS "remove cefclient dirs")
-		list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_CEFCLIENT_MUTABLE})
-		file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CONAN_BIN_DIRS_CEFCLIENT_MUTABLE}/Chromium/*")
-		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(CONAN_BIN_DIRS_CEFCLIENT_MUTABLE)
-	if(CONAN_BIN_DIRS_CEFCLIENT_CONST)
-		message(STATUS "remove cefclient dirs")
-		list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_CEFCLIENT_CONST})
-		file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CONAN_BIN_DIRS_CEFCLIENT_CONST}/Chromium/*")
-		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(CONAN_BIN_DIRS_CEFCLIENT_CONST)
-	if(CONAN_BIN_DIRS_RUNTIMEBASE)
-		message(STATUS "install runtime base files")
-		file(GLOB RVC_RUNTIME_FILES LIST_DIRECTORIES true "${CONAN_BIN_DIRS_RUNTIMEBASE}/*")
-		install(PROGRAMS ${RVC_RUNTIME_FILES} DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries)
-		#${PACK_INSTALL_RUNTIME_DIR}
-		#RVC_RUNTIME_PATH
-	endif(CONAN_BIN_DIRS_RUNTIMEBASE)
-endif(MSVC)
 
-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")
-	file(GLOB RVC_CONAN_BIN_FILES LIST_DIRECTORIES false "${bin_dir}/*")
-	foreach(filter_elem ${AARCH64_USELESS_LIBRARY_FILE_NAMES})
-		set(filter_args ".*\\${filter_elem}$")
-		list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ${filter_args})
+if(NOT ONLY_BUILD_DEVADAPTER)
+	if(MSVC)
+		if(CONAN_BIN_DIRS_CEFCLIENT_MUTABLE)
+			message(STATUS "remove cefclient dirs")
+			list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_CEFCLIENT_MUTABLE})
+			file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CONAN_BIN_DIRS_CEFCLIENT_MUTABLE}/Chromium/*")
+			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(CONAN_BIN_DIRS_CEFCLIENT_MUTABLE)
+		if(CONAN_BIN_DIRS_CEFCLIENT_CONST)
+			message(STATUS "remove cefclient dirs")
+			list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_CEFCLIENT_CONST})
+			file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CONAN_BIN_DIRS_CEFCLIENT_CONST}/Chromium/*")
+			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(CONAN_BIN_DIRS_CEFCLIENT_CONST)
+		if(CONAN_BIN_DIRS_RUNTIMEBASE)
+			message(STATUS "install runtime base files")
+			file(GLOB RVC_RUNTIME_FILES LIST_DIRECTORIES true "${CONAN_BIN_DIRS_RUNTIMEBASE}/*")
+			install(PROGRAMS ${RVC_RUNTIME_FILES} DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries)
+			#${PACK_INSTALL_RUNTIME_DIR}
+			#RVC_RUNTIME_PATH
+		endif(CONAN_BIN_DIRS_RUNTIMEBASE)
+	endif(MSVC)
+
+	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")
+		file(GLOB RVC_CONAN_BIN_FILES LIST_DIRECTORIES false "${bin_dir}/*")
+		foreach(filter_elem ${AARCH64_USELESS_LIBRARY_FILE_NAMES})
+			set(filter_args ".*\\${filter_elem}$")
+			list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ${filter_args})
+		endforeach()
+		list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\\.a$")
+		list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\\.lib$")
+		install(PROGRAMS ${RVC_CONAN_BIN_FILES} DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries)
 	endforeach()
-	list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\\.a$")
-	list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\\.lib$")
-	install(PROGRAMS ${RVC_CONAN_BIN_FILES} DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries)
-endforeach()
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/res" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" COMPONENT scripts )
-file(GLOB RUN_SCRIPTS_FILES LIST_DIRECTORIES true "${CMAKE_SOURCE_DIR}/addin/res/RunScript/*")
-foreach(item ${RUN_SCRIPTS_FILES})
-		install(FILES ${item} DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}/res/RunScript" 
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		COMPONENT libraries)
-endforeach()
-
-
-file(GLOB ENTITY_INTERFACE_XML_FILES "${MODULE_BASE_DIR}/mod_*/*.xml")
-install(FILES ${ENTITY_INTERFACE_XML_FILES} DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}/res/StructConfig" COMPONENT resources)
-
-file(GLOB RVC_RESOURCE_FILES LIST_DIRECTORIES FALSE "${CMAKE_SOURCE_DIR}/addin/assets/*")
-install(FILES ${RVC_RESOURCE_FILES} DESTINATION ${RVC_RUNTIME_PATH} COMPONENT resources)
-
-if(CONAN_RES_DIRS_SOGOUIME)
-	message(STATUS "include sogou input installation.")
-	install(DIRECTORY "${CONAN_RES_DIRS_SOGOUIME}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
-endif(CONAN_RES_DIRS_SOGOUIME)
-
-if(CONAN_RES_DIRS_HYQIHEITTF)
-	message(STATUS "include font installation.")
-	install(DIRECTORY "${CONAN_RES_DIRS_HYQIHEITTF}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
-endif(CONAN_RES_DIRS_HYQIHEITTF)
-
-if(CONAN_RES_DIRS_UOSBROWSER)
-	message(STATUS "include uosbrowser installation.")
-	install(DIRECTORY "${CONAN_RES_DIRS_UOSBROWSER}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
-endif(CONAN_RES_DIRS_UOSBROWSER)
-
-if(CONAN_RES_DIRS_VENDORFILE)
-	message(STATUS "include vendor file installation.")
-	install(DIRECTORY "${CONAN_RES_DIRS_VENDORFILE}" DESTINATION "${PACK_INSTALL_MISCS_DIR}" COMPONENT resources)
-endif(CONAN_RES_DIRS_VENDORFILE)
+endif(NOT ONLY_BUILD_DEVADAPTER)
 
 #pdb save
 if(WITH_PDB_SAVEV2)
@@ -904,16 +912,18 @@ endif(WITH_PDB_SAVEV2)
  #set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE TRUE)
 
-GET_CMAKE_PROPERTY(PACK_COMPONENTS_ALL  COMPONENTS)
-FOREACH(item ${PACK_COMPONENTS_ALL})
-message(STATUS "component: ${item}")
+GET_CMAKE_PROPERTY(CPACK_COMPONENTS_ALL COMPONENTS)
+FOREACH(item ${CPACK_COMPONENTS_ALL})
+	message(STATUS "component: ${item}")
 ENDFOREACH()
-list(REMOVE_ITEM PACK_COMPONENTS_ALL "headers" "tools" "symbols")
-set(CPACK_COMPONENTS_ALL ${PACK_COMPONENTS_ALL})
-
-set_property(GLOBAL PROPERTY COMPONENTS ${PACK_COMPONENTS_ALL})
-GET_CMAKE_PROPERTY(PACK_COMPONENTS_ALL  COMPONENTS)
-FOREACH(item ${PACK_COMPONENTS_ALL})
+if(ONLY_BUILD_DEVADAPTER)
+	#set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
+	list(REMOVE_ITEM CPACK_COMPONENTS_ALL "resources")
+endif(ONLY_BUILD_DEVADAPTER)
+list(REMOVE_ITEM CPACK_COMPONENTS_ALL "headers" "tools" "symbols")
+set_property(GLOBAL PROPERTY COMPONENTS ${CPACK_COMPONENTS_ALL})
+GET_CMAKE_PROPERTY(CPACK_COMPONENTS_ALL  COMPONENTS)
+FOREACH(item ${CPACK_COMPONENTS_ALL})
 	message(STATUS "after component: ${item}")
 ENDFOREACH()
 

+ 12 - 2
DevAdapter/CMakeLists.txt

@@ -307,13 +307,23 @@ foreach(dir ${all_valid_subdirs})
         # remove 'self' sub directory bcz it would be added seperately
         if(DEVOPS_ON)
             #硬件模拟器在生产流水线不参与编译
+            #liblog4vendor 单独上面提前编译
+            #simulator 编译纯适配器时无法编译,因为依赖框架RVCComm库
             if(DEVOPS_ON_CMAKE_PRD)
                 string(FIND "liblog4vendor|self|cmbsz|simulator" ${dir_trimmed} found)
             else()
-                string(FIND "liblog4vendor|self|cmbsz" ${dir_trimmed} found)
+                if(ONLY_BUILD_DEVADAPTER)
+                    string(FIND "liblog4vendor|self|cmbsz|simulator" ${dir_trimmed} found)
+                else()
+                    string(FIND "liblog4vendor|self|cmbsz" ${dir_trimmed} found)
+                endif(ONLY_BUILD_DEVADAPTER)
             endif(DEVOPS_ON_CMAKE_PRD)
         else()
-            string(FIND "liblog4vendor|self" ${dir_trimmed} found)
+            if(ONLY_BUILD_DEVADAPTER)
+                string(FIND "liblog4vendor|self|simulator" ${dir_trimmed} found)
+            else()
+                string(FIND "liblog4vendor|self" ${dir_trimmed} found)
+            endif(ONLY_BUILD_DEVADAPTER)
         endif(DEVOPS_ON)
         message(STATUS "found: ${found}")
         if((NOT RVC_INTEGRATE_BUILD) OR (${found} EQUAL -1))

+ 1 - 5
DevAdapter/cmbsz/CMakeLists.txt

@@ -15,8 +15,4 @@ rvc_define_dependen_dirs()
 rvc_traverse_sub_cmake_dirs()
 
 #  =-=-=-=-=-=-=-=-=-= {VendorName}/CMakeLists.txt 文件最后必须声明如下内容=-=-=-=-=-=-=-=-=-=-=-=-=-==-=-=
-rvc_aggereate_runtime_file()
-
-
-
-
+rvc_aggereate_runtime_file()

+ 0 - 0
addin/cfg/simulator/cmbsz.ini → DevAdapter/simulator/assets/cmbsz.ini