From abf4151417565345b11099bc73ef32d746b7d4a6 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 17 Dec 2018 21:10:12 -0800 Subject: [PATCH] Add my clone of PLCrashReporter. --- .gitmodules | 4 +- NetNewsWire.xcodeproj/project.pbxproj | 140 +++++++++++++------------- submodules/CrashReporter | 1 + 3 files changed, 74 insertions(+), 71 deletions(-) create mode 160000 submodules/CrashReporter diff --git a/.gitmodules b/.gitmodules index 90e08626d..17695f9ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,4 +16,6 @@ [submodule "submodules/RSDatabase"] path = submodules/RSDatabase url = https://github.com/brentsimmons/RSDatabase - +[submodule "submodules/CrashReporter"] + path = submodules/CrashReporter + url = https://github.com/brentsimmons/plcrashreporter diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 53efbe71e..0fa7801c6 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -495,93 +495,93 @@ remoteGlobalIDString = 848934F51F62484F00CEBD24; remoteInfo = Account; }; - 848B932921C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B935621C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 05E731F30EFA1AAB005EDFB7; remoteInfo = "CrashReporter-MacOSX-Static"; }; - 848B932B21C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B935821C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 8DC2EF5B0486A6940098B216; remoteInfo = "CrashReporter-MacOSX"; }; - 848B932D21C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B935A21C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 058812B91040582D009128FB; remoteInfo = "CrashReporter-iOS"; }; - 848B932F21C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B935C21C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 05CD31520EE936A9000FDE88; remoteInfo = "CrashReporter-iOS-Device"; }; - 848B933121C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B935E21C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 05CD31630EE93905000FDE88; remoteInfo = "CrashReporter-iOS-Simulator"; }; - 848B933321C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B936021C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 05E731E30EFA1A3E005EDFB7; remoteInfo = plcrashutil; }; - 848B933521C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B936221C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 05CD32690EE93DC3000FDE88; remoteInfo = "Tests-MacOSX"; }; - 848B933721C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B936421C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 05CD32A90EE94062000FDE88; remoteInfo = "Tests-iOS-Simulator"; }; - 848B933921C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B936621C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 05CD33240EE94439000FDE88; remoteInfo = "Tests-iOS-Device"; }; - 848B933B21C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B936821C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 05F40CE70EF7AB80008050CF; remoteInfo = DemoCrash; }; - 848B933D21C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B936A21C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 052A45CF136353FB00987004; remoteInfo = "DemoCrash-iOS-Device"; }; - 848B933F21C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B936C21C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 052A464F136355FD00987004; remoteInfo = "DemoCrash-iOS-Simulator"; }; - 848B934121C8B1770038DC0D /* PBXContainerItemProxy */ = { + 848B936E21C8B8A00038DC0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + containerPortal = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; proxyType = 2; remoteGlobalIDString = 050DE24D0F61B80B00152ED3; remoteInfo = "Fuzz Testing"; @@ -890,7 +890,7 @@ 847752FE2008879500D93690 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; 847FA120202BA34100BB56C8 /* SidebarContextualMenuDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarContextualMenuDelegate.swift; sourceTree = ""; }; 848B930921C8B0BF0038DC0D /* Subscribe-to-Feed-MAS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Subscribe-to-Feed-MAS-Info.plist"; sourceTree = ""; }; - 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CrashReporter.xcodeproj; path = submodules/plcrashreporter/CrashReporter.xcodeproj; sourceTree = ""; }; + 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CrashReporter.xcodeproj; path = submodules/CrashReporter/CrashReporter.xcodeproj; sourceTree = ""; }; 848D578D21543519005FFAD5 /* PasteboardFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardFeed.swift; sourceTree = ""; }; 848F6AE41FC29CFA002D422E /* FaviconDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FaviconDownloader.swift; sourceTree = ""; }; 849A97421ED9EAA9007D329B /* AddFolderWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddFolderWindowController.swift; sourceTree = ""; }; @@ -1296,22 +1296,22 @@ path = Commands; sourceTree = ""; }; - 848B931721C8B1770038DC0D /* Products */ = { + 848B934421C8B8A00038DC0D /* Products */ = { isa = PBXGroup; children = ( - 848B932A21C8B1770038DC0D /* libCrashReporter-MacOSX-Static.a */, - 848B932C21C8B1770038DC0D /* CrashReporter.framework */, - 848B932E21C8B1770038DC0D /* CrashReporter.framework */, - 848B933021C8B1770038DC0D /* libCrashReporter-iphoneos.a */, - 848B933221C8B1770038DC0D /* libCrashReporter-iphonesimulator.a */, - 848B933421C8B1770038DC0D /* plcrashutil */, - 848B933621C8B1770038DC0D /* Tests-MacOSX.xctest */, - 848B933821C8B1770038DC0D /* Tests-iOS-Simulator.xctest */, - 848B933A21C8B1770038DC0D /* Tests-iOS-Device.xctest */, - 848B933C21C8B1770038DC0D /* DemoCrash.app */, - 848B933E21C8B1770038DC0D /* DemoCrash-iOS-Device.app */, - 848B934021C8B1770038DC0D /* DemoCrash-iOS-Simulator.app */, - 848B934221C8B1770038DC0D /* Fuzz Testing */, + 848B935721C8B8A00038DC0D /* libCrashReporter-MacOSX-Static.a */, + 848B935921C8B8A00038DC0D /* CrashReporter.framework */, + 848B935B21C8B8A00038DC0D /* CrashReporter.framework */, + 848B935D21C8B8A00038DC0D /* libCrashReporter-iphoneos.a */, + 848B935F21C8B8A00038DC0D /* libCrashReporter-iphonesimulator.a */, + 848B936121C8B8A00038DC0D /* plcrashutil */, + 848B936321C8B8A00038DC0D /* Tests-MacOSX.xctest */, + 848B936521C8B8A00038DC0D /* Tests-iOS-Simulator.xctest */, + 848B936721C8B8A00038DC0D /* Tests-iOS-Device.xctest */, + 848B936921C8B8A00038DC0D /* DemoCrash.app */, + 848B936B21C8B8A00038DC0D /* DemoCrash-iOS-Device.app */, + 848B936D21C8B8A00038DC0D /* DemoCrash-iOS-Simulator.app */, + 848B936F21C8B8A00038DC0D /* Fuzz Testing */, ); name = Products; sourceTree = ""; @@ -1540,7 +1540,7 @@ 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */, 84C37F8F20DD8CFD00CA8CF5 /* RSTree.xcodeproj */, 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */, - 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */, + 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */, ); sourceTree = ""; usesTabs = 1; @@ -2053,8 +2053,8 @@ ProjectRef = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */; }, { - ProductGroup = 848B931721C8B1770038DC0D /* Products */; - ProjectRef = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + ProductGroup = 848B934421C8B8A00038DC0D /* Products */; + ProjectRef = 848B934321C8B8A00038DC0D /* CrashReporter.xcodeproj */; }, { ProductGroup = 84C37F2320DD8CCD00CA8CF5 /* Products */; @@ -2138,95 +2138,95 @@ remoteRef = 846E773B1F6EF5D700A165E2 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B932A21C8B1770038DC0D /* libCrashReporter-MacOSX-Static.a */ = { + 848B935721C8B8A00038DC0D /* libCrashReporter-MacOSX-Static.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = "libCrashReporter-MacOSX-Static.a"; - remoteRef = 848B932921C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B935621C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B932C21C8B1770038DC0D /* CrashReporter.framework */ = { + 848B935921C8B8A00038DC0D /* CrashReporter.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = CrashReporter.framework; - remoteRef = 848B932B21C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B935821C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B932E21C8B1770038DC0D /* CrashReporter.framework */ = { + 848B935B21C8B8A00038DC0D /* CrashReporter.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = CrashReporter.framework; - remoteRef = 848B932D21C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B935A21C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B933021C8B1770038DC0D /* libCrashReporter-iphoneos.a */ = { + 848B935D21C8B8A00038DC0D /* libCrashReporter-iphoneos.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = "libCrashReporter-iphoneos.a"; - remoteRef = 848B932F21C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B935C21C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B933221C8B1770038DC0D /* libCrashReporter-iphonesimulator.a */ = { + 848B935F21C8B8A00038DC0D /* libCrashReporter-iphonesimulator.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = "libCrashReporter-iphonesimulator.a"; - remoteRef = 848B933121C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B935E21C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B933421C8B1770038DC0D /* plcrashutil */ = { + 848B936121C8B8A00038DC0D /* plcrashutil */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.executable"; path = plcrashutil; - remoteRef = 848B933321C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B936021C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B933621C8B1770038DC0D /* Tests-MacOSX.xctest */ = { + 848B936321C8B8A00038DC0D /* Tests-MacOSX.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = "Tests-MacOSX.xctest"; - remoteRef = 848B933521C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B936221C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B933821C8B1770038DC0D /* Tests-iOS-Simulator.xctest */ = { + 848B936521C8B8A00038DC0D /* Tests-iOS-Simulator.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = "Tests-iOS-Simulator.xctest"; - remoteRef = 848B933721C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B936421C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B933A21C8B1770038DC0D /* Tests-iOS-Device.xctest */ = { + 848B936721C8B8A00038DC0D /* Tests-iOS-Device.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = "Tests-iOS-Device.xctest"; - remoteRef = 848B933921C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B936621C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B933C21C8B1770038DC0D /* DemoCrash.app */ = { + 848B936921C8B8A00038DC0D /* DemoCrash.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; path = DemoCrash.app; - remoteRef = 848B933B21C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B936821C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B933E21C8B1770038DC0D /* DemoCrash-iOS-Device.app */ = { + 848B936B21C8B8A00038DC0D /* DemoCrash-iOS-Device.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; path = "DemoCrash-iOS-Device.app"; - remoteRef = 848B933D21C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B936A21C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B934021C8B1770038DC0D /* DemoCrash-iOS-Simulator.app */ = { + 848B936D21C8B8A00038DC0D /* DemoCrash-iOS-Simulator.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; path = "DemoCrash-iOS-Simulator.app"; - remoteRef = 848B933F21C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B936C21C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 848B934221C8B1770038DC0D /* Fuzz Testing */ = { + 848B936F21C8B8A00038DC0D /* Fuzz Testing */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.executable"; path = "Fuzz Testing"; - remoteRef = 848B934121C8B1770038DC0D /* PBXContainerItemProxy */; + remoteRef = 848B936E21C8B8A00038DC0D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 84C37F2820DD8CCE00CA8CF5 /* DB5.framework */ = { diff --git a/submodules/CrashReporter b/submodules/CrashReporter new file mode 160000 index 000000000..05d34741d --- /dev/null +++ b/submodules/CrashReporter @@ -0,0 +1 @@ +Subproject commit 05d34741d3a90bbed51214983110943831ae5943