日志整改 Signed-off-by:baozewei@huawei.com

Signed-off-by: b30052170 <baozewei@huawei.com>

frameworks/helper/scan_helper/BUILD.gn

@@ -72,6 +72,10 @@ ohos_shared_library("scan_helper") {
     "samgr:samgr_proxy",
   ]
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   #relative_install_dir = "module"
   install_enable = true
   subsystem_name = "print"

frameworks/innerkitsimpl/print_impl/BUILD.gn

@@ -76,6 +76,10 @@ ohos_shared_library("print_client") {
     "samgr:samgr_proxy",
   ]
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   #relative_install_dir = "module"
   install_enable = true
   subsystem_name = "print"

frameworks/innerkitsimpl/scan_impl/BUILD.gn

@@ -65,6 +65,10 @@ ohos_shared_library("scan_client") {
     "samgr:samgr_proxy",
   ]
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   #relative_install_dir = "module"
   install_enable = true
   subsystem_name = "print"

frameworks/kits/extension/BUILD.gn

@@ -102,6 +102,10 @@ ohos_shared_library("print_extension_framework") {
     "napi:ace_napi",
   ]
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   subsystem_name = "print"
   part_name = "print_fwk"
 }
@@ -136,6 +140,11 @@ ohos_shared_library("print_extension_module") {
     "hisysevent:libhisysevent",
     "napi:ace_napi",
   ]
+
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+  
   relative_install_dir = "extensionability"
   subsystem_name = "print"
   part_name = "print_fwk"

frameworks/models/print_models/BUILD.gn

@@ -64,6 +64,10 @@ ohos_shared_library("print_models") {
     "samgr:samgr_proxy",
   ]
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   install_enable = true
   subsystem_name = "print"
   innerapi_tags = [ "platformsdk" ]

frameworks/ohprint/BUILD.gn

@@ -78,6 +78,10 @@ ohos_shared_library("ohprint") {
     "samgr:samgr_proxy",
   ]
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   relative_install_dir = "ndk"
   output_name = "ohprint"
   output_extension = "so"

frameworks/ohscan/BUILD.gn

@@ -68,6 +68,10 @@ ohos_shared_library("ohscan") {
     "samgr:samgr_proxy",
   ]
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   relative_install_dir = "ndk"
   output_name = "ohscan"
   output_extension = "so"

interfaces/kits/jsnapi/print_extension/BUILD.gn

@@ -54,6 +54,10 @@ ohos_shared_library("printextensionability_napi") {
 
   external_deps = [ "napi:ace_napi" ]
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   relative_install_dir = "module/app/ability"
   subsystem_name = "print"
   part_name = "print_fwk"

interfaces/kits/jsnapi/print_extensionctx/BUILD.gn

@@ -54,6 +54,10 @@ ohos_shared_library("printextensioncontext_napi") {
 
   external_deps = [ "napi:ace_napi" ]
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   relative_install_dir = "module"
   subsystem_name = "print"
   part_name = "print_fwk"

interfaces/kits/napi/print_napi/BUILD.gn

@@ -76,6 +76,11 @@ ohos_shared_library("print_napi") {
     "napi:ace_napi",
     "samgr:samgr_proxy",
   ]
+
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+  
   relative_install_dir = "module"
   subsystem_name = "print"
   part_name = "print_fwk"

interfaces/kits/napi/scan_napi/BUILD.gn

@@ -63,6 +63,11 @@ ohos_shared_library("scan_napi") {
     "napi:ace_napi",
     "samgr:samgr_proxy",
   ]
+
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+  
   relative_install_dir = "module"
   subsystem_name = "print"
   part_name = "print_fwk"

services/print_service/BUILD.gn

@@ -139,6 +139,10 @@ ohos_shared_library("print_service") {
     cflags_cc += [ "-DSECURITY_GUARDE_ENABLE" ]
   }
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   subsystem_name = "print"
   part_name = "print_fwk"
 }

services/scan_service/BUILD.gn

@@ -96,6 +96,10 @@ ohos_shared_library("scan_service") {
     cflags_cc += [ "-DSANE_ENABLE" ]
   }
 
+  if (build_variant == "user") {
+    cflags_cc += [ "-DIS_RELEASE_VERSION" ]
+  }
+
   subsystem_name = "print"
   part_name = "print_fwk"
 }

utils/include/scan_log.h

@@ -43,7 +43,11 @@
 #define SCAN_LOG_TAG "scankit"
 #define SCAN_LOG_DOMAIN 0xD001C00
 
-#define SCAN_MAKE_FILE_NAME (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__)
+#ifdef IS_RELEASE_VERSION
+#define SCAN_MAKE_FILE_NAME ""
+#else
+#define SCAN_MAKE_FILE_NAME (__builtin_strrchr(__FILE_NAME__, '/') ? __builtin_strrchr(__FILE_NAME__, '/') + 1 : __FILE_NAME__)
+#endif
 
 #define SCAN_HILOGF(fmt, ...)                                        								\
     (void)HILOG_IMPL(LOG_CORE, LOG_FATAL, SCAN_LOG_DOMAIN, SCAN_LOG_TAG, "[%{public}s %{public}s %{public}d] " fmt,	\