Selaa lähdekoodia

#IQRV #comment 本地开发拷贝运行文件增强

80374374 2 kuukautta sitten
vanhempi
sitoutus
61f4394caf
2 muutettua tiedostoa jossa 18 lisäystä ja 3 poistoa
  1. 16 2
      CMakeLists.txt
  2. 2 1
      DevAdapter/zcopy/CMakeLists.txt

+ 16 - 2
CMakeLists.txt

@@ -100,6 +100,15 @@ endif($ENV{PIPELINE_BUILD_ID})
 
 #Set the project(terminal) version
 set(RAW_VERSION_STRING "7.5.1-rc1")
+
+
+if(NOT DEVOPS_ON)
+	if(WITH_GITFUR_LOCALCP)
+		set(RAW_VERSION_STRING "8.5.1-rc1")
+	endif(WITH_GITFUR_LOCALCP)
+endif(NOT DEVOPS_ON)
+
+
 string(STRIP ${RAW_VERSION_STRING} RAW_VERSION_STRING)
 
 set(VERSION_REGEX "^.?([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)")
@@ -390,6 +399,9 @@ if(MSVC)
 	add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/execution-charset:gbk>")
 	add_compile_options("$<$<C_COMPILER_ID:MSVC>:/execution-charset:gbk>")
 
+else()
+	add_compile_options("-Wno-unused-function")
+	#add_compile_options("-Werror=implicit-function-declaration")
 endif(MSVC)
 
 # Enable 64bit file support on linux and FreeBSD.
@@ -675,8 +687,10 @@ else(MSVC)
 	endif()
 
 	if(NOT DEVOPS_ON)
-		install(CODE "execute_process(COMMAND chmod 0777 ${CMAKE_SOURCE_DIR}/addin/packaging/UOS/kill.sh)")
-		install(CODE "execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/addin/packaging/UOS/kill.sh)")
+		if(NOT WITH_GITFUR_LOCALCP)
+			install(CODE "execute_process(COMMAND chmod 0777 ${CMAKE_SOURCE_DIR}/addin/packaging/UOS/kill.sh)")
+			install(CODE "execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/addin/packaging/UOS/kill.sh)")
+		endif(NOT WITH_GITFUR_LOCALCP)
 	endif(NOT DEVOPS_ON)
 
 	install(CODE "execute_process(COMMAND 'chmod 0777 ${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/*')")

+ 2 - 1
DevAdapter/zcopy/CMakeLists.txt

@@ -28,7 +28,8 @@ if(NOT DEVOPS_ON)
 	 COMPONENT devadapters)
 
 	if(WITH_GITFUR_LOCALCP)
-		install(CODE "execute_process(COMMAND sshpass -p 123456 scp -r /home/chanlp/Run/version/7.5.1.1 vtm@99.12.23.178:/opt/Run/version)")
+		install(CODE "execute_process(COMMAND sshpass -p 123456 ssh vtm@99.12.23.178 \"bash /opt/Run/version/kill.sh\")")
+		install(CODE "execute_process(COMMAND sshpass -p 123456 scp -r /home/chanlp/Run/version/8.5.1.1 vtm@99.12.23.178:/opt/Run/version)")
 	endif(WITH_GITFUR_LOCALCP)
 
 endif(NOT DEVOPS_ON)