Z991239-678 #comment feature: 处理 实体版本 release 模式的编译

CMakeLists.txt

@@ -141,7 +141,7 @@ endif(CONAN_EXPORTED)
 
 
 include(conan)
-conan_cmake_run(REQUIRES RvcFramework/1.0.2-dev1@LR04.02_FrameworkLib/ms_x86_debug
+conan_cmake_run(REQUIRES RvcFramework/1.0.2-dev1@LR04.02_FrameworkLib/testing
 BASIC_SETUP # CMAKE_TARGETS
 BUILD missing)
 
@@ -210,11 +210,14 @@ endif()
 
 message(STATUS "CMAKE_GENERATOR_PLATFORM:  ${CMAKE_GENERATOR_PLATFORM}")
 
+set(RVC_DEBUG_MODE TRUE)
+
 string(TOLOWER ${BUILD_TYPE_NAME} _type)
 if (_type STREQUAL debug)
 	add_compile_definitions(_DEBUG)
 elseif(_type STREQUAL release)
 	add_compile_definitions(NDEBUG)
+	set(RVC_DEBUG_MODE FALSE)
 endif()
 
 # Configure MSVC Runtime

Module/mod_CenterSetting/CMakeLists.txt

@@ -18,11 +18,11 @@ target_include_directories(${MODULE_NAME} PRIVATE
 # 添加实体需要依赖的其他共享库（包括系统库）
 set(EXTEND_LIBS)
 if(MSVC)
-	list(APPEND EXTEND_LIBS crypt32)
+	list(APPEND EXTEND_LIBS ${CONAN_LIBS_OPENSSL})
 else()
 	#list(APPEND EXTEND_LIBS ssl)
 endif(MSVC)
-set(${MODULE_PREFIX}_LIBS ${EXTEND_LIBS} ${MODULE_BASE_LIBS} RVCCommD)
+set(${MODULE_PREFIX}_LIBS ${EXTEND_LIBS} ${MODULE_BASE_LIBS} ${RVCCOMM_LIB})
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

Module/mod_cardswiper/CMakeLists.txt

@@ -19,7 +19,7 @@ set(${MODULE_PREFIX}_SRCS
 
 list(APPEND ${MODULE_PREFIX}_SRCS ${ALGORITHMS_SM})
 
-conan_cmake_run(REQUIRES openssl/1.1.1d@LR04.02_ThirdParty/ms_x86_debug
+conan_cmake_run(REQUIRES openssl/1.1.1d@LR04.02_ThirdParty/stable
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 

Module/mod_tokenmgr/CMakeLists.txt

@@ -9,7 +9,7 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 
 # 添加实体需要依赖的其他共享库（包括系统库）
-set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS} RVCCommD)
+set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS} ${RVCCOMM_LIB})
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

addin/cfg/shell.ini.in

@@ -108,13 +108,12 @@ HighVoltageFour=0,@LIB_PREFIX@mod_highVoltageFour@LIB_SUFFIX@,0xF0F
 HighVoltageFifth=0,@LIB_PREFIX@mod_highVoltageFifth@LIB_SUFFIX@,0xF10
 
 [Startup]
-Number=4
-1=HelloService
-2=HelloClient
-3=PinPad
+Number=2
+1=PinPad
+2=CenterSetting
 ;the test server run mod_CardSwiper failed because lack of bthprops.cpl, so we seal it.
-;4=CardSwiper 
-4=CenterSetting
+;3=CardSwiper
+
 
 [Test]
 Number=6

module/CMakeLists.txt

@@ -5,10 +5,18 @@ macro(define_moudle _module_name)
 	string(TOUPPER "${MODULE_NAME}" MODULE_PREFIX)
 endmacro(define_moudle)
 
-set(MODULE_BASE_LIBS spbased libtoolkitd)
-set(RVCCOMM_LIB RVCCommD)
-set(SPBASE_LIB spbased)
-set(TOOLKIT_LIB libtoolkitd)
+if(RVC_DEBUG_MODE)
+    set(RVCCOMM_LIB RVCCommD)
+    set(SPBASE_LIB spbased)
+    set(TOOLKIT_LIB libtoolkitd)
+else()
+    set(RVCCOMM_LIB RVCComm)
+    set(SPBASE_LIB spbase)
+    set(TOOLKIT_LIB libtoolkit)
+endif(RVC_DEBUG_MODE)
+
+
+set(MODULE_BASE_LIBS ${SPBASE_LIB} ${TOOLKIT_LIB})
 set(MODULE_BASE_ALL_LIBS ${MODULE_BASE_LIBS} ${RVCCOMM_LIB}) 
 if(NOT MSVC)
    # list(APPEND MODULE_BASE_LIBS winpr)