Browse Source

Z991239-5240 #comment 生产版本不带判断适配器编译器的逻辑

80374374 1 year ago
parent
commit
80df90bb9f
1 changed files with 3 additions and 20 deletions
  1. 3 20
      Module/include/DevFSMCommBase.hpp

+ 3 - 20
Module/include/DevFSMCommBase.hpp

@@ -212,7 +212,8 @@ private:
 		if (!ExistsFileA(strFullLibPath)) {
 			return result;
 		}
-		/** Test Gifur@2024322]*/
+
+#ifndef DEVOPS_ON_PRD
 		GetDllVersionInfo(strFullLibPath, d1, d2, d3, d4);
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("dll %s version: %d.%d.%d.%d", strFullLibPath.GetData(), d1, d2, d3, d4);
 		//VC16.0	[1920,1929]	VS2019	142
@@ -220,25 +221,7 @@ private:
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("detect it built with VS2019, skip latter procedure, version: %d.%d.%d.%d", d1, d2, d3, d4);
 			return result;
 		}
-		//do 
-		//{
-		//	toolkit_lib_t libHandle;
-		//	int res = toolkit_dlopen(strFullLibPath, &libHandle);
-		//	if (res != 0) {
-		//		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("tmp: toolkit_dlopen[%s] failed with error %s.", strFullLibPath.GetData(), toolkit_dlerror(&libHandle));
-		//		toolkit_dlclose(&libHandle);
-		//		return result;
-		//	}
-		//	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("tmp: try to get GetDevAdapterVersion pointer address...");
-		//	if ((res = toolkit_dlsym(&libHandle, "GetDevAdapterVersion", (void**)&pFuncGetDevAdapterVer)) != 0) {
-		//		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("try  to get 'GetDevAdapterVersion' Func address failed with error: %s", toolkit_dlerror(&libHandle));
-		//		toolkit_dlclose(&libHandle);
-		//	} else {
-		//		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("get 'GetDevAdapterVersion' Func address  succ, seem it as built with vs2019, skip latter procedure");
-		//		toolkit_dlclose(&libHandle);
-		//		return result;
-		//	}
-		//} while (false);
+#endif
 
 		CSimpleStringA strTest = strFullLibPath.GetData();
 		CSimpleStringA strSelf(true);