aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/mac/Breakpad.xcodeproj/project.pbxproj4
-rw-r--r--src/client/mac/Framework/Breakpad.h52
-rw-r--r--src/client/mac/Framework/Breakpad.mm17
-rw-r--r--src/client/mac/Framework/BreakpadDefines.h72
-rw-r--r--src/client/mac/crash_generation/ConfigFile.mm2
-rw-r--r--src/client/mac/sender/crash_report_sender.h2
-rw-r--r--src/client/mac/sender/crash_report_sender.m12
-rw-r--r--src/client/mac/sender/uploader.h1
-rw-r--r--src/client/mac/sender/uploader.m1
9 files changed, 98 insertions, 65 deletions
diff --git a/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
index fc3e462f..c927c7a7 100644
--- a/src/client/mac/Breakpad.xcodeproj/project.pbxproj
+++ b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
@@ -39,6 +39,7 @@
163201D71443019E00C4DBF5 /* ConfigFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 163201D51443019E00C4DBF5 /* ConfigFile.mm */; };
163201E31443029300C4DBF5 /* ConfigFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 163201D51443019E00C4DBF5 /* ConfigFile.mm */; };
163202451443201300C4DBF5 /* uploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 163202441443201300C4DBF5 /* uploader.m */; };
+ 1632058314442E9000C4DBF5 /* BreakpadDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 1632058214442E9000C4DBF5 /* BreakpadDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
3329D4ED0FA16D820007BBC5 /* Breakpad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3329D4EC0FA16D820007BBC5 /* Breakpad.xib */; };
33880C800F9E097100817F82 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 33880C7E0F9E097100817F82 /* InfoPlist.strings */; };
4084699D0F5D9CF900FDCA37 /* crash_report_sender.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4084699C0F5D9CF900FDCA37 /* crash_report_sender.icns */; };
@@ -552,6 +553,7 @@
163201D51443019E00C4DBF5 /* ConfigFile.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = ConfigFile.mm; path = crash_generation/ConfigFile.mm; sourceTree = "<group>"; };
163202431443201300C4DBF5 /* uploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = uploader.h; path = sender/uploader.h; sourceTree = "<group>"; };
163202441443201300C4DBF5 /* uploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = uploader.m; path = sender/uploader.m; sourceTree = "<group>"; };
+ 1632058214442E9000C4DBF5 /* BreakpadDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BreakpadDefines.h; path = Framework/BreakpadDefines.h; sourceTree = "<group>"; };
32DBCF5E0370ADEE00C91783 /* Breakpad_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Breakpad_Prefix.pch; path = Framework/Breakpad_Prefix.pch; sourceTree = "<group>"; };
3329D4EC0FA16D820007BBC5 /* Breakpad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Breakpad.xib; path = sender/Breakpad.xib; sourceTree = "<group>"; };
33880C7F0F9E097100817F82 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = sender/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -983,6 +985,7 @@
F92C55CD0ECD0053009BE4BA /* Framework */ = {
isa = PBXGroup;
children = (
+ 1632058214442E9000C4DBF5 /* BreakpadDefines.h */,
F945859D0F78241E009A47BF /* Info.plist */,
F92C56310ECD0DF1009BE4BA /* OnDemandServer.h */,
F92C56320ECD0DF1009BE4BA /* OnDemandServer.mm */,
@@ -1105,6 +1108,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
+ 1632058314442E9000C4DBF5 /* BreakpadDefines.h in Headers */,
F92C55D00ECD0064009BE4BA /* Breakpad.h in Headers */,
F92C56330ECD0DF1009BE4BA /* OnDemandServer.h in Headers */,
D2F9A4C9121336C7002747C1 /* client_info.h in Headers */,
diff --git a/src/client/mac/Framework/Breakpad.h b/src/client/mac/Framework/Breakpad.h
index 29bb3ec1..39259cd9 100644
--- a/src/client/mac/Framework/Breakpad.h
+++ b/src/client/mac/Framework/Breakpad.h
@@ -41,6 +41,10 @@
// modify the default behavior to suit your needs and wants and
// desires.
+// A service name associated with the original bootstrap parent port, saved in
+// OnDemandServer and restored in Inspector.
+#define BREAKPAD_BOOTSTRAP_PARENT_PORT "com.Breakpad.BootstrapParent"
+
typedef void *BreakpadRef;
#ifdef __cplusplus
@@ -50,53 +54,7 @@ extern "C" {
#include <CoreFoundation/CoreFoundation.h>
#include <Foundation/Foundation.h>
-// Keys for configuration file
-#define kReporterMinidumpDirectoryKey "MinidumpDir"
-#define kReporterMinidumpIDKey "MinidumpID"
-
-// Filename for recording uploaded IDs
-#define kReporterLogFilename "uploads.log"
-
-// The default subdirectory of the Library to put crash dumps in
-// The subdirectory is
-// ~/Library/<kDefaultLibrarySubdirectory>/<GoogleBreakpadProduct>
-#define kDefaultLibrarySubdirectory "Breakpad"
-
-// Specify some special keys to be used in the configuration file that is
-// generated by Breakpad and consumed by the crash_sender.
-#define BREAKPAD_PRODUCT "BreakpadProduct"
-#define BREAKPAD_PRODUCT_DISPLAY "BreakpadProductDisplay"
-#define BREAKPAD_VERSION "BreakpadVersion"
-#define BREAKPAD_VENDOR "BreakpadVendor"
-#define BREAKPAD_URL "BreakpadURL"
-#define BREAKPAD_REPORT_INTERVAL "BreakpadReportInterval"
-#define BREAKPAD_SKIP_CONFIRM "BreakpadSkipConfirm"
-#define BREAKPAD_CONFIRM_TIMEOUT "BreakpadConfirmTimeout"
-#define BREAKPAD_SEND_AND_EXIT "BreakpadSendAndExit"
-#define BREAKPAD_DUMP_DIRECTORY "BreakpadMinidumpLocation"
-#define BREAKPAD_INSPECTOR_LOCATION "BreakpadInspectorLocation"
-#define BREAKPAD_REPORTER_EXE_LOCATION \
- "BreakpadReporterExeLocation"
-#define BREAKPAD_LOGFILES "BreakpadLogFiles"
-#define BREAKPAD_LOGFILE_UPLOAD_SIZE "BreakpadLogFileTailSize"
-#define BREAKPAD_REQUEST_COMMENTS "BreakpadRequestComments"
-#define BREAKPAD_COMMENTS "BreakpadComments"
-#define BREAKPAD_REQUEST_EMAIL "BreakpadRequestEmail"
-#define BREAKPAD_EMAIL "BreakpadEmail"
-#define BREAKPAD_SERVER_TYPE "BreakpadServerType"
-#define BREAKPAD_SERVER_PARAMETER_DICT "BreakpadServerParameters"
-
-// The keys below are NOT user supplied, and are used internally.
-#define BREAKPAD_PROCESS_START_TIME "BreakpadProcStartTime"
-#define BREAKPAD_PROCESS_UP_TIME "BreakpadProcessUpTime"
-#define BREAKPAD_PROCESS_CRASH_TIME "BreakpadProcessCrashTime"
-#define BREAKPAD_LOGFILE_KEY_PREFIX "BreakpadAppLogFile"
-#define BREAKPAD_SERVER_PARAMETER_PREFIX "BreakpadServerParameterPrefix_"
-#define BREAKPAD_ON_DEMAND "BreakpadOnDemand"
-
-// A service name associated with the original bootstrap parent port, saved in
-// OnDemandServer and restored in Inspector.
-#define BREAKPAD_BOOTSTRAP_PARENT_PORT "com.Breakpad.BootstrapParent"
+#include <Breakpad/BreakpadDefines.h>
// Optional user-defined function to dec to decide if we should handle
// this crash or forward it along.
diff --git a/src/client/mac/Framework/Breakpad.mm b/src/client/mac/Framework/Breakpad.mm
index 12b5f283..b25665ab 100644
--- a/src/client/mac/Framework/Breakpad.mm
+++ b/src/client/mac/Framework/Breakpad.mm
@@ -39,20 +39,19 @@
#define DEBUGLOG if (gDebugLog) fprintf
#define IGNORE_DEBUGGER "BREAKPAD_IGNORE_DEBUGGER"
-#import "common/mac/MachIPC.h"
-#import "common/mac/SimpleStringDictionary.h"
-
-#import "client/mac/crash_generation/Inspector.h"
-#import "client/mac/handler/exception_handler.h"
#import "client/mac/Framework/Breakpad.h"
-#import "client/mac/Framework/OnDemandServer.h"
-#import "client/mac/handler/protected_memory_allocator.h"
+#import <Foundation/Foundation.h>
#import <sys/stat.h>
#import <sys/sysctl.h>
-#import <Foundation/Foundation.h>
-
+#import "client/mac/crash_generation/Inspector.h"
+#import "client/mac/handler/exception_handler.h"
+#import "client/mac/Framework/BreakpadDefines.h"
+#import "client/mac/Framework/OnDemandServer.h"
+#import "client/mac/handler/protected_memory_allocator.h"
+#import "common/mac/MachIPC.h"
+#import "common/mac/SimpleStringDictionary.h"
using google_breakpad::KeyValueEntry;
using google_breakpad::MachPortSender;
diff --git a/src/client/mac/Framework/BreakpadDefines.h b/src/client/mac/Framework/BreakpadDefines.h
new file mode 100644
index 00000000..8986cd1b
--- /dev/null
+++ b/src/client/mac/Framework/BreakpadDefines.h
@@ -0,0 +1,72 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Keys for configuration file
+#define kReporterMinidumpDirectoryKey "MinidumpDir"
+#define kReporterMinidumpIDKey "MinidumpID"
+
+// Filename for recording uploaded IDs
+#define kReporterLogFilename "uploads.log"
+
+// The default subdirectory of the Library to put crash dumps in
+// The subdirectory is
+// ~/Library/<kDefaultLibrarySubdirectory>/<GoogleBreakpadProduct>
+#define kDefaultLibrarySubdirectory "Breakpad"
+
+// Specify some special keys to be used in the configuration file that is
+// generated by Breakpad and consumed by the crash_sender.
+#define BREAKPAD_PRODUCT "BreakpadProduct"
+#define BREAKPAD_PRODUCT_DISPLAY "BreakpadProductDisplay"
+#define BREAKPAD_VERSION "BreakpadVersion"
+#define BREAKPAD_VENDOR "BreakpadVendor"
+#define BREAKPAD_URL "BreakpadURL"
+#define BREAKPAD_REPORT_INTERVAL "BreakpadReportInterval"
+#define BREAKPAD_SKIP_CONFIRM "BreakpadSkipConfirm"
+#define BREAKPAD_CONFIRM_TIMEOUT "BreakpadConfirmTimeout"
+#define BREAKPAD_SEND_AND_EXIT "BreakpadSendAndExit"
+#define BREAKPAD_DUMP_DIRECTORY "BreakpadMinidumpLocation"
+#define BREAKPAD_INSPECTOR_LOCATION "BreakpadInspectorLocation"
+#define BREAKPAD_REPORTER_EXE_LOCATION \
+ "BreakpadReporterExeLocation"
+#define BREAKPAD_LOGFILES "BreakpadLogFiles"
+#define BREAKPAD_LOGFILE_UPLOAD_SIZE "BreakpadLogFileTailSize"
+#define BREAKPAD_REQUEST_COMMENTS "BreakpadRequestComments"
+#define BREAKPAD_COMMENTS "BreakpadComments"
+#define BREAKPAD_REQUEST_EMAIL "BreakpadRequestEmail"
+#define BREAKPAD_EMAIL "BreakpadEmail"
+#define BREAKPAD_SERVER_TYPE "BreakpadServerType"
+#define BREAKPAD_SERVER_PARAMETER_DICT "BreakpadServerParameters"
+
+// The keys below are NOT user supplied, and are used internally.
+#define BREAKPAD_PROCESS_START_TIME "BreakpadProcStartTime"
+#define BREAKPAD_PROCESS_UP_TIME "BreakpadProcessUpTime"
+#define BREAKPAD_PROCESS_CRASH_TIME "BreakpadProcessCrashTime"
+#define BREAKPAD_LOGFILE_KEY_PREFIX "BreakpadAppLogFile"
+#define BREAKPAD_SERVER_PARAMETER_PREFIX "BreakpadServerParameterPrefix_"
+#define BREAKPAD_ON_DEMAND "BreakpadOnDemand"
diff --git a/src/client/mac/crash_generation/ConfigFile.mm b/src/client/mac/crash_generation/ConfigFile.mm
index 376b8797..933d3802 100644
--- a/src/client/mac/crash_generation/ConfigFile.mm
+++ b/src/client/mac/crash_generation/ConfigFile.mm
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <sys/time.h>
-#import "client/mac/Framework/Breakpad.h"
+#import "client/mac/Framework/BreakpadDefines.h"
#import "common/mac/SimpleStringDictionary.h"
#import "GTMDefines.h"
diff --git a/src/client/mac/sender/crash_report_sender.h b/src/client/mac/sender/crash_report_sender.h
index cff83fb4..6a29d48a 100644
--- a/src/client/mac/sender/crash_report_sender.h
+++ b/src/client/mac/sender/crash_report_sender.h
@@ -32,7 +32,7 @@
// It will perform throttling based on the parameters passed to it and will
// prompt the user to send the minidump.
-#include <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
#include "client/mac/sender/uploader.h"
#import "GTMDefines.h"
diff --git a/src/client/mac/sender/crash_report_sender.m b/src/client/mac/sender/crash_report_sender.m
index 155a9bf4..3197007a 100644
--- a/src/client/mac/sender/crash_report_sender.m
+++ b/src/client/mac/sender/crash_report_sender.m
@@ -27,17 +27,17 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#import <pwd.h>
-#import <sys/stat.h>
-#import <unistd.h>
+#import "client/mac/sender/crash_report_sender.h"
#import <Cocoa/Cocoa.h>
+#import <pwd.h>
+#import <sys/stat.h>
#import <SystemConfiguration/SystemConfiguration.h>
+#import <unistd.h>
-#import "common/mac/HTTPMultipartUpload.h"
-
-#import "crash_report_sender.h"
+#import "client/mac/Framework/BreakpadDefines.h"
#import "common/mac/GTMLogger.h"
+#import "common/mac/HTTPMultipartUpload.h"
#define kLastSubmission @"LastSubmission"
diff --git a/src/client/mac/sender/uploader.h b/src/client/mac/sender/uploader.h
index 653bfacd..af1c19fc 100644
--- a/src/client/mac/sender/uploader.h
+++ b/src/client/mac/sender/uploader.h
@@ -34,7 +34,6 @@
#include <Foundation/Foundation.h>
-#include "client/mac/Framework/Breakpad.h"
#import "common/mac/GTMDefines.h"
#define kClientIdPreferenceKey @"clientid"
diff --git a/src/client/mac/sender/uploader.m b/src/client/mac/sender/uploader.m
index 45d98a54..754ba779 100644
--- a/src/client/mac/sender/uploader.m
+++ b/src/client/mac/sender/uploader.m
@@ -35,6 +35,7 @@
#import "common/mac/HTTPMultipartUpload.h"
+#import "client/mac/Framework/BreakpadDefines.h"
#import "client/mac/sender/uploader.h"
#import "common/mac/GTMLogger.h"
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-13 08:26:15 +0000