[crashpad]：添加，等待vcpkg修复linux下编译 https://github.com/microsoft/vcpkg/pu…

…ll/38322； [automic queue]：移除；
RealChuan · Apr 25, 2024 · a7339e9 · a7339e9
1 parent 185196b
commit a7339e9
Show file tree

Hide file tree

Showing 32 changed files with 282 additions and 306 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,15 +50,15 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         shell: bash
         run: |
-          brew install ninja
+          brew install ninja python-setuptools
           ninja --version
           cmake --version
           clang --version
       - name: Install dependencies on ubuntu
         if: startsWith(matrix.os, 'ubuntu')
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build
+          sudo apt-get install ninja-build clang
           ninja --version
           cmake --version
           gcc --version
@@ -83,11 +83,12 @@ jobs:
             ${{ runner.os }}-
           save-always: true
 
-      - name: Enable Developer Command Prompt
+      - name: Configure msvc for amd64
         if: startsWith(matrix.os, 'windows')
-        uses: ilammy/msvc-dev-cmd@v1.12.1
+        uses: ilammy/msvc-dev-cmd@v1 
         with:
           arch: amd64
+
       - name: Configure windows
         if: startsWith(matrix.os, 'windows')
         shell: bash
@@ -99,7 +100,7 @@ jobs:
             -DCMAKE_CXX_COMPILER=cl \
             -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
             -G "${{ matrix.generators }}" \
-            -DCMAKE_INSTALL_PREFIX:PATH=instdir
+            || (cat ./build/vcpkg_installed/vcpkg/issue_body.md && exit 1) 
       - name: Configure macos or ubuntu
         if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
         shell: bash
@@ -109,7 +110,7 @@ jobs:
             -B ./build \
             -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
             -G "${{ matrix.generators }}" \
-            -DCMAKE_INSTALL_PREFIX:PATH=instdir
+            || (cat ./build/vcpkg_installed/vcpkg/issue_body.md && exit 1)
       - name: Build
         shell: bash
         run: |

diff --git a/AtomicQueue/CMakeLists.txt b/AtomicQueue/CMakeLists.txt
diff --git a/AtomicQueue/atomicqueue.hpp b/AtomicQueue/atomicqueue.hpp
diff --git a/AtomicQueue/atomicqueue_unittest.cc b/AtomicQueue/atomicqueue_unittest.cc
diff --git a/Breakpad/CMakeLists.txt b/Breakpad/CMakeLists.txt
@@ -1,3 +1,4 @@
-add_executable(Breakpad main.cc breakpad.cc breakpad.hpp)
-target_link_libraries(Breakpad PRIVATE unofficial::breakpad::libbreakpad
-                                       unofficial::breakpad::libbreakpad_client)
+add_executable(breakpad_test main.cc breakpad.cc breakpad.hpp)
+target_link_libraries(
+  breakpad_test PRIVATE unofficial::breakpad::libbreakpad
+                        unofficial::breakpad::libbreakpad_client)
diff --git a/Breakpad/breakpad.hpp b/Breakpad/breakpad.hpp
@@ -1,16 +1,18 @@
 #pragma once
 
+#include <utils/object.hpp>
+
 #include <memory>
 #include <string>
 
 namespace google_breakpad {
 class ExceptionHandler;
 }
 
-class Breakpad
+class Breakpad : noncopyable
 {
 public:
-    Breakpad(const std::string &dump_path);
+    explicit Breakpad(const std::string &dump_path);
     ~Breakpad();
 
 private:

diff --git a/Breakpad/main.cc b/Breakpad/main.cc
@@ -1,10 +1,23 @@
 #include "breakpad.hpp"
 
-auto main(int argc, char *argv[]) -> int
+#include <filesystem>
+
+void crash()
 {
-    Breakpad breakpad("./");
     int *p = nullptr;
     *p = 1;
+}
+
+auto main(int argc, char *argv[]) -> int
+{
+    auto dumpPath = std::filesystem::current_path() / "breakpad";
+    if (!std::filesystem::exists(dumpPath)) {
+        std::filesystem::create_directory(dumpPath);
+    }
+
+    Breakpad breakpad(dumpPath.string());
+
+    crash();
 
     return 0;
 }