Skip to content

Instantly share code, notes, and snippets.

@darwin

darwin/gist:284540

Created January 23, 2010 11:12
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save darwin/284540 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save darwin/284540 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.diff
Index: project.pbxproj
===================================================================
--- project.pbxproj (revision 498)
+++ project.pbxproj (working copy)
@@ -17,8 +17,6 @@
F945858A0F78232E009A47BF /* PBXTargetDependency */,
F945858C0F782330009A47BF /* PBXTargetDependency */,
F945858E0F782333009A47BF /* PBXTargetDependency */,
- F94585900F782336009A47BF /* PBXTargetDependency */,
- F93DE3A70F830D1D00608B94 /* PBXTargetDependency */,
F95BB8B3101F94D300AA053B /* PBXTargetDependency */,
F95BB8B5101F94D300AA053B /* PBXTargetDependency */,
F95BB8B7101F94D300AA053B /* PBXTargetDependency */,
@@ -33,6 +31,7 @@
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 */; };
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
+ D62EFBBE110B0A4100BD9C4E /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; };
F91AF5D00FD60393009D8BE2 /* BreakpadFramework_Test.mm in Sources */ = {isa = PBXBuildFile; fileRef = F91AF5CF0FD60393009D8BE2 /* BreakpadFramework_Test.mm */; };
F91AF6210FD60784009D8BE2 /* Breakpad.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
F9286B3A0F7EB25800A4DCC8 /* InspectorMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = F9286B390F7EB25800A4DCC8 /* InspectorMain.mm */; };
@@ -153,13 +152,6 @@
remoteGlobalIDString = F93DE32B0F82C55600608B94;
remoteInfo = handler_test;
};
- F93DE3A60F830D1D00608B94 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = F9C77DD90F7DD5CF0045F7DB;
- remoteInfo = UnitTests;
- };
F94585870F78232B009A47BF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -188,60 +180,53 @@
remoteGlobalIDString = F92C569F0ECE04A7009BE4BA;
remoteInfo = crash_report_sender;
};
- F945858F0F782336009A47BF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = F9C44DA40EF060A8003AEBAA;
- remoteInfo = BreakpadTest;
- };
F95BB884101F949F00AA053B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F95BB87C101F949F00AA053B /* crash_report.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 8DD76FA10486AA7600D96B5E /* crash_report */;
+ remoteGlobalIDString = 8DD76FA10486AA7600D96B5E;
remoteInfo = crash_report;
};
F95BB891101F94AC00AA053B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 8DD76FA10486AA7600D96B5E /* dump_syms */;
+ remoteGlobalIDString = 8DD76FA10486AA7600D96B5E;
remoteInfo = dump_syms;
};
F95BB89E101F94C000AA053B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F95BB894101F94C000AA053B /* symupload.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 8DD76FA10486AA7600D96B5E /* symupload */;
+ remoteGlobalIDString = 8DD76FA10486AA7600D96B5E;
remoteInfo = symupload;
};
F95BB8A0101F94C000AA053B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F95BB894101F94C000AA053B /* symupload.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 9BD835FB0B0544950055103E /* minidump_upload */;
+ remoteGlobalIDString = 9BD835FB0B0544950055103E;
remoteInfo = minidump_upload;
};
F95BB8B2101F94D300AA053B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */;
proxyType = 1;
- remoteGlobalIDString = 8DD76F960486AA7600D96B5E /* dump_syms */;
+ remoteGlobalIDString = 8DD76F960486AA7600D96B5E;
remoteInfo = dump_syms;
};
F95BB8B4101F94D300AA053B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F95BB894101F94C000AA053B /* symupload.xcodeproj */;
proxyType = 1;
- remoteGlobalIDString = 8DD76F960486AA7600D96B5E /* symupload */;
+ remoteGlobalIDString = 8DD76F960486AA7600D96B5E;
remoteInfo = symupload;
};
F95BB8B6101F94D300AA053B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F95BB87C101F949F00AA053B /* crash_report.xcodeproj */;
proxyType = 1;
- remoteGlobalIDString = 8DD76F960486AA7600D96B5E /* crash_report */;
+ remoteGlobalIDString = 8DD76F960486AA7600D96B5E;
remoteInfo = crash_report;
};
F9C44E190EF0790F003AEBAA /* PBXContainerItemProxy */ = {
@@ -989,7 +974,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "install_name_tool -id \"@executable_path/../Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
+ shellScript = "install_name_tool -id \"@loader_path/../../../Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
};
F97A0E850ED4EC15008784D3 /* Change install name of breakpadUtilities */ = {
isa = PBXShellScriptBuildPhase;
@@ -1003,7 +988,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#!/bin/bash\ninstall_name_tool -id \"@executable_path/../Frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
+ shellScript = "#!/bin/bash\ninstall_name_tool -id \"@loader_path/../../../../Frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
};
F9C77DD80F7DD5CF0045F7DB /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -1046,6 +1031,7 @@
buildActionMask = 2147483647;
files = (
F92C563F0ECD10CA009BE4BA /* convert_UTF.c in Sources */,
+ D62EFBBE110B0A4100BD9C4E /* breakpad_nlist_64.cc in Sources */,
F92C56400ECD10CA009BE4BA /* dynamic_images.cc in Sources */,
F92C56410ECD10CA009BE4BA /* file_id.cc in Sources */,
F92C56420ECD10CA009BE4BA /* macho_id.cc in Sources */,
@@ -1173,11 +1159,6 @@
target = F93DE32B0F82C55600608B94 /* handler_test */;
targetProxy = F93DE36F0F82CC1300608B94 /* PBXContainerItemProxy */;
};
- F93DE3A70F830D1D00608B94 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = F9C77DD90F7DD5CF0045F7DB /* UnitTests */;
- targetProxy = F93DE3A60F830D1D00608B94 /* PBXContainerItemProxy */;
- };
F94585880F78232B009A47BF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8DC2EF4F0486A6940098B216 /* Breakpad */;
@@ -1198,11 +1179,6 @@
target = F92C569F0ECE04A7009BE4BA /* crash_report_sender */;
targetProxy = F945858D0F782333009A47BF /* PBXContainerItemProxy */;
};
- F94585900F782336009A47BF /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = F9C44DA40EF060A8003AEBAA /* BreakpadTest */;
- targetProxy = F945858F0F782336009A47BF /* PBXContainerItemProxy */;
- };
F95BB8B3101F94D300AA053B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = dump_syms;
@@ -1270,6 +1246,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = (
+ x86_64,
+ i386,
+ );
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -1282,8 +1262,9 @@
GCC_PREFIX_HEADER = Framework/Breakpad_Prefix.pch;
HEADER_SEARCH_PATHS = "../..//**";
INFOPLIST_FILE = Framework/Info.plist;
- INSTALL_PATH = "@executable_path/../Frameworks";
+ INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = Breakpad;
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
WRAPPER_EXTENSION = framework;
};
name = Debug;
@@ -1292,6 +1273,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = (
+ x86_64,
+ i386,
+ );
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -1300,8 +1285,9 @@
GCC_PREFIX_HEADER = Framework/Breakpad_Prefix.pch;
HEADER_SEARCH_PATHS = "../..//**";
INFOPLIST_FILE = Framework/Info.plist;
- INSTALL_PATH = "@executable_path/../Frameworks";
+ INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = Breakpad;
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
WRAPPER_EXTENSION = framework;
};
name = Release;
@@ -1358,6 +1344,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = i386;
COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1389,7 +1376,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = "../..//**";
INSTALL_PATH = /usr/local/lib;
- LD_DYLIB_INSTALL_NAME = "@executable_path/../Resources/$(EXECUTABLE_PATH)";
+ LD_DYLIB_INSTALL_NAME = "@loader_path/../../../Resources/$(EXECUTABLE_PATH)";
OTHER_LDFLAGS = (
"$(inherited)",
"-headerpad_max_install_names",
@@ -1404,6 +1391,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = (
+ i386,
+ x86_64,
+ );
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1412,7 +1403,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = "../..//**";
INSTALL_PATH = /usr/local/lib;
- LD_DYLIB_INSTALL_NAME = "@executable_path/../Resources/$(EXECUTABLE_PATH)";
+ LD_DYLIB_INSTALL_NAME = "@loader_path/../../../Resources/$(EXECUTABLE_PATH)";
OTHER_LDFLAGS = (
"$(inherited)",
"-headerpad_max_install_names",
@@ -1420,6 +1411,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = breakpadUtilities;
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
ZERO_LINK = NO;
};
name = Release;
@@ -1627,7 +1619,7 @@
GCC_PREFIX_HEADER = Framework/Breakpad_Prefix.pch;
HEADER_SEARCH_PATHS = "../..//**";
INFOPLIST_FILE = Framework/Info.plist;
- INSTALL_PATH = "@executable_path/../Frameworks";
+ INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = Breakpad;
WRAPPER_EXTENSION = framework;
};
@@ -1667,7 +1659,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = "../..//**";
INSTALL_PATH = /usr/local/lib;
- LD_DYLIB_INSTALL_NAME = "@executable_path/../Resources/$(EXECUTABLE_PATH)";
+ LD_DYLIB_INSTALL_NAME = "@loader_path/../../../Resources/$(EXECUTABLE_PATH)";
OTHER_LDFLAGS = (
"$(inherited)",
"-headerpad_max_install_names",
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment