Z991239-5728 #comment 将日志库合入到DevAdapter目录中编译

CMakeLists.txt

@@ -65,6 +65,8 @@ set(DEVOPS_ON_CMAKE_UAT FALSE)
 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)
 if(MSVC)
 	set(TARGET_PLATFORM Windows)
 else()
@@ -173,6 +175,13 @@ if(DEVOPS_ON)
 		endif($ENV{WITH_DEVADAPTER})
 	endif(DEFINED ENV{WITH_DEVADAPTER})
 
+	if(DEFINED ENV{ONLY_DEVADAPTER})
+		if($ENV{ONLY_DEVADAPTER})
+			set(ONLY_BUILD_DEVADAPTER TRUE)
+			message(WARN "only build devadapter")
+		endif($ENV{ONLY_DEVADAPTER})
+	endif(DEFINED ENV{ONLY_DEVADAPTER})
+
 	if(DEVOPS_ON_CMAKE_PRD)
 		set(RVC_VERSION_SUFFIX "PRD")
 		if(PACK_AS_DEB_PKG)
@@ -212,6 +221,13 @@ else()
 endif(RVC_VERSION_SUFFIX)
 set(PACK_VERSION_NAME "${RVC_VERSION_FULL}")
 
+if(ONLY_BUILD_DEVADAPTER)
+	set(BUILD_COREFRAMEWORK OFF)
+	set(BUILD_MODULE OFF)
+	set(BUILD_TOOLS OFF)
+	set(BUILD_DEVADAPTER ON)
+endif(ONLY_BUILD_DEVADAPTER)
+
 if(NOT DEFINED BUILD_SHARED_LIBS)
 	set(BUILD_SHARED_LIBS ON)
 endif()
@@ -276,9 +292,9 @@ elseif(${CMAKE_GENERATOR} MATCHES "Unix*")
 	endif()
 endif()
 
-set(OLD_CONAN_EXPORTED ${CONAN_EXPORTED})
-
 #Would not happen ever. todo
+set(OLD_CONAN_EXPORTED ${CONAN_EXPORTED})
+message(STATUS "CONAN_EXPORTED type: ${CONAN_EXPORTED}")
 if(CONAN_EXPORTED)
 	message(STATUS "Set CONAN_EXPORTED FALSE")
 	set(CONAN_EXPORTED FALSE)
@@ -610,7 +626,10 @@ message(STATUS "RVC_PDB_BINARY_DIR: ${RVC_PDB_BINARY_DIR}")
 set(PRIVATE_KEYWORD PRIVATE)
 set(PUBLIC_KEYWORD PUBLIC)
 
-add_subdirectory(Framework)
+if(BUILD_COREFRAMEWORK)
+	add_subdirectory(Framework)
+endif(BUILD_COREFRAMEWORK)
+
 if(BUILD_MODULE)
 	add_subdirectory(Other)
 	add_subdirectory(Module)

DevAdapter/CMakeLists.txt

@@ -246,10 +246,11 @@ if(NOT RVC_INTEGRATE_BUILD)
 else()
     # 使用工程源码编译
     set(VENDOR_LOG_LIB_NAME log4vendor)
-    
+    add_subdirectory(liblog4vendor)
 endif(NOT RVC_INTEGRATE_BUILD)
 message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 
+
 # 通过conan的方式管理厂商库
 if(DEVADAPTER_USING_CONAN)
     if(MSVC) #Windows 厂商适配器
@@ -307,12 +308,12 @@ foreach(dir ${all_valid_subdirs})
         if(DEVOPS_ON)
             #硬件模拟器在生产流水线不参与编译
             if(DEVOPS_ON_CMAKE_PRD)
-                string(FIND "self|cmbsz|simulator" ${dir_trimmed} found)
+                string(FIND "liblog4vendor|self|cmbsz|simulator" ${dir_trimmed} found)
             else()
-                string(FIND "self|cmbsz" ${dir_trimmed} found)
+                string(FIND "liblog4vendor|self|cmbsz" ${dir_trimmed} found)
             endif(DEVOPS_ON_CMAKE_PRD)
         else()
-            string(FIND "self" ${dir_trimmed} found)
+            string(FIND "liblog4vendor|self" ${dir_trimmed} found)
         endif(DEVOPS_ON)
         message(STATUS "found: ${found}")
         if((NOT RVC_INTEGRATE_BUILD) OR (${found} EQUAL -1))

DevAdapter/cmbsz/pinpad.1.1/CMakeLists.txt

@@ -17,7 +17,7 @@ rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 # ${MODULE_FULL_NAME} 是 TAGET 名称，在 rvc_dev_config_library 中定义
 target_include_directories(${MODULE_FULL_NAME} 
     PRIVATE ${VENDOR_CURRENT_DEPS_DIR}/cmbsz.sample
-    PRIVATE ${OTHER_LIB_BASE_DIR}/liblog4vendor)
+    PRIVATE ${DEVADAPTER_BASE_DIR}/liblog4vendor)
 target_link_libraries(${MODULE_FULL_NAME} sample ${VENDOR_LOG_LIB_NAME})
 
 #  =-=-=-=-=-=-=-=-=-= {适配器工程}/CMakeLists.txt 文件最后必须声明如下内容=-=-=-=-=-=-=-=-=-=-=-=-=-==-=-=

DevAdapter/liblog4vendor/stdafx.h

@@ -0,0 +1,19 @@
+// stdafx.h : 标准系统包含文件的包含文件，
+// 或是经常使用但不常更改的
+// 特定于项目的包含文件
+//
+
+#pragma once
+
+#include "targetver.h"
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN             //  从 Windows 头文件中排除极少使用的信息
+#endif // !WIN32_LEAN_AND_MEAN
+
+// Windows 头文件:
+#include <windows.h>
+
+
+
+// TODO: 在此处引用程序需要的其他头文件

DevAdapter/liblog4vendor/targetver.h

@@ -0,0 +1,8 @@
+#pragma once
+
+// 包括 SDKDDKVer.h 将定义可用的最高版本的 Windows 平台。
+
+// 如果要为以前的 Windows 平台生成应用程序，请包括 WinSDKVer.h，并将
+// WIN32_WINNT 宏设置为要支持的平台，然后再包括 SDKDDKVer.h。
+
+#include <SDKDDKVer.h>

DevAdapter/simulator/FingerPrint.1.1/CMakeLists.txt

@@ -21,7 +21,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/FingerPrint.7.1/CMakeLists.txt

@@ -21,7 +21,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/cardissuer.1.1/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/cardissuerstand.1.1/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/cardissuerstore.1.1/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/contactlesscard.1.1/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/devctrl.1.1/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/gpio.1.1/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/gpio.1.2/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/hspscanner.1.1/CMakeLists.txt

@@ -16,7 +16,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/idcer.1.1/CMakeLists.txt

@@ -16,7 +16,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

DevAdapter/simulator/pinpad.1.1/CMakeLists.txt

@@ -21,7 +21,7 @@ target_include_directories(${MODULE_FULL_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
+	${DEVADAPTER_BASE_DIR}/liblog4vendor
 	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${RVC_TOOLKIT_INCLUDE_DIR}

Framework/libtoolkit/CMakeLists.txt

@@ -8,8 +8,6 @@ check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP)
 if(MSVC)
     if(HAVE_DBGHELP)
 	    message(STATUS "have dbghelp")
-    else()
-        message(WARNING "no dbghelp")
     endif(HAVE_DBGHELP)
 endif(MSVC)
 

Other/CMakeLists.txt

@@ -33,11 +33,6 @@ add_subdirectory(libscreencodec)
 add_subdirectory(libaudiomgr)
 
 add_subdirectory(liblog4rvcother)
-
-if(BUILD_DEVADAPTER)
-	add_subdirectory(liblog4vendor)
-endif(BUILD_DEVADAPTER)
-
 add_subdirectory(libfilecryption)
 add_subdirectory(libmediaplayer)
 add_subdirectory(libpictureplayer)

Other/liblog4vendor/stdafx.h

@@ -1,19 +0,0 @@
-// stdafx.h : 标准系统包含文件的包含文件，
-// 或是经常使用但不常更改的
-// 特定于项目的包含文件
-//
-
-#pragma once
-
-#include "targetver.h"
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN             //  从 Windows 头文件中排除极少使用的信息
-#endif // !WIN32_LEAN_AND_MEAN
-
-// Windows 头文件:
-#include <windows.h>
-
-
-
-// TODO: 在此处引用程序需要的其他头文件

Other/liblog4vendor/test/targetver.h

@@ -1,8 +0,0 @@
-#pragma once
-
-// 包括 SDKDDKVer.h 将定义可用的最高版本的 Windows 平台。
-
-// 如果要为以前的 Windows 平台生成应用程序，请包括 WinSDKVer.h，并将
-// WIN32_WINNT 宏设置为要支持的平台，然后再包括 SDKDDKVer.h。
-
-#include <SDKDDKVer.h>

addin/cmake/BuildMakeSettings.cmake

@@ -15,6 +15,7 @@ set(MODULE_BASE_DIR "${PROJECT_SOURCE_DIR}/Module")
 SET(ModuleCommonHeadPath "${MODULE_BASE_DIR}/include")
 SET(MODULE_MICRO_SERVICES_INCLUDE_DIR "${ModuleCommonHeadPath}/microservices")
 set(OTHER_LIB_BASE_DIR "${PROJECT_SOURCE_DIR}/Other")
+set(DEVADAPTER_BASE_DIR "${PROJECT_SOURCE_DIR}/DevAdapter")
 if(MSVC)
 	set(OTHER_LIB_PLATFORM_BASE_DIR "${OTHER_LIB_BASE_DIR}/win")
 else()

addin/cmake/ConfigOptions.cmake

@@ -25,6 +25,8 @@ option(BUILD_TESTING "Build the project test case." OFF)
 
 option(WITH_THIRD_PARTY "Build third-party components" ON)
 
+option(BUILD_COREFRAMEWORK "whether build framework or not" ON)
+
 option(BUILD_MODULE "whether build entity module or not" ON)
 
 option(BUILD_TOOLS "whether build tools or not" ON)