Quellcode durchsuchen

#IQRV #comment PDB打包阶段2

80374374 vor 1 Jahr
Ursprung
Commit
15670b90be
1 geänderte Dateien mit 8 neuen und 3 gelöschten Zeilen
  1. 8 3
      CMakeLists.txt

+ 8 - 3
CMakeLists.txt

@@ -836,10 +836,15 @@ endif(CONAN_RES_DIRS_VENDORFILE)
 if(WITH_PDB_SAVEV2)
 	message(STATUS "config pdb save scripts.")
 	string(TIMESTAMP PDBSAVE_TIME %Y%m%d_%H%M%S)
-	set(PDB_ZIP_FILE_NAME "savepdbVS2019_${RVC_VERSION}_${PDBSAVE_TIME}.7z")
+	if(DEVOPS_ON)
+		set(PDB_ZIP_FILE_NAME "savepdbVS2019_${RVC_VERSION}_$ENV{PIPELINE_NAME}_${PDBSAVE_TIME}.7z")
+	else()
+		set(PDB_ZIP_FILE_NAME "savepdbVS2019_${RVC_VERSION}_${PDBSAVE_TIME}.7z")
+	endif(DEVOPS_ON)
 	install(CODE "MESSAGE(\"----Pack PDB file ${PDB_ZIP_FILE_NAME}----\")" COMPONENT symbols)
-	install(CODE "execute_process(COMMAND 7z a ${PDB_ZIP_FILE_NAME} ${RVC_PDB_BINARY_DIR}/* WORKING_DIRECTORY ${CMAKE_BINARY_DIR})" COMPONENT symbols)
+	install(CODE "execute_process(COMMAND 7z a ${PDB_ZIP_FILE_NAME} ${RVC_PDB_BINARY_DIR}/* ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/* -xr!*cmbsz* -xr!*simulator* -xr!*self* WORKING_DIRECTORY ${CMAKE_BINARY_DIR})" COMPONENT symbols)
 	install(CODE "execute_process(COMMAND curl -T ${PDB_ZIP_FILE_NAME} ftp://99.12.43.134:3721 -u savefile:12345678 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})" COMPONENT symbols)
+	install(CODE "file(REMOVE ${CMAKE_BINARY_DIR}/${PDB_ZIP_FILE_NAME})" COMPONENT symbols)
 	install(CODE "MESSAGE(\"----Pack PDB File Done----\")" COMPONENT symbols)
 endif(WITH_PDB_SAVEV2)
 
@@ -857,7 +862,7 @@ 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})
-message(STATUS "after component: ${item}")
+	message(STATUS "after component: ${item}")
 ENDFOREACH()
 
 set(CPACK_COMPONENT_headers_DISABLED TRUE)