Merge pull request 'main' (#8) from main into v1.1.0

Reviewed-on: #8
版本号补丁

.gitignore

@@ -2,4 +2,3 @@
 .vscode/**
 bin
 build
-CMakeUserPresets.json

CMakeLists.txt

@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.28...3.30)
 project(logging)
 
 set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_CLANG_TIDY "clang-tidy")
 
 if(MSVC)
     add_compile_options("/source-charset:utf-8")

conanfile.py

@@ -17,7 +17,7 @@ class loggingRecipe(ConanFile):
     default_options = {"shared": False, "fPIC": True,"test":True}
 
 
-    exports_sources = "include/*", "CMakeLists.txt", "src/*", "tests/*", "LICENSE"
+    exports_sources = "include/*", "CMakeLists.txt", "src/*", "tests/*"
 
     def config_options(self):
         if self.settings.os == "Windows":
@@ -47,8 +47,12 @@ class loggingRecipe(ConanFile):
 
     def package(self):
         copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
-        cmake = CMake(self)
-        cmake.install()
+        copy(self, pattern="*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
+        copy(self, pattern="*.a", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
+        copy(self, pattern="*.so", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
+        copy(self, pattern="*.lib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
+        copy(self, pattern="*.dll", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path=False)
+        copy(self, pattern="*.dylib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
 
     def package_info(self):
         self.cpp_info.libs = ["logging"]

include/logging.h

@@ -81,13 +81,6 @@ void loggingDestroyAll(void);
  */
 void loggingDestroyLogger(Logger *logger);
 
-/**
- * @brief 替换默认日志器
- * @param  logger 日志器
- * @return
- */
-bool loggingReplaceDefaultLogger(Logger *logger);
-
 #ifdef __cplusplus
 }
 #endif

src/logging.c

@@ -6,6 +6,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 
 #define RED    "\033[0;31m"
@@ -256,14 +257,6 @@ Logger *loggingGetLogger(const char *name) {
     return logger;
 }
 
-bool loggingReplaceDefaultLogger(Logger *logger) {
-    if (logger == NULL) {
-        return false;
-    }
-    ROOT_LOGGER = logger;
-    return true;
-}
-
 void loggingDestroyLogger(Logger *logger) {
     if (logger != NULL) {
         if (logger->handler != NULL) {

test_package/CMakeLists.txt

@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 3.28...3.30)
-
-project(LoggingTest)
-
-find_package(logging CONFIG REQUIRED)
-
-#测试简单基本应用
-add_executable(${PROJECT_NAME} src/testExmaple.c)
-target_link_libraries(${PROJECT_NAME} logging::logging)

test_package/conanfile.py

@@ -1,26 +0,0 @@
-import os
-
-from conan import ConanFile
-from conan.tools.cmake import CMake, cmake_layout
-from conan.tools.build import can_run
-
-
-class LoggingTestConan(ConanFile):
-    settings = "os", "compiler", "build_type", "arch"
-    generators = "CMakeDeps", "CMakeToolchain"
-
-    def requirements(self):
-        self.requires(self.tested_reference_str)
-
-    def build(self):
-        cmake = CMake(self)
-        cmake.configure()
-        cmake.build()
-
-    def layout(self):
-        cmake_layout(self)
-
-    def test(self):
-        if can_run(self):
-            cmd = os.path.join(self.cpp.build.bindir, "LoggingTest")
-            self.run(cmd, env="conanrun")

test_package/src/testExmaple.c

@@ -1,12 +0,0 @@
-#include "logging.h"
-
-int main() {
-    Log_info("This is an info message");
-    Log_error("This is an error message%s", "123");
-    Log_fatal("This is an fatal message");
-    Log_debug("This is a debug message");
-    Log_warning("This is a warning message%s", "123");
-
-    loggingDestroyAll();
-    return 0;
-}