Permalink
Browse files

Update project for compatibility with Xcode 3.2 or later; add Xcode 4…

… user data to .gitignore.

In particular, the way Sparkle is linked no longer depends on the build directory layout.
  • Loading branch information...
1 parent be9fa52 commit 131cc069ae17e49165f5cf9b7184077d040b535d @nriley committed Oct 30, 2011
Showing with 133 additions and 23 deletions.
  1. +1 −0 .gitignore
  2. +132 −23 Source/Pester.xcodeproj/project.pbxproj
View
@@ -1,5 +1,6 @@
build
_build
+xcuserdata
.DS_Store
*.pbxuser
*.perspectivev3
@@ -3,10 +3,11 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 44;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
+ 722B9F6213DCF616000E0C3D /* Sparkle.framework in Copy Growl.framework & Sparkle.framework */ = {isa = PBXBuildFile; fileRef = 722B9F5713DCF2B6000E0C3D /* Sparkle.framework */; };
E102D848116EB43A00207746 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E102D847116EB43A00207746 /* AudioToolbox.framework */; };
E102D84A116EB43A00207746 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E102D849116EB43A00207746 /* AudioUnit.framework */; };
E102D876116EB73100207746 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E102D875116EB73100207746 /* ApplicationServices.framework */; };
@@ -22,8 +23,6 @@
E14AFF2F11357B6100DC7922 /* Manip in Resources */ = {isa = PBXBuildFile; fileRef = E14AFF2C11357B6100DC7922 /* Manip */; };
E14AFF3011357B6500DC7922 /* Manip in Copy Perl Modules */ = {isa = PBXBuildFile; fileRef = E14AFF2C11357B6100DC7922 /* Manip */; };
E15044670CFCDC7E00DE47E9 /* NJRValidatingField.m in Sources */ = {isa = PBXBuildFile; fileRef = E15044660CFCDC7E00DE47E9 /* NJRValidatingField.m */; };
- E17562620CF8C50B00FC5057 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E17562610CF8C50B00FC5057 /* Sparkle.framework */; };
- E17562720CF8C53F00FC5057 /* Sparkle.framework in Copy Growl.framework & Sparkle.framework */ = {isa = PBXBuildFile; fileRef = E17562610CF8C50B00FC5057 /* Sparkle.framework */; };
E17CA9AB0CF7F8CB00018B34 /* Manip.pm in Copy Perl Modules */ = {isa = PBXBuildFile; fileRef = E17CA9A90CF7F8C200018B34 /* Manip.pm */; };
E18A26371145D41400E27A11 /* NJRSoundDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = E18A26361145D41400E27A11 /* NJRSoundDevice.m */; };
E18E8230113CC5C300687310 /* PSDateFieldEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = E18E822F113CC5C300687310 /* PSDateFieldEditor.m */; };
@@ -121,9 +120,52 @@
E1B121B40CF639A1004975AA /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1B121B30CF639A1004975AA /* QTKit.framework */; };
E1D94C8A11473CBA00C88B55 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1D94C8911473CBA00C88B55 /* QuickTime.framework */; };
E1DE3C15115930BD00C17BB0 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E1DE3C13115930BD00C17BB0 /* Localizable.strings */; };
+ E1E0EFEA145DF20100C421D4 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 722B9F5713DCF2B6000E0C3D /* Sparkle.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
+ 722B9F5613DCF2B6000E0C3D /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
+ remoteInfo = Sparkle;
+ };
+ 722B9F5813DCF2B6000E0C3D /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 61B5F90209C4CEE200B25A18;
+ remoteInfo = "Sparkle Test App";
+ };
+ 722B9F5A13DCF2B6000E0C3D /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = DAAEFC960DA571DF0051E0D0;
+ remoteInfo = "relaunch tool";
+ };
+ 722B9F5C13DCF2B6000E0C3D /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 612279D90DB5470200AB99EA;
+ remoteInfo = "Sparkle Unit Tests";
+ };
+ 722B9F5E13DCF2B6000E0C3D /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 5D06E8D00FD68C7C005AE3F6;
+ remoteInfo = BinaryDelta;
+ };
+ 722B9F6013DCF331000E0C3D /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+ remoteInfo = Sparkle;
+ };
E19857A0104F69150082AC3E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -141,7 +183,7 @@
dstSubfolderSpec = 10;
files = (
E11BE34412239B7A00240657 /* Growl.framework in Copy Growl.framework & Sparkle.framework */,
- E17562720CF8C53F00FC5057 /* Sparkle.framework in Copy Growl.framework & Sparkle.framework */,
+ 722B9F6213DCF616000E0C3D /* Sparkle.framework in Copy Growl.framework & Sparkle.framework */,
);
name = "Copy Growl.framework & Sparkle.framework";
runOnlyForDeploymentPostprocessing = 0;
@@ -167,6 +209,7 @@
29B97319FDCFA39411CA2CEA /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = en.lproj/MainMenu.nib; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+ 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = Sparkle/Sparkle.xcodeproj; sourceTree = "<group>"; };
E102D847116EB43A00207746 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
E102D849116EB43A00207746 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
E102D875116EB73100207746 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
@@ -217,7 +260,6 @@
E162698A03B6190B00000028 /* NSCalendarDate-NJRExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSCalendarDate-NJRExtensions.m"; sourceTree = "<group>"; };
E16959290437A4A400050002 /* NSFont-NJRExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFont-NJRExtensions.h"; sourceTree = "<group>"; };
E169592A0437A4A400050002 /* NSFont-NJRExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFont-NJRExtensions.m"; sourceTree = "<group>"; };
- E17562610CF8C50B00FC5057 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Sparkle/build/Release/Sparkle.framework; sourceTree = "<group>"; };
E17562BD0CF8E7D000FC5057 /* updates.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = updates.xml; path = ../Updates/updates.xml; sourceTree = SOURCE_ROOT; };
E17562BE0CF8E7D000FC5057 /* release-notes.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "release-notes.html"; path = "../Updates/release-notes.html"; sourceTree = SOURCE_ROOT; };
E17562BF0CF8E7D000FC5057 /* release-notes.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = "release-notes.css"; path = "../Updates/release-notes.css"; sourceTree = SOURCE_ROOT; };
@@ -377,12 +419,12 @@
E1B11F830CF5F30F004975AA /* IOKit.framework in Frameworks */,
E1B11F840CF5F30F004975AA /* CoreAudio.framework in Frameworks */,
E1B121B40CF639A1004975AA /* QTKit.framework in Frameworks */,
- E17562620CF8C50B00FC5057 /* Sparkle.framework in Frameworks */,
E1D94C8A11473CBA00C88B55 /* QuickTime.framework in Frameworks */,
E102D848116EB43A00207746 /* AudioToolbox.framework in Frameworks */,
E102D84A116EB43A00207746 /* AudioUnit.framework in Frameworks */,
E102D876116EB73100207746 /* ApplicationServices.framework in Frameworks */,
E11BE21912238E2400240657 /* Growl.framework in Frameworks */,
+ E1E0EFEA145DF20100C421D4 /* Sparkle.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -417,7 +459,6 @@
E1D94C8911473CBA00C88B55 /* QuickTime.framework */,
E1B121B30CF639A1004975AA /* QTKit.framework */,
E14DB31203B8038300000028 /* IOKit.framework */,
- E17562610CF8C50B00FC5057 /* Sparkle.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";
@@ -454,6 +495,7 @@
);
name = Pester;
sourceTree = "<group>";
+ tabWidth = 8;
};
29B97315FDCFA39411CA2CEA /* Other Sources */ = {
isa = PBXGroup;
@@ -499,6 +541,18 @@
name = Frameworks;
sourceTree = "<group>";
};
+ 722B9F4A13DCF2B6000E0C3D /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 722B9F5713DCF2B6000E0C3D /* Sparkle.framework */,
+ 722B9F5913DCF2B6000E0C3D /* Sparkle Test App.app */,
+ 722B9F5B13DCF2B6000E0C3D /* relaunch */,
+ 722B9F5D13DCF2B6000E0C3D /* Sparkle Unit Tests.octest */,
+ 722B9F5F13DCF2B6000E0C3D /* BinaryDelta */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
E162698703B6189D00000028 /* Categories */ = {
isa = PBXGroup;
children = (
@@ -530,6 +584,7 @@
E17562BC0CF8E7A800FC5057 /* Sparkle */ = {
isa = PBXGroup;
children = (
+ 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */,
E17562BD0CF8E7D000FC5057 /* updates.xml */,
E17562BE0CF8E7D000FC5057 /* release-notes.html */,
E17562BF0CF8E7D000FC5057 /* release-notes.css */,
@@ -779,6 +834,7 @@
buildRules = (
);
dependencies = (
+ 722B9F6113DCF331000E0C3D /* PBXTargetDependency */,
E19857A1104F69150082AC3E /* PBXTargetDependency */,
);
name = Pester;
@@ -792,8 +848,11 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0420;
+ };
buildConfigurationList = E1B11EDA0CF5F2EB004975AA /* Build configuration list for PBXProject "Pester" */;
- compatibilityVersion = "Xcode 3.0";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = en;
hasScannedForEncodings = 1;
knownRegions = (
@@ -808,6 +867,12 @@
);
mainGroup = 29B97314FDCFA39411CA2CEA /* Pester */;
projectDirPath = "";
+ projectReferences = (
+ {
+ ProductGroup = 722B9F4A13DCF2B6000E0C3D /* Products */;
+ ProjectRef = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
+ },
+ );
projectRoot = "";
targets = (
E1B11EE30CF5F30F004975AA /* Pester */,
@@ -816,6 +881,44 @@
};
/* End PBXProject section */
+/* Begin PBXReferenceProxy section */
+ 722B9F5713DCF2B6000E0C3D /* Sparkle.framework */ = {
+ isa = PBXReferenceProxy;
+ fileType = wrapper.framework;
+ path = Sparkle.framework;
+ remoteRef = 722B9F5613DCF2B6000E0C3D /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 722B9F5913DCF2B6000E0C3D /* Sparkle Test App.app */ = {
+ isa = PBXReferenceProxy;
+ fileType = wrapper.application;
+ path = "Sparkle Test App.app";
+ remoteRef = 722B9F5813DCF2B6000E0C3D /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 722B9F5B13DCF2B6000E0C3D /* relaunch */ = {
+ isa = PBXReferenceProxy;
+ fileType = "compiled.mach-o.executable";
+ path = relaunch;
+ remoteRef = 722B9F5A13DCF2B6000E0C3D /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 722B9F5D13DCF2B6000E0C3D /* Sparkle Unit Tests.octest */ = {
+ isa = PBXReferenceProxy;
+ fileType = wrapper.cfbundle;
+ path = "Sparkle Unit Tests.octest";
+ remoteRef = 722B9F5C13DCF2B6000E0C3D /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 722B9F5F13DCF2B6000E0C3D /* BinaryDelta */ = {
+ isa = PBXReferenceProxy;
+ fileType = "compiled.mach-o.executable";
+ path = BinaryDelta;
+ remoteRef = 722B9F5E13DCF2B6000E0C3D /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+/* End PBXReferenceProxy section */
+
/* Begin PBXResourcesBuildPhase section */
E1B11F260CF5F30F004975AA /* Resources */ = {
isa = PBXResourcesBuildPhase;
@@ -942,6 +1045,11 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
+ 722B9F6113DCF331000E0C3D /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = Sparkle;
+ targetProxy = 722B9F6013DCF331000E0C3D /* PBXContainerItemProxy */;
+ };
E19857A1104F69150082AC3E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E1985794104F68EC0082AC3E /* ParseDate-10.6 */;
@@ -1070,11 +1178,9 @@
EXECUTABLE_PREFIX = lib;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
- LIBRARY_SEARCH_PATHS = (
- /System/Library/Perl/lib/5.10,
- "/System/Library/Perl/5.10.0/darwin-thread-multi-2level/auto/DynaLoader",
- );
+ HEADER_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
PRODUCT_NAME = "ParseDate-10.6";
+ USER_HEADER_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
};
name = Debug;
};
@@ -1084,16 +1190,17 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
EXECUTABLE_PREFIX = lib;
+ HEADER_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
PRODUCT_NAME = "ParseDate-10.6";
SKIP_INSTALL = YES;
+ USER_HEADER_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
};
name = Release;
};
E1B11ED40CF5F2EB004975AA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1108,18 +1215,18 @@
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "/System/Library/Perl/5.10.0/darwin-thread-multi-2level/CORE";
- LIBRARY_SEARCH_PATHS = /System/Library/Perl/lib/5.10;
+ LIBRARY_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
MACOSX_DEPLOYMENT_TARGET = 10.6;
OTHER_LDFLAGS = "-lperl";
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
+ SDKROOT = macosx10.6;
+ VALID_ARCHS = i386;
};
name = Debug;
};
E1B11ED50CF5F2EB004975AA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1134,11 +1241,12 @@
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "/System/Library/Perl/5.10.0/darwin-thread-multi-2level/CORE";
- LIBRARY_SEARCH_PATHS = /System/Library/Perl/lib/5.10;
+ LIBRARY_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
MACOSX_DEPLOYMENT_TARGET = 10.6;
OTHER_LDFLAGS = "-lperl";
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
+ SDKROOT = macosx10.6;
STRIP_INSTALLED_PRODUCT = NO;
+ VALID_ARCHS = i386;
};
name = Release;
};
@@ -1147,16 +1255,17 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 46;
- FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Sparkle/build/Release";
GCC_DYNAMIC_NO_PIC = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Pester_Prefix.h;
GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ HEADER_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
INFOPLIST_FILE = "Info-Pester.plist";
INSTALL_PATH = /;
+ LIBRARY_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
PRODUCT_NAME = Pester;
VERSIONING_SYSTEM = "apple-generic";
WARNING_CFLAGS = (
@@ -1172,14 +1281,14 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 46;
- FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Sparkle/build/Release";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Pester_Prefix.h;
GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ HEADER_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
INFOPLIST_FILE = "Info-Pester.plist";
INSTALL_PATH = /;
- LIBRARY_SEARCH_PATHS = "$(inherited)";
+ LIBRARY_SEARCH_PATHS = "/System/Library/Perl/5.10/darwin-thread-multi-2level/CORE";
PRODUCT_NAME = Pester;
VERSIONING_SYSTEM = "apple-generic";
WARNING_CFLAGS = (

0 comments on commit 131cc06

Please sign in to comment.