jernej/update codeowners

.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @getsentry/processing

.github/workflows/build.yml

@@ -0,0 +1,57 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - getsentry
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
+
+      - name: Installing Linux Dependencies
+        if: ${{ runner.os == 'Linux' }}
+        run: |
+          sudo apt update
+          sudo apt install zlib1g-dev libcurl4-openssl-dev libssl-dev libunwind-dev pkg-config
+
+      - name: Build crashpad
+        run: |
+          cmake -B cmake-build -D CRASHPAD_BUILD_TOOLS=On
+          cmake --build cmake-build --parallel
+
+      - name: Build crashpad with client-side stack traces
+        run: |
+          cmake -B cmake-build-stacks -D CRASHPAD_ENABLE_STACKTRACE=ON
+          cmake --build cmake-build-stacks --parallel
+
+      - name: Build crashpad Windows ARM64
+        if: ${{ runner.os == 'Windows' }}
+        run: |
+          cmake -B cmake-build-arm64 -DCMAKE_TOOLCHAIN_FILE="cmake/toolchains/win_arm64.cmake" -DCRASHPAD_BUILD_TOOLS=On
+          cmake --build cmake-build-arm64 --config RelWithDebInfo -- /p:Platform=ARM64
+
+      - name: Build crashpad with client-side stack traces Windows ARM64
+        if: ${{ runner.os == 'Windows' }}
+        run: |
+          cmake -B cmake-build-stacks-arm64 -DCMAKE_TOOLCHAIN_FILE="cmake/toolchains/win_arm64.cmake" -DCRASHPAD_ENABLE_STACKTRACE=ON
+          cmake --build cmake-build-stacks-arm64 --config RelWithDebInfo -- /p:Platform=ARM64
+
+  build-ios:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
+      - run: |
+          cmake -B crashpad-xcode -GXcode -DCMAKE_SYSTEM_NAME=iOS
+          xcodebuild build -project crashpad-xcode/crashpad.xcodeproj

.gitignore

@@ -35,12 +35,6 @@
 /third_party/linux/.cipd
 /third_party/linux/clang
 /third_party/linux/sysroot
-/third_party/lss/lss
 /third_party/gyp/gyp
-/third_party/mini_chromium/mini_chromium
-/third_party/ninja/linux
-/third_party/ninja/mac*
-/third_party/ninja/ninja.exe
-/third_party/zlib/zlib
 /xcodebuild
 tags

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "third_party/mini_chromium/mini_chromium"]
+	path = third_party/mini_chromium/mini_chromium
+	url = https://chromium.googlesource.com/chromium/mini_chromium
+[submodule "third_party/zlib/zlib"]
+	path = third_party/zlib/zlib
+	url = https://chromium.googlesource.com/chromium/src/third_party/zlib
+[submodule "third_party/lss/lss"]
+	path = third_party/lss/lss
+	url = https://chromium.googlesource.com/linux-syscall-support

CMakeLists.txt

@@ -0,0 +1,160 @@
+cmake_minimum_required(VERSION 3.12)
+project(crashpad LANGUAGES C CXX)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(LINUX TRUE)
+endif()
+
+set(CRASHPAD_MAIN_PROJECT OFF)
+if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+    set(CRASHPAD_MAIN_PROJECT ON)
+endif()
+
+option(CRASHPAD_ENABLE_INSTALL "Enable crashpad installation" "${CRASHPAD_MAIN_PROJECT}")
+option(CRASHPAD_ENABLE_INSTALL_DEV "Enable crashpad development installation" "${CRASHPAD_MAIN_PROJECT}")
+option(CRASHPAD_ENABLE_STACKTRACE "Enable client-side stack trace recording" OFF)
+
+if(MSVC)
+    set(CRASHPAD_ZLIB_SYSTEM_DEFAULT OFF)
+else()
+    set(CRASHPAD_ZLIB_SYSTEM_DEFAULT ON)
+endif()
+option(CRASHPAD_ZLIB_SYSTEM "Use system zlib library" "${CRASHPAD_ZLIB_SYSTEM_DEFAULT}")
+
+if(CRASHPAD_ZLIB_SYSTEM AND NOT ZLIB_FOUND)
+    find_package(ZLIB REQUIRED)
+endif()
+
+if (NOT (ANDROID OR FUCHSIA))
+    add_compile_definitions(CRASHPAD_FLOCK_ALWAYS_SUPPORTED=1)
+else()
+    add_compile_definitions(CRASHPAD_FLOCK_ALWAYS_SUPPORTED=0)
+endif()
+
+include(GNUInstallDirs)
+set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/crashpad")
+
+function(crashpad_install_target)
+    if(CRASHPAD_ENABLE_INSTALL)
+        install(TARGETS ${ARGN} EXPORT crashpad_export
+            ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+            LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+        )
+    endif()
+endfunction()
+function(crashpad_install_dev)
+    if(CRASHPAD_ENABLE_INSTALL_DEV)
+        install(${ARGN})
+    endif()
+endfunction()
+
+if(WIN32)
+    if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES ARM64)
+        enable_language(ASM_MARMASM)
+    else()
+        enable_language(ASM_MASM)
+    endif()
+
+    if(MINGW)
+        find_program(JWASM_FOUND jwasm)
+        if (JWASM_FOUND)
+            set(CMAKE_ASM_MASM_COMPILER ${JWASM_FOUND})
+            execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE COMPILER_VERSION_OUTPUT)
+            if (COMPILER_VERSION_OUTPUT)
+                if (COMPILER_VERSION_OUTPUT MATCHES "x86_64")
+                    set(JWASM_FLAGS -win64)
+                else()
+                    set(JWASM_FLAGS -coff)
+                endif()
+            endif()
+           set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS})
+        endif(JWASM_FOUND)
+
+        if(NOT CMAKE_ASM_MASM_COMPILER OR CMAKE_ASM_MASM_COMPILER STREQUAL "ml" OR CMAKE_ASM_MASM_COMPILER STREQUAL "ml64")
+            message(WARNING "No custom ASM_MASM compiler defined via 'CMAKE_ASM_MASM_COMPILER'. Trying to use UASM...")
+            set(CMAKE_ASM_MASM_COMPILER "uasm")
+        endif()
+        if(NOT CMAKE_ASM_MASM_FLAGS)
+            set(CMAKE_ASM_MASM_FLAGS "-win64 -10") #use default compatibility flags
+        endif()
+   endif(MINGW)
+else()
+    enable_language(ASM)
+endif()
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_library(crashpad_interface INTERFACE)
+target_include_directories(crashpad_interface INTERFACE
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third_party/mini_chromium/mini_chromium>
+)
+target_compile_definitions(crashpad_interface INTERFACE
+    CRASHPAD_LSS_SOURCE_EMBEDDED
+)
+
+if(WIN32)
+    target_compile_definitions(crashpad_interface INTERFACE
+        NOMINMAX
+        UNICODE
+        WIN32_LEAN_AND_MEAN
+        _CRT_SECURE_NO_WARNINGS
+        _HAS_EXCEPTIONS=0
+        _UNICODE
+    )
+endif()
+if(MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
+
+    string(REGEX REPLACE "/[Ww][0123]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+    string(REGEX REPLACE "/[Ww][0123]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    target_compile_options(crashpad_interface INTERFACE
+        $<$<COMPILE_LANGUAGE:C,CXX>:/FS>
+        $<$<COMPILE_LANGUAGE:C,CXX>:/W4>
+        $<$<COMPILE_LANGUAGE:C,CXX>:/WX>
+        $<$<COMPILE_LANGUAGE:C,CXX>:/bigobj> # Support larger number of sections in obj file.
+        $<$<COMPILE_LANGUAGE:C,CXX>:/wd4100> # Unreferenced formal parameter.
+        $<$<COMPILE_LANGUAGE:C,CXX>:/wd4127> # Conditional expression is constant.
+        $<$<COMPILE_LANGUAGE:C,CXX>:/wd4324> # Structure was padded due to alignment specifier.
+        $<$<COMPILE_LANGUAGE:C,CXX>:/wd4351> # New behavior: elements of array will be default initialized.
+        $<$<COMPILE_LANGUAGE:C,CXX>:/wd4577> # 'noexcept' used with no exception handling mode specified.
+        $<$<COMPILE_LANGUAGE:C,CXX>:/wd4996> # 'X' was declared deprecated.
+    )
+elseif(MINGW)
+    # redirect to wmain
+    # FIXME: cmake 3.13 added target_link_options
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -municode")
+endif()
+add_library(crashpad::interface ALIAS crashpad_interface)
+
+add_subdirectory(compat)
+add_subdirectory(minidump)
+add_subdirectory(snapshot)
+add_subdirectory(util)
+add_subdirectory(third_party/mini_chromium)
+add_subdirectory(client)
+
+add_subdirectory(third_party/zlib)
+add_subdirectory(third_party/getopt)
+
+add_subdirectory(tools)
+add_subdirectory(handler)
+
+if(CRASHPAD_ENABLE_STACKTRACE AND APPLE AND NOT IOS)
+    set(LIBUNWIND_ENABLE_SHARED OFF)
+    add_subdirectory(libunwind)
+    crashpad_install_target(unwind_static)
+endif()
+
+if(CRASHPAD_ENABLE_INSTALL_DEV)
+    install(EXPORT crashpad_export NAMESPACE crashpad:: FILE crashpad-targets.cmake
+        DESTINATION "${CMAKE_INSTALL_CMAKEDIR}")
+    include(CMakePackageConfigHelpers)
+    configure_package_config_file(crashpad-config.cmake.in crashpad-config.cmake
+        INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
+    )
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/crashpad-config.cmake" DESTINATION "${CMAKE_INSTALL_CMAKEDIR}")
+endif()

Makefile

@@ -0,0 +1,36 @@
+SHELL := /bin/bash
+PATH := $(PWD)/../depot_tools:$(PATH)
+
+all:
+	echo 'Nothing to do' && exit 1
+
+build-with-gn:
+	gn gen out/Default
+	ninja -C out/Default
+.PHONY: build-with-gn
+
+build-with-cmake:
+	mkdir -p cmakebuild
+	cd cmakebuild; cmake ..
+	cmake --build cmakebuild --parallel
+.PHONY: build-with-cmake
+
+update-with-gclient:
+	gclient sync
+.PHONY: update-with-gclient
+
+example: build-with-gn
+	g++ -g \
+		-o example example.cpp \
+		-I. -I./third_party/mini_chromium/mini_chromium \
+		-std=c++14 \
+		-L./out/Default/obj/client -lclient \
+		-L./out/Default/obj/util -lutil \
+		-L./out/Default/obj/third_party/mini_chromium/mini_chromium/base -lbase \
+		-framework Foundation -framework Security -framework CoreText \
+		-framework CoreGraphics -framework IOKit -lbsm
+.PHONY: example
+
+gen-sentry-patch:
+	git format-patch --stdout master...HEAD > getsentry.patch
+.PHONY: get-sentry-patch

README.getsentry.md

@@ -0,0 +1,71 @@
+# Sentry Modifications
+
+- File attachments support for MacOS and Windows. Based on changes made in
+  https://github.com/Youw/crashpad/, distributed with Apache 2.0 License.
+- Add `throws` declaration to `memfd_create` for compatibility with different
+  libc versions.
+- Build System Changes Listed Below.
+- MinGW build support.
+
+# Build System Changes
+
+In order to minimize external dependencies, and to better integrate with
+`sentry-native`, this fork replaced usage of `depo_tools` with explicit
+submodules, and added CMake files for building.
+
+Both submodules and CMake files currently only support building on macOS and
+Windows, and do only export the necessary libraries and executables to
+integrate the crashpad client.
+
+When updating this fork, make sure to keep the files in sync, as explained
+below.
+
+## Submodules
+
+For macOS and Windows support, only `third_party/mini_chromium` and
+`third_party/zlib` are needed.
+
+The specific submodule commit hashes can be found in the `./DEPS` file.
+
+## CMake Integration
+
+To allow building crashpad with CMake, the following CMake files were created
+by manually translating the `BUILD.gn` files in the same folders (and following
+included files):
+
+- `./CMakeLists.txt`
+- `./client/CMakeLists.txt`
+- `./compat/CMakeLists.txt`
+- `./handler/CMakeLists.txt`
+- `./minidump/CMakeLists.txt`
+- `./snapshot/CMakeLists.txt`
+- `./third_party/getopt/CMakeLists.txt`
+- `./third_party/mini_chromium/CMakeLists.txt`
+- `./third_party/zlib/CMakeLists.txt`
+- `./tools/CMakeLists.txt`
+- `./util/CMakeLists.txt`
+
+The important thing here is to keep the list of source files in sync when
+updating.
+
+## MinGW Changes
+
+MinGW support adds the following files which need to be kept in sync.
+
+- `compat/mingw/`
+- `third_party/mini_chromium/utf_string_conversion_utils.mingw.cc`
+
+## Building for iOS
+
+Build support for iOS, or Xcode in general is still a work in progress.
+Once complete, creating a iOS compatible Xcode project should be as easy as:
+
+    cmake -B cmakebuild -GXcode -DCMAKE_SYSTEM_NAME=iOS
+
+See the [upstream CMake Docs on iOS](https://cmake.org/cmake/help/v3.17/manual/cmake-toolchains.7.html#cross-compiling-for-ios-tvos-or-watchos) for further info.
+
+# How To Update
+
+- Bump the submodules to the commit hashes specified in `./DEPS`
+- Go through the changes in `BUILD.gn` files, and apply them to the
+  corresponding `CMakeLists.txt`. See the list above.

README.md

@@ -40,3 +40,12 @@ https://chromium.googlesource.com/crashpad/crashpad.
    perform automated builds and tests.
  * [crashpad-dev](https://groups.google.com/a/chromium.org/group/crashpad-dev)
    is the Crashpad developers’ mailing list.
+
+## Sentry modifications
+
+See [README.getsentry.md](README.getsentry.md) for more information on the
+changes, and on maintaining the fork.
+
+Generating patch:
+
+    git format-patch --stdout master...HEAD > getsentry.patch