Z991239-5285 #comment 安装脚本优化

CMakeLists.txt

@@ -443,6 +443,7 @@ endif(NOT MSVC)
 #Config install information
 set(PACK_INSTALL_RUN_DIR "Run")
 set(PACK_INSTALL_RVC_DIR "rvc")
+set(PACK_INSTALL_RUNTIME_DIR "Runtime")
 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")
@@ -777,6 +778,8 @@ if(MSVC)
 		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)
 

addin/install.bat

@@ -44,6 +44,7 @@ tasklist /nh | find /i "spshell.exe"
 @set ROOT=%cd%
 @set rvc_src_path_rvc_dir=%ROOT%\rvc
 @set rvc_src_path_Run_dir=%ROOT%\Run
+@set rvc_src_path_runbase_dir=%ROOT%\Runtime
 @set rvc_install_path_root=C:
 @set rvc_runtime_dir=%SYSTEMROOT%\VTM
 
@@ -86,11 +87,20 @@ tasklist /nh | find /i "spshell.exe"
 @xcopy %rvc_src_path_Run_dir%\version\ %rvc_install_path_versions_dir%\  /E/Y/Q
 @echo 【2/2】拷贝终端版本OK！
 
+@if not exist "%rvc_src_path_runbase_dir%" (
+	@echo [WARN]: 识别到无Runtime文件夹，跳过基本库分离安装流程
+	@goto SkipInstallRuntime
+)
+
 @echo 运行时基础文件存放路径 %rvc_runtime_dir%
 @if exist %rvc_runtime_dir% rd /S /Q %rvc_runtime_dir%
 if not exist "%rvc_runtime_dir%" md "%rvc_runtime_dir%"
 
-@echo 【2/3】设置系统环境变量...
+@echo 【2/3】拷贝基础运行时依赖文件...
+@xcopy %rvc_src_path_runbase_dir% %rvc_runtime_dir%\  /E/Y/Q
+@echo 【3/3】拷贝基础运行时依赖文件OK！
+
+@echo 【3/4】设置系统环境变量...
 @set OldPath=%PATH%
 @echo current path: %OldPath%
 @set /a maxlen=1024
@@ -104,8 +114,6 @@ if not exist "%rvc_runtime_dir%" md "%rvc_runtime_dir%"
 	@set updateFlag=1
 	
 )
-@echo [DEBUG]: length: %num%
-@echo [DEBUG]: flag: %updateFlag%
 @if "%updateFlag%" == "1" (
 	@echo [DEBUG]: length: %num%
 	@if %num% GEQ 1024 (
@@ -113,12 +121,15 @@ if not exist "%rvc_runtime_dir%" md "%rvc_runtime_dir%"
 	@goto InstallError
 	) else (
 		@echo [INFO]: 设置PATH系统环境变量......
-		@rem setx path "%path%;%rvc_runtime_dir%" /m
+		@setx path "%path%;%rvc_runtime_dir%" /m
+		@echo [DEBUG]: new one:%path%
 	)
 )
-@echo 【3/3】设置系统环境变量成功
+@echo 【4/4】设置系统环境变量成功
+
+:SkipInstallRuntime
 
-@echo 【4/4】 打开版本所在文件夹
+@echo 【5/5】 打开版本所在文件夹
 @start %rvc_install_path_versions_dir%