#IQRV #comment [CMake] 添加更新包的生成标识 WITH_UPDATE_FORMAT

CMakeLists.txt

@@ -101,6 +101,17 @@ if(DEVOPS_ON)
 		message(STATUS "UAT devops environment, reset build number.")
 		unset(RVC_VERSION_SUFFIX)
 	endif(IS_DEVOPS_UAT)
+
+	if(DEFINED ENV{BUILD_UPDATE_FORMAT})
+		message(STATUS "$ENV{BUILD_UPDATE_FORMAT}")
+		if($ENV{BUILD_UPDATE_FORMAT})
+			message(STATUS "test: $ENV{BUILD_UPDATE_FORMAT}")
+		endif($ENV{BUILD_UPDATE_FORMAT})
+	else()
+		message(WARN "not set pipe number env virable.")
+		set(BUILD_NUMBER ${RVC_DEV_NUM})
+	endif()
+
 elseif(BUILD_NUMBER EQUAL 0)
 	set(BUILD_NUMBER ${RVC_DEV_NUM})
 endif(DEVOPS_ON)
@@ -332,6 +343,12 @@ set(PACK_INSTALL_RUN_DIR "Run")
 set(PACK_INSTALL_RVC_DIR "rvc")
 set(PACK_INSTALL_PREFIX_VERSION "${PACK_INSTALL_RUN_DIR}/version")
 set(PACK_INSTALL_PREFIX_CUR_VER "${PACK_INSTALL_PREFIX_VERSION}/${RVC_VERSION}")
+set(PACK_INSTALL_DATA_DIR "${PACK_INSTALL_RVC_DIR}/adData")
+
+if(WITH_UPDATE_FORMAT)
+	set(PACK_INSTALL_PREFIX_CUR_VER "${PACK_INSTALL_RUN_DIR}")
+	set(PACK_INSTALL_DATA_DIR "Data")
+endif(WITH_UPDATE_FORMAT)
 
 set(RVC_INCLUDE_PATH  "${PACK_INSTALL_PREFIX_CUR_VER}/include")
 set(RVC_LIBRARY_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/lib")
@@ -437,6 +454,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 # Configure files
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/addin/cfg/shell.ini.in" ${CMAKE_BINARY_DIR}/shell.ini @ONLY)
+if(NOT WITH_UPDATE_FORMAT)
+
+endif(NOT WITH_UPDATE_FORMAT)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/addin/Run.ini.in" "${CMAKE_BINARY_DIR}/Run.ini" @ONLY NEWLINE_STYLE CRLF)
 
 if(SIMULATE_ON)
@@ -557,32 +577,42 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/cfg" DESTINATION "${PACK_INSTALL_PR
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/cfg" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" 
 	COMPONENT scripts FILES_MATCHING PATTERN "*.xml")
 install(FILES ${CMAKE_BINARY_DIR}/shell.ini DESTINATION ${RVC_CONFIG_PATH} COMPONENT scripts)
-set(active_txt_file "${CMAKE_BINARY_DIR}/active.txt")
-file(WRITE ${active_txt_file} "${RVC_VERSION}")
-install(FILES ${active_txt_file} DESTINATION ${PACK_INSTALL_PREFIX_VERSION} COMPONENT scripts)
+
+if(NOT WITH_UPDATE_FORMAT)
+	set(active_txt_file "${CMAKE_BINARY_DIR}/active.txt")
+	file(WRITE ${active_txt_file} "${RVC_VERSION}")
+	install(FILES ${active_txt_file} DESTINATION ${PACK_INSTALL_PREFIX_VERSION} COMPONENT scripts)
+endif(NOT WITH_UPDATE_FORMAT)
 # Install RunInfo Directory
 # install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/runinfo" DESTINATION "${PACK_INSTALL_RUN_DIR}" 
 #	COMPONENT scripts FILES_MATCHING PATTERN "*.ini")
 
-if(MSVC)
-	file(GLOB BAT_SCRIPTS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/*.vbs")
-	install(FILES "${CMAKE_SOURCE_DIR}/rvc_test.bat" DESTINATION ${OUTPUT_CUR_DISK_PATH}  COMPONENT scripts)
-	install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" 
-	DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
-	RENAME "root.ini"
-	COMPONENT scripts)
-else(MSVC)
-	file(GLOB BAT_SCRIPTS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/*.sh")
-	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)
-endif(MSVC)
-
-install(PROGRAMS ${BAT_SCRIPTS} DESTINATION "${PACK_INSTALL_PREFIX_VERSION}" COMPONENT scripts)
-
-install(FILES "${CMAKE_BINARY_DIR}/Run.ini" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
+if(NOT WITH_UPDATE_FORMAT)
+	if(MSVC)
+		file(GLOB BAT_SCRIPTS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/*.vbs")
+		install(FILES "${CMAKE_SOURCE_DIR}/rvc_test.bat" DESTINATION ${OUTPUT_CUR_DISK_PATH}  COMPONENT scripts)
+		install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" 
+		DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
+		RENAME "root.ini"
+		COMPONENT scripts)
+	else(MSVC)
+		file(GLOB BAT_SCRIPTS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/*.sh")
+		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)
+	endif(MSVC)
+	install(PROGRAMS ${BAT_SCRIPTS} DESTINATION "${PACK_INSTALL_PREFIX_VERSION}" COMPONENT scripts)
+endif(NOT WITH_UPDATE_FORMAT)
+
+if(WITH_UPDATE_FORMAT)
+	install(FILES "${CMAKE_BINARY_DIR}/Run.ini" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
+else()
+# TODO: rewrite install.sh to match update pacakge.
 if(NOT MSVC AND NOT PACK_AS_DEB_PKG)
 	install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/install.sh" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
 endif(NOT MSVC AND NOT PACK_AS_DEB_PKG)
+endif(WITH_UPDATE_FORMAT)
+
+
 
 list(REMOVE_DUPLICATES RVC_CONAN_DEP_LIBS)
 if(CONAN_LIB_DIRS_QT)
@@ -628,17 +658,17 @@ install(FILES ${ENTITY_INTERFACE_XML_FILES} DESTINATION "${PACK_INSTALL_PREFIX_C
 file(GLOB RVC_RESOURCE_FILES LIST_DIRECTORIES FALSE "${CMAKE_SOURCE_DIR}/addin/assets/*")
 install(FILES ${RVC_RESOURCE_FILES} DESTINATION ${RVC_RUNTIME_PATH} COMPONENT resources)
 
-install(DIRECTORY "${CONAN_RES_DIRS_AUDIO}" DESTINATION "${PACK_INSTALL_RVC_DIR}/adData" COMPONENT resources)
-install(DIRECTORY "${CONAN_RES_DIRS_VIDEO}" DESTINATION "${PACK_INSTALL_RVC_DIR}/adData" COMPONENT resources)
+install(DIRECTORY "${CONAN_RES_DIRS_AUDIO}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
+install(DIRECTORY "${CONAN_RES_DIRS_VIDEO}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
 
 if(CONAN_RES_DIRS_SOGOUIME)
 	message(STATUS "include sogou input installation.")
-	install(DIRECTORY "${CONAN_RES_DIRS_SOGOUIME}" DESTINATION "${PACK_INSTALL_RVC_DIR}/adData" COMPONENT resources)
+	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_RVC_DIR}/adData" COMPONENT resources)
+	install(DIRECTORY "${CONAN_RES_DIRS_HYQIHEITTF}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
 endif(CONAN_RES_DIRS_HYQIHEITTF)
 
 if(CEF_BIN_DIR)

addin/cmake/ConfigOptions.cmake

@@ -43,4 +43,6 @@ option(PACK_AS_DEB_PKG "build the project and package as debian type " OFF)
 
 option(CONAN_CACHE_CLEAR "remove local conan dependencies" OFF)
 
-option(WITH_ADDITIONAL_RES "download other resource file or for skipping big file mechanism like sogouime" OFF)
+option(WITH_ADDITIONAL_RES "download other resource file or for skipping big file mechanism like sogouime" OFF)
+
+option(WITH_UPDATE_FORMAT "build the artifictory as update pacakge format" OFF)