aboutsummaryrefslogtreecommitdiff
path: root/src/client/mac
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/mac')
-rw-r--r--src/client/mac/Breakpad.xcodeproj/project.pbxproj26
-rw-r--r--src/client/mac/Framework/Breakpad.mm2
-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.m2
-rw-r--r--src/client/mac/sender/uploader.mm2
6 files changed, 26 insertions, 80 deletions
diff --git a/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
index 9fffcc3e..6cc78027 100644
--- a/src/client/mac/Breakpad.xcodeproj/project.pbxproj
+++ b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
@@ -38,7 +38,7 @@
163201D61443019E00C4DBF5 /* ConfigFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 163201D41443019E00C4DBF5 /* ConfigFile.h */; };
163201D71443019E00C4DBF5 /* ConfigFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 163201D51443019E00C4DBF5 /* ConfigFile.mm */; };
163201E31443029300C4DBF5 /* ConfigFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 163201D51443019E00C4DBF5 /* ConfigFile.mm */; };
- 1632058314442E9000C4DBF5 /* BreakpadDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 1632058214442E9000C4DBF5 /* BreakpadDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 16C7C918147D45AE00776EAD /* BreakpadDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 16C7C917147D45AE00776EAD /* BreakpadDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
16E02DB8147410F0008C604D /* uploader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 16E02DB4147410D4008C604D /* uploader.mm */; };
3329D4ED0FA16D820007BBC5 /* Breakpad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3329D4EC0FA16D820007BBC5 /* Breakpad.xib */; };
33880C800F9E097100817F82 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 33880C7E0F9E097100817F82 /* InfoPlist.strings */; };
@@ -552,7 +552,7 @@
163201D41443019E00C4DBF5 /* ConfigFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConfigFile.h; path = crash_generation/ConfigFile.h; sourceTree = "<group>"; };
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>"; };
- 1632058214442E9000C4DBF5 /* BreakpadDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BreakpadDefines.h; path = Framework/BreakpadDefines.h; sourceTree = "<group>"; };
+ 16C7C917147D45AE00776EAD /* BreakpadDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BreakpadDefines.h; sourceTree = "<group>"; };
16E02DB4147410D4008C604D /* uploader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = uploader.mm; path = sender/uploader.mm; 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>"; };
@@ -858,6 +858,23 @@
name = Frameworks;
sourceTree = "<group>";
};
+ 16C7C915147D45AE00776EAD /* apple */ = {
+ isa = PBXGroup;
+ children = (
+ 16C7C916147D45AE00776EAD /* Framework */,
+ );
+ name = apple;
+ path = ../apple;
+ sourceTree = SOURCE_ROOT;
+ };
+ 16C7C916147D45AE00776EAD /* Framework */ = {
+ isa = PBXGroup;
+ children = (
+ 16C7C917147D45AE00776EAD /* BreakpadDefines.h */,
+ );
+ path = Framework;
+ sourceTree = "<group>";
+ };
D244536912426EE7009BBCE0 /* processor */ = {
isa = PBXGroup;
children = (
@@ -943,6 +960,7 @@
F92C538D0ECCE6F2009BE4BA /* client */ = {
isa = PBXGroup;
children = (
+ 16C7C915147D45AE00776EAD /* apple */,
F92C53990ECCE78E009BE4BA /* mac */,
F92C538E0ECCE70A009BE4BA /* minidump_file_writer-inl.h */,
F92C538F0ECCE70A009BE4BA /* minidump_file_writer.cc */,
@@ -985,7 +1003,6 @@
F92C55CD0ECD0053009BE4BA /* Framework */ = {
isa = PBXGroup;
children = (
- 1632058214442E9000C4DBF5 /* BreakpadDefines.h */,
F945859D0F78241E009A47BF /* Info.plist */,
F92C56310ECD0DF1009BE4BA /* OnDemandServer.h */,
F92C56320ECD0DF1009BE4BA /* OnDemandServer.mm */,
@@ -1108,13 +1125,13 @@
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 */,
D2F9A4CA121336C7002747C1 /* crash_generation_client.h in Headers */,
D2F9A4CC121336C7002747C1 /* crash_generation_server.h in Headers */,
163201D61443019E00C4DBF5 /* ConfigFile.h in Headers */,
+ 16C7C918147D45AE00776EAD /* BreakpadDefines.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1359,6 +1376,7 @@
isa = PBXProject;
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Breakpad" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
diff --git a/src/client/mac/Framework/Breakpad.mm b/src/client/mac/Framework/Breakpad.mm
index b25665ab..2817f380 100644
--- a/src/client/mac/Framework/Breakpad.mm
+++ b/src/client/mac/Framework/Breakpad.mm
@@ -47,7 +47,7 @@
#import "client/mac/crash_generation/Inspector.h"
#import "client/mac/handler/exception_handler.h"
-#import "client/mac/Framework/BreakpadDefines.h"
+#import "client/mac/Framework/Breakpad.h"
#import "client/mac/Framework/OnDemandServer.h"
#import "client/mac/handler/protected_memory_allocator.h"
#import "common/mac/MachIPC.h"
diff --git a/src/client/mac/Framework/BreakpadDefines.h b/src/client/mac/Framework/BreakpadDefines.h
deleted file mode 100644
index 8986cd1b..00000000
--- a/src/client/mac/Framework/BreakpadDefines.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// 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 933d3802..315d07f9 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/BreakpadDefines.h"
+#import "client/apple/Framework/BreakpadDefines.h"
#import "common/mac/SimpleStringDictionary.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 3197007a..c591f0ca 100644
--- a/src/client/mac/sender/crash_report_sender.m
+++ b/src/client/mac/sender/crash_report_sender.m
@@ -35,7 +35,7 @@
#import <SystemConfiguration/SystemConfiguration.h>
#import <unistd.h>
-#import "client/mac/Framework/BreakpadDefines.h"
+#import "client/apple/Framework/BreakpadDefines.h"
#import "common/mac/GTMLogger.h"
#import "common/mac/HTTPMultipartUpload.h"
diff --git a/src/client/mac/sender/uploader.mm b/src/client/mac/sender/uploader.mm
index 0e084fb1..7f4b2d3c 100644
--- a/src/client/mac/sender/uploader.mm
+++ b/src/client/mac/sender/uploader.mm
@@ -37,7 +37,7 @@
#import "common/mac/HTTPMultipartUpload.h"
-#import "client/mac/Framework/BreakpadDefines.h"
+#import "client/apple/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-11-09 15:06:30 +0000