From fd15ff9a540d5d928c3d6c8d5ff8f8fa8eef70de Mon Sep 17 00:00:00 2001 From: Sergiu Deitsch Date: Sun, 18 Feb 2024 13:24:53 +0100 Subject: [PATCH 1/8] fix(readme): wording --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 026cbb521..9597fb462 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,9 @@ their usage, please refer to the `user guide <#user-guide>`__. Usage in Projects ~~~~~~~~~~~~~~~~~ -Assuming that glog was previously `built glog using CMake <#cmake>`__ or -installed using a package manager, you can use the CMake command -:cmake:`find_package` to build against glog in your CMake project as follows: +Assuming that glog was previously `built using CMake <#cmake>`__ or installed +using a package manager, you can use the CMake command :cmake:`find_package` to +build against glog in your CMake project as follows: .. code:: cmake From 46e4721fb6aa52908e0b5cb66671815b10aecedc Mon Sep 17 00:00:00 2001 From: Ram Subhash D Date: Tue, 20 Feb 2024 00:37:33 +0530 Subject: [PATCH 2/8] fix(readme): correct LOG_IF_EVERY_N typo (#1077) --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 9597fb462..0adc84c44 100644 --- a/README.rst +++ b/README.rst @@ -681,7 +681,7 @@ macro can be used as follows: Verbose level condition macros ``VLOG_IF``, ``VLOG_EVERY_N`` and ``VLOG_IF_EVERY_N`` behave analogous to ``LOG_IF``, ``LOG_EVERY_N``, -``LOF_IF_EVERY``, but accept a numeric verbosity level as opposed to a +``LOG_IF_EVERY_N``, but accept a numeric verbosity level as opposed to a severity level. .. code:: cpp From f73750564e1734e5b930bd41e1d2e68247315ee1 Mon Sep 17 00:00:00 2001 From: Sergiu Deitsch Date: Mon, 19 Feb 2024 20:04:19 +0100 Subject: [PATCH 3/8] fix: error message typo --- src/glog/flags.h | 2 +- src/glog/log_severity.h | 2 +- src/glog/logging.h | 2 +- src/glog/raw_logging.h | 2 +- src/glog/vlog_is_on.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/glog/flags.h b/src/glog/flags.h index 8349639a6..cb542b930 100644 --- a/src/glog/flags.h +++ b/src/glog/flags.h @@ -42,7 +42,7 @@ #endif #if !defined(GLOG_EXPORT) -# error was not included correctly. See the documention for how to consume the library. +# error was not included correctly. See the documentation for how to consume the library. #endif #include "glog/platform.h" diff --git a/src/glog/log_severity.h b/src/glog/log_severity.h index 1fb6a4c01..2fdafeb9c 100644 --- a/src/glog/log_severity.h +++ b/src/glog/log_severity.h @@ -35,7 +35,7 @@ #endif #if !defined(GLOG_EXPORT) -# error was not included correctly. See the documention for how to consume the library. +# error was not included correctly. See the documentation for how to consume the library. #endif namespace google { diff --git a/src/glog/logging.h b/src/glog/logging.h index 9ab897e46..88d793f18 100644 --- a/src/glog/logging.h +++ b/src/glog/logging.h @@ -57,7 +57,7 @@ #endif #if !defined(GLOG_EXPORT) || !defined(GLOG_NO_EXPORT) -# error was not included correctly. See the documention for how to consume the library. +# error was not included correctly. See the documentation for how to consume the library. #endif #include "glog/flags.h" diff --git a/src/glog/raw_logging.h b/src/glog/raw_logging.h index 195a1b9c7..54cdd3b9d 100644 --- a/src/glog/raw_logging.h +++ b/src/glog/raw_logging.h @@ -41,7 +41,7 @@ #endif #if !defined(GLOG_EXPORT) -# error was not included correctly. See the documention for how to consume the library. +# error was not included correctly. See the documentation for how to consume the library. #endif #include "glog/log_severity.h" diff --git a/src/glog/vlog_is_on.h b/src/glog/vlog_is_on.h index f94b0fb8f..eb1c23353 100644 --- a/src/glog/vlog_is_on.h +++ b/src/glog/vlog_is_on.h @@ -68,7 +68,7 @@ #endif #if !defined(GLOG_EXPORT) -# error was not included correctly. See the documention for how to consume the library. +# error was not included correctly. See the documentation for how to consume the library. #endif #include "glog/flags.h" From eecd37e7eb57e6c6fa32ec849c0b4ea6a2155259 Mon Sep 17 00:00:00 2001 From: Victor Zheng PhD Date: Mon, 11 Mar 2024 03:20:22 -0700 Subject: [PATCH 4/8] fix(bazel): add missing emscripten defines (#1082) --- bazel/glog.bzl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bazel/glog.bzl b/bazel/glog.bzl index 199fe01ed..a311d0d60 100644 --- a/bazel/glog.bzl +++ b/bazel/glog.bzl @@ -61,24 +61,28 @@ def glog_library(with_gflags = 1, **kwargs): "-DHAVE_SYS_UTSNAME_H", # For src/utilities.cc. "-DHAVE_SYS_TIME_H", + # NOTE: users could optionally patch -DHAVE_UNWIND off if + # stacktrace dumping is not needed "-DHAVE_UNWIND", # Enable dumping stacktrace upon sigaction. "-DHAVE_SIGACTION", # For logging.cc. "-DHAVE_PREAD", + # -DHAVE_MODE_T prevent repeated typedef mode_t leading + # to emcc compilation failure + "-DHAVE_MODE_T", + "-DHAVE_UNISTD_H", ] linux_or_darwin_copts = wasm_copts + [ "-DGLOG_EXPORT=__attribute__((visibility(\\\"default\\\")))", "-DGLOG_NO_EXPORT=__attribute__((visibility(\\\"default\\\")))", - "-DHAVE_MODE_T", "-DHAVE_POSIX_FADVISE", "-DHAVE_SSIZE_T", "-DHAVE_SYS_TYPES_H", # For src/utilities.cc. "-DHAVE_SYS_SYSCALL_H", # For src/logging.cc to create symlinks. - "-DHAVE_UNISTD_H", "-fvisibility-inlines-hidden", "-fvisibility=hidden", ] From 442c6fcbf1f5f5525f88ca9250b0c73c132ee817 Mon Sep 17 00:00:00 2001 From: Sergiu Deitsch Date: Mon, 22 Apr 2024 00:47:36 +0200 Subject: [PATCH 5/8] fix: rework android detection (#1094) --- src/glog/platform.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/glog/platform.h b/src/glog/platform.h index 4aaf5b08f..efb6ff912 100644 --- a/src/glog/platform.h +++ b/src/glog/platform.h @@ -39,8 +39,9 @@ #elif defined(__CYGWIN__) || defined(__CYGWIN32__) # define GLOG_OS_CYGWIN #elif defined(linux) || defined(__linux) || defined(__linux__) -# ifndef GLOG_OS_LINUX -# define GLOG_OS_LINUX +# define GLOG_OS_LINUX +# if defined(__ANDROID__) +# define GLOG_OS_ANDROID # endif #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) # define GLOG_OS_MACOSX @@ -52,8 +53,6 @@ # define GLOG_OS_OPENBSD #elif defined(__EMSCRIPTEN__) # define GLOG_OS_EMSCRIPTEN -#elif defined(__ANDROID__) -# define GLOG_OS_ANDROID #else // TODO(hamaji): Add other platforms. #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. From 6e6a817a446f0ee19a80468c9ef5fdd72e16e8ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 13:40:27 +0200 Subject: [PATCH 6/8] build(deps): bump codecov/codecov-action from 3 to 4 (#1071) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 0dd243d51..0802de7a1 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -131,7 +131,7 @@ jobs: - name: Upload Coverage to Codecov if: matrix.build_type == 'Debug' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} files: build_${{matrix.build_type}}/coverage.xml diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7fc296678..4dd15a7b7 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -68,7 +68,7 @@ jobs: - name: Upload Coverage to Codecov if: matrix.build_type == 'Debug' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} files: build_${{matrix.build_type}}/coverage.xml diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4131270ad..71f056c8e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -234,7 +234,7 @@ jobs: - name: Upload Coverage to Codecov if: matrix.build_type == 'Debug' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} files: build_${{matrix.build_type}}/coverage.xml From 4c50627c38a26164e79662a6e1d751cd4038b1b4 Mon Sep 17 00:00:00 2001 From: xppt <21246102+xppt@users.noreply.github.com> Date: Mon, 22 Apr 2024 22:08:44 +0300 Subject: [PATCH 7/8] fix(symbolize): format unknown stack frames (#1092) --- src/symbolize.cc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/symbolize.cc b/src/symbolize.cc index 11a9872a0..6cb0e1222 100644 --- a/src/symbolize.cc +++ b/src/symbolize.cc @@ -642,18 +642,13 @@ OpenObjectFileContainingPcAndGetStartAddress(uint64_t pc, return nullptr; // Malformed line. } + strncpy(out_file_name, cursor, out_file_name_size); + // Making sure |out_file_name| is always null-terminated. + out_file_name[out_file_name_size - 1] = '\0'; + // Finally, "cursor" now points to file name of our interest. - FileDescriptor object_fd{ + return FileDescriptor{ FailureRetry([cursor] { return open(cursor, O_RDONLY); })}; - if (!object_fd) { - // Failed to open object file. Copy the object file name to - // |out_file_name|. - strncpy(out_file_name, cursor, out_file_name_size); - // Making sure |out_file_name| is always null-terminated. - out_file_name[out_file_name_size - 1] = '\0'; - return nullptr; - } - return object_fd; } } From 7b134a5c82c0c0b5698bb6bf7a835b230c5638e4 Mon Sep 17 00:00:00 2001 From: Sergiu Deitsch Date: Sat, 8 Jun 2024 17:07:34 +0200 Subject: [PATCH 8/8] release 0.7.1 (#1098) --- CMakeLists.txt | 2 +- ChangeLog | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b787631ce..45064ab78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.22) project (glog - VERSION 0.7.0 + VERSION 0.7.1 DESCRIPTION "C++ implementation of the Google logging module" HOMEPAGE_URL https://github.com/google/glog LANGUAGES CXX diff --git a/ChangeLog b/ChangeLog index 9f7409410..9193813f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-06-08 Google Inc. + + * google-glog: version 0.7.1. + * See git log for the details. + 2024-02-17 Google Inc. * google-glog: version 0.7.0.