Changeset 3755
- Timestamp:
- 10/14/07 15:58:48 (9 months ago)
- Files:
-
- trunk/Additions/NSAttributedStringAdditions.m (modified) (1 diff)
- trunk/Basic.pch (modified) (1 diff)
- trunk/Chat Core.xcodeproj/project.pbxproj (modified) (1 diff)
- trunk/Chat Core/MVDirectClientConnection.m (modified) (3 diffs)
- trunk/Chat Core/MVICBChatConnection.m (modified) (3 diffs)
- trunk/Chat Core/MVIRCChatConnection.m (modified) (4 diffs)
- trunk/Chat Core/MVSILCChatConnection.m (modified) (2 diffs)
- trunk/Colloquy.pch (modified) (2 diffs)
- trunk/Colloquy.xcodeproj/project.pbxproj (modified) (18 diffs)
- trunk/Controllers/MVApplicationController.m (modified) (1 diff)
- trunk/Frameworks/Acid/Acid.xcodeproj/project.pbxproj (modified) (1 diff)
- trunk/Frameworks/Acid/jabber/JabberSocket.m (modified) (1 diff)
- trunk/Frameworks/sqlite3.h (added)
- trunk/Inspectors/JVChatRoomInspector.m (modified) (2 diffs)
- trunk/Panels/JVChatTranscriptPanel.h (modified) (2 diffs)
- trunk/Panels/JVChatTranscriptPanel.m (modified) (4 diffs)
- trunk/Panels/JVDirectChatPanel.m (modified) (1 diff)
- trunk/Plug-Ins/AppleScript Support/AppleScript Support.xcodeproj/project.pbxproj (modified) (2 diffs)
- trunk/Plug-Ins/F-Script Support/F-Script Support.xcodeproj/project.pbxproj (modified) (2 diffs)
- trunk/Plug-Ins/JavaScript Support/JavaScript Support.xcodeproj/project.pbxproj (modified) (2 diffs)
- trunk/Plug-Ins/Python Support/Python Support.xcodeproj/project.pbxproj (modified) (2 diffs)
- trunk/Plug-Ins/Ruby Support/Ruby Support.xcodeproj/project.pbxproj (modified) (2 diffs)
- trunk/Plug-Ins/Web Interface/Web Interface.xcodeproj/project.pbxproj (modified) (1 diff)
- trunk/Settings/Common Settings.xcconfig (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Additions/NSAttributedStringAdditions.m
r3516 r3755 105 105 NSParameterAssert( fragment != nil ); 106 106 107 NSMutableDictionary *options = [[NSMutableDictionary allocWithZone:nil] initWithObjectsAndKeys:[NSNumber numberWithInt:1], @"UseWebKit", [NSNumber numberWithUnsignedInt:NSUTF8StringEncoding], NSCharacterEncodingDocumentOption, nil];107 NSMutableDictionary *options = [[NSMutableDictionary allocWithZone:nil] initWithObjectsAndKeys:[NSNumber numberWithInt:1], @"UseWebKit", [NSNumber numberWithUnsignedInt:NSUTF8StringEncoding], @"CharacterEncoding", nil]; 108 108 if( url ) [options setObject:url forKey:@"BaseURL"]; 109 109 trunk/Basic.pch
r3349 r3755 1 1 #ifndef MAC_OS_X_VERSION_10_5 2 2 #define MAC_OS_X_VERSION_10_5 1050 3 #endif 4 5 #ifndef NSAppKitVersionNumber10_3 6 #define NSAppKitVersionNumber10_3 743 3 7 #endif 4 8 trunk/Chat Core.xcodeproj/project.pbxproj
r3750 r3755 828 828 i386, 829 829 ); 830 SDKROOT = "/Developer/SDKs/MacOSX10.4u.sdk";831 830 SYMROOT = build; 832 831 }; trunk/Chat Core/MVDirectClientConnection.m
r3722 r3755 351 351 if( [pool respondsToSelector:@selector( drain )] ) 352 352 [pool drain]; 353 [pool release];353 else [pool release]; 354 354 pool = nil; 355 355 … … 368 368 if( [pool respondsToSelector:@selector( drain )] ) 369 369 [pool drain]; 370 [pool release];370 else [pool release]; 371 371 } 372 372 … … 384 384 if( [pool respondsToSelector:@selector( drain )] ) 385 385 [pool drain]; 386 [pool release];386 else [pool release]; 387 387 } 388 388 @end trunk/Chat Core/MVICBChatConnection.m
r3722 r3755 411 411 if( [pool respondsToSelector:@selector( drain )] ) 412 412 [pool drain]; 413 [pool release];413 else [pool release]; 414 414 pool = nil; 415 415 … … 423 423 if( [pool respondsToSelector:@selector( drain )] ) 424 424 [pool drain]; 425 [pool release];425 else [pool release]; 426 426 } 427 427 … … 439 439 if( [pool respondsToSelector:@selector( drain )] ) 440 440 [pool drain]; 441 [pool release];441 else [pool release]; 442 442 } 443 443 trunk/Chat Core/MVIRCChatConnection.m
r3754 r3755 567 567 if( [pool respondsToSelector:@selector( drain )] ) 568 568 [pool drain]; 569 [pool release];569 else [pool release]; 570 570 pool = nil; 571 571 … … 575 575 if( [pool respondsToSelector:@selector( drain )] ) 576 576 [pool drain]; 577 [pool release];577 else [pool release]; 578 578 } 579 579 … … 588 588 if( [pool respondsToSelector:@selector( drain )] ) 589 589 [pool drain]; 590 [pool release];590 else [pool release]; 591 591 } 592 592 … … 649 649 650 650 NSMutableDictionary *settings = [[NSMutableDictionary allocWithZone:nil] init]; 651 [settings setObject:[NSNumber numberWithBool:YES] forKey: (NSString *)kCFStreamSSLAllowsAnyRoot];652 653 CFReadStreamSetProperty( [sock getCFReadStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings );654 CFWriteStreamSetProperty( [sock getCFWriteStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings );651 [settings setObject:[NSNumber numberWithBool:YES] forKey:@"kCFStreamSSLAllowsAnyRoot"]; 652 653 CFReadStreamSetProperty( [sock getCFReadStream], CFSTR("kCFStreamPropertySSLSettings"), (CFDictionaryRef) settings ); 654 CFWriteStreamSetProperty( [sock getCFWriteStream], CFSTR("kCFStreamPropertySSLSettings"), (CFDictionaryRef) settings ); 655 655 } 656 656 trunk/Chat Core/MVSILCChatConnection.m
r3732 r3755 1454 1454 if( [pool respondsToSelector:@selector( drain )] ) 1455 1455 [pool drain]; 1456 [pool release];1456 else [pool release]; 1457 1457 pool = nil; 1458 1458 … … 1462 1462 if( [pool respondsToSelector:@selector( drain )] ) 1463 1463 [pool drain]; 1464 [pool release];1464 else [pool release]; 1465 1465 } 1466 1466 } trunk/Colloquy.pch
r3349 r3755 1 1 #ifndef MAC_OS_X_VERSION_10_5 2 2 #define MAC_OS_X_VERSION_10_5 1050 3 #endif 4 5 #ifndef NSAppKitVersionNumber10_3 6 #define NSAppKitVersionNumber10_3 743 3 7 #endif 4 8 … … 16 20 #endif 17 21 22 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 18 23 #include <sys/xattr.h> 24 #endif 19 25 20 26 // define these here so they weak link for Panther letting the binary be backwards compatible trunk/Colloquy.xcodeproj/project.pbxproj
r3734 r3755 221 221 1CBC63190548975E009E59E1 /* GeneralPreferences.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CBC63180548975E009E59E1 /* GeneralPreferences.png */; }; 222 222 1CBC634905489BEE009E59E1 /* JVGeneralPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1CBC634705489BEE009E59E1 /* JVGeneralPreferences.nib */; }; 223 1CC1AE630A2987E20000A797 /* sqlite3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CC1AE400A2987230000A797 /* sqlite3.a */; };224 223 1CC1B76F0A2D70DF0000A797 /* super-op.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1B76D0A2D70DF0000A797 /* super-op.png */; }; 225 224 1CC1B77D0A2D70FB0000A797 /* founder.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1B77B0A2D70FB0000A797 /* founder.png */; }; … … 264 263 1CEC004F0A20EF99004C2B86 /* transcriptSchema.sql in Resources */ = {isa = PBXBuildFile; fileRef = 1CEC004D0A20EF95004C2B86 /* transcriptSchema.sql */; }; 265 264 1CEC00540A20F030004C2B86 /* JVSQLChatTranscript.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CEC00530A20F030004C2B86 /* JVSQLChatTranscript.m */; }; 266 1CEC00570A20F05F004C2B86 /* JVSQLChatTranscript.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CEC00530A20F030004C2B86 /* JVSQLChatTranscript.m */; };267 265 1CECE26006A37BEC00350564 /* JVBehaviorPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1CECE22F06A37A8300350564 /* JVBehaviorPreferences.nib */; }; 268 266 1CEE3B010578421400AD6DE2 /* statusAvailable.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CEE3AFE0578421400AD6DE2 /* statusAvailable.png */; }; … … 378 376 remoteGlobalIDString = 8D5B49B6048680CD000E48DA; 379 377 remoteInfo = "Python Support Plugin"; 378 }; 379 1CCE63750CC1FF8400365094 /* PBXContainerItemProxy */ = { 380 isa = PBXContainerItemProxy; 381 containerPortal = 0A60C15F0630D96D00DC6280 /* Chat Core.xcodeproj */; 382 proxyType = 1; 383 remoteGlobalIDString = 1C51B46E052DE0CB00BB459B /* Chat Core (Framework) */; 384 remoteInfo = "Chat Core (Framework)"; 380 385 }; 381 386 1CEEAB15095BD23100166A54 /* PBXContainerItemProxy */ = { … … 1122 1127 1C397391082D4ADA00DCF3CF /* IOKit.framework in Frameworks */, 1123 1128 1CEEAB17095BD23500166A54 /* ChatCore.framework in Frameworks */, 1124 1CC1AE630A2987E20000A797 /* sqlite3.a in Frameworks */,1125 1129 1C2EDD790A3551B70051E9C2 /* Sparkle.framework in Frameworks */, 1126 1130 DDF64DA60BD2B0C3009E8FF6 /* Acid.framework in Frameworks */, … … 1909 1913 ); 1910 1914 dependencies = ( 1915 1CCE63760CC1FF8400365094 /* PBXTargetDependency */, 1911 1916 ); 1912 1917 name = "Standard Commands (Plug-In)"; … … 1990 1995 isa = PBXProject; 1991 1996 attributes = { 1992 BuildIndependentTargetsInParallel = YES;1997 BuildIndependentTargetsInParallel = NO; 1993 1998 }; 1994 1999 buildConfigurationList = 1C041A700854E97700A5A5BA /* Build configuration list for PBXProject "Colloquy" */; … … 2495 2500 1C710A6E09F23AF0007B4515 /* JVSideStatusView.m in Sources */, 2496 2501 1C710A7009F23AF0007B4515 /* JVSideOutlineView.m in Sources */, 2497 1CEC00570A20F05F004C2B86 /* JVSQLChatTranscript.m in Sources */,2498 2502 1C415F270B350CA300239EB3 /* JVToolbarItem.m in Sources */, 2499 2503 DDF034100BD529AE0096B109 /* JVDetailCell.m in Sources */, … … 2542 2546 target = CBF685140820186F00F498FB /* Colloquy (Metadata Importer) */; 2543 2547 targetProxy = 1C7F30000855456D00D41FB0 /* PBXContainerItemProxy */; 2548 }; 2549 1CCE63760CC1FF8400365094 /* PBXTargetDependency */ = { 2550 isa = PBXTargetDependency; 2551 name = "Chat Core (Framework)"; 2552 targetProxy = 1CCE63750CC1FF8400365094 /* PBXContainerItemProxy */; 2544 2553 }; 2545 2554 1CEEAB19095BD24100166A54 /* PBXTargetDependency */ = { … … 3049 3058 buildSettings = { 3050 3059 GCC_PREFIX_HEADER = Colloquy.pch; 3051 HEADER_SEARCH_PATHS = /usr/include/libxml2; 3060 HEADER_SEARCH_PATHS = ( 3061 /usr/include/libxml2, 3062 "$(HEADER_SEARCH_PATHS)", 3063 ); 3052 3064 INFOPLIST_FILE = Resources/Info.plist; 3053 3065 OTHER_LDFLAGS = ( … … 3055 3067 "-lxslt", 3056 3068 "-lexslt", 3069 "-undefined", 3070 dynamic_lookup, 3057 3071 ); 3058 3072 PRODUCT_NAME = Colloquy; … … 3073 3087 buildSettings = { 3074 3088 GCC_PREFIX_HEADER = Colloquy.pch; 3075 HEADER_SEARCH_PATHS = /usr/include/libxml2; 3089 HEADER_SEARCH_PATHS = ( 3090 /usr/include/libxml2, 3091 "$(HEADER_SEARCH_PATHS)", 3092 ); 3076 3093 INFOPLIST_FILE = Resources/Info.plist; 3077 3094 OTHER_LDFLAGS = ( … … 3079 3096 "-lxslt", 3080 3097 "-lexslt", 3098 "-undefined", 3099 dynamic_lookup, 3081 3100 ); 3082 3101 PRODUCT_NAME = Colloquy; … … 3091 3110 HEADER_SEARCH_PATHS = /usr/include/libxml2; 3092 3111 INFOPLIST_FILE = Importer/Info.plist; 3112 MACOSX_DEPLOYMENT_TARGET = 10.4; 3093 3113 OTHER_LDFLAGS = "-lxml2"; 3094 3114 PRODUCT_NAME = Colloquy; 3115 SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; 3116 "SDKROOT[arch=i386]" = /Developer/SDKs/MacOSX10.4u.sdk; 3117 "SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.4u.sdk; 3095 3118 WRAPPER_EXTENSION = mdimporter; 3096 3119 }; … … 3105 3128 OTHER_LDFLAGS = "-lxml2"; 3106 3129 PRODUCT_NAME = Colloquy; 3130 SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; 3131 "SDKROOT[arch=i386]" = /Developer/SDKs/MacOSX10.4u.sdk; 3132 "SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.4u.sdk; 3107 3133 WRAPPER_EXTENSION = mdimporter; 3108 3134 }; … … 3148 3174 buildSettings = { 3149 3175 GCC_PREFIX_HEADER = Colloquy.pch; 3150 HEADER_SEARCH_PATHS = /usr/include/libxml2; 3176 HEADER_SEARCH_PATHS = ( 3177 /usr/include/libxml2, 3178 "$(HEADER_SEARCH_PATHS)", 3179 ); 3151 3180 INFOPLIST_FILE = Resources/Info.plist; 3152 3181 OTHER_LDFLAGS = ( … … 3154 3183 "-lxslt", 3155 3184 "-lexslt", 3185 "-undefined", 3186 dynamic_lookup, 3156 3187 ); 3157 3188 PRODUCT_NAME = Colloquy; … … 3174 3205 HEADER_SEARCH_PATHS = /usr/include/libxml2; 3175 3206 INFOPLIST_FILE = Importer/Info.plist; 3207 MACOSX_DEPLOYMENT_TARGET = 10.4; 3176 3208 OTHER_LDFLAGS = "-lxml2"; 3177 3209 PRODUCT_NAME = Colloquy; 3210 SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; 3211 "SDKROOT[arch=i386]" = /Developer/SDKs/MacOSX10.4u.sdk; 3212 "SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.4u.sdk; 3178 3213 WRAPPER_EXTENSION = mdimporter; 3179 3214 }; … … 3188 3223 i386, 3189 3224 ); 3190 SDKROOT = /Developer/MacOSX10.4u.sdk;3191 3225 SYMROOT = build; 3192 3226 }; trunk/Controllers/MVApplicationController.m
r3718 r3755 304 304 NSAppleEventManager *sam = [NSAppleEventManager sharedAppleEventManager]; 305 305 NSAppleEventDescriptor *lastEvent = [sam currentAppleEvent]; 306 searchString = [[lastEvent descriptorForKeyword: keyAESearchText] stringValue];306 searchString = [[lastEvent descriptorForKeyword:'stxt'] stringValue]; 307 307 308 308 JVChatTranscriptPanel *transcript = [[JVChatController defaultController] chatViewControllerForTranscript:filename]; trunk/Frameworks/Acid/Acid.xcodeproj/project.pbxproj
r3750 r3755 519 519 i386, 520 520 ); 521 SDKROOT = "/Developer/SDKs/MacOSX10.4u.sdk";522 521 SYMROOT = ../../build; 523 522 }; trunk/Frameworks/Acid/jabber/JabberSocket.m
r3643 r3755 107 107 108 108 NSMutableDictionary *settings = [[NSMutableDictionary allocWithZone:nil] init]; 109 [settings setObject:[NSNumber numberWithBool:YES] forKey: (NSString *)kCFStreamSSLAllowsAnyRoot];109 [settings setObject:[NSNumber numberWithBool:YES] forKey:@"kCFStreamSSLAllowsAnyRoot"]; 110 110 111 CFReadStreamSetProperty( [sock getCFReadStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings );112 CFWriteStreamSetProperty( [sock getCFWriteStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings );111 CFReadStreamSetProperty( [sock getCFReadStream], CFSTR("kCFStreamPropertySSLSettings"), (CFDictionaryRef) settings ); 112 CFWriteStreamSetProperty( [sock getCFWriteStream], CFSTR("kCFStreamPropertySSLSettings"), (CFDictionaryRef) settings ); 113 113 } 114 114 trunk/Inspectors/JVChatRoomInspector.m
r3651 r3755 97 97 } else { 98 98 NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease]; 99 [formatter setFormatterBehavior: NSDateFormatterBehavior10_4];100 [formatter setDateStyle: NSDateFormatterShortStyle];101 [formatter setTimeStyle: NSDateFormatterShortStyle];99 [formatter setFormatterBehavior:1040]; 100 [formatter setDateStyle:kCFDateFormatterShortStyle]; 101 [formatter setTimeStyle:kCFDateFormatterShortStyle]; 102 102 103 103 if( [[_room target] isJoined] ) … … 279 279 } else { 280 280 NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease]; 281 [formatter setFormatterBehavior: NSDateFormatterBehavior10_4];282 [formatter setDateStyle: NSDateFormatterShortStyle];283 [formatter setTimeStyle: NSDateFormatterShortStyle];281 [formatter setFormatterBehavior:1040]; 282 [formatter setDateStyle:kCFDateFormatterShortStyle]; 283 [formatter setTimeStyle:kCFDateFormatterShortStyle]; 284 284 dateString = [formatter stringFromDate:date]; 285 285 } trunk/Panels/JVChatTranscriptPanel.h
r3418 r3755 7 7 @class JVChatMessage; 8 8 @class JVChatTranscript; 9 @class JVSQLChatTranscript;9 //@class JVSQLChatTranscript; 10 10 11 11 extern NSString *JVToolbarChooseStyleItemIdentifier; … … 24 24 25 25 JVChatTranscript *_transcript; 26 JVSQLChatTranscript *_sqlTestTranscript;26 // JVSQLChatTranscript *_sqlTestTranscript; 27 27 28 28 NSMenu *_styleMenu; trunk/Panels/JVChatTranscriptPanel.m
r3470 r3755 8 8 #import "JVStyleView.h" 9 9 #import "JVChatTranscript.h" 10 #import "JVSQLChatTranscript.h"10 //#import "JVSQLChatTranscript.h" 11 11 #import "JVChatMessage.h" 12 12 #import "MVConnectionsController.h" … … 72 72 } 73 73 74 NSFileHandle *handle = [NSFileHandle fileHandleForReadingAtPath:filename];75 BOOL sqliteFormat = [[NSData dataWithBytes:"SQLite format 3" length:16] isEqualToData:[handle readDataOfLength:16]];76 [handle closeFile];77 78 if( sqliteFormat ) _transcript = [[JVSQLChatTranscript allocWithZone:[self zone]] initWithContentsOfFile:filename];79 else_transcript = [[JVChatTranscript allocWithZone:[self zone]] initWithContentsOfFile:filename];74 // NSFileHandle *handle = [NSFileHandle fileHandleForReadingAtPath:filename]; 75 // BOOL sqliteFormat = [[NSData dataWithBytes:"SQLite format 3" length:16] isEqualToData:[handle readDataOfLength:16]]; 76 // [handle closeFile]; 77 78 // if( sqliteFormat ) _transcript = [[JVSQLChatTranscript allocWithZone:[self zone]] initWithContentsOfFile:filename]; 79 _transcript = [[JVChatTranscript allocWithZone:[self zone]] initWithContentsOfFile:filename]; 80 80 81 81 if( ! _transcript ) { … … 125 125 [_emoticonMenu release]; 126 126 [_transcript release]; 127 [_sqlTestTranscript release];127 // [_sqlTestTranscript release]; 128 128 [_searchQuery release]; 129 129 [_searchQueryRegex release]; … … 133 133 _emoticonMenu = nil; 134 134 _transcript = nil; 135 _sqlTestTranscript = nil;135 // _sqlTestTranscript = nil; 136 136 _searchQuery = nil; 137 137 _searchQueryRegex = nil; trunk/Panels/JVDirectChatPanel.m
r3752 r3755 12 12 #import "JVMarkedScroller.h" 13 13 #import "JVNotificationController.h" 14 #import "JVSQLChatTranscript.h"14 //#import "JVSQLChatTranscript.h" 15 15 #import "JVSpeechController.h" 16 16 #import "JVSplitView.h" trunk/Plug-Ins/AppleScript Support/AppleScript Support.xcodeproj/project.pbxproj
r3586 r3755 161 161 projectDirPath = ""; 162 162 projectRoot = ../..; 163 shouldCheckCompatibility = 1;164 163 targets = ( 165 164 8D5B49AC048680CD000E48DA /* AppleScript Support Plugin */, … … 293 292 i386, 294 293 ); 295 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;296 294 SYMROOT = ../../build; 297 295 }; trunk/Plug-Ins/F-Script Support/F-Script Support.xcodeproj/project.pbxproj
r3586 r3755 180 180 projectDirPath = ""; 181 181 projectRoot = ../..; 182 shouldCheckCompatibility = 1;183 182 targets = ( 184 183 8D5B49AC048680CD000E48DA /* F-Script Support Plugin */, … … 344 343 i386, 345 344 ); 346 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;347 345 SYMROOT = ../../build; 348 346 }; trunk/Plug-Ins/JavaScript Support/JavaScript Support.xcodeproj/project.pbxproj
r3667 r3755 4 4 classes = { 5 5 }; 6 objectVersion = 4 2;6 objectVersion = 44; 7 7 objects = { 8 8 … … 309 309 i386, 310 310 ); 311 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;312 311 SYMROOT = ../../build; 313 312 }; trunk/Plug-Ins/Python Support/Python Support.xcodeproj/project.pbxproj
r3586 r3755 182 182 projectDirPath = ""; 183 183 projectRoot = ../..; 184 shouldCheckCompatibility = 1;185 184 targets = ( 186 185 8D5B49AC048680CD000E48DA /* Python Support Plugin */, … … 340 339 i386, 341 340 ); 342 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;343 341 SYMROOT = ../../build; 344 342 }; trunk/Plug-Ins/Ruby Support/Ruby Support.xcodeproj/project.pbxproj
r3586 r3755 159 159 projectDirPath = ""; 160 160 projectRoot = ../..; 161 shouldCheckCompatibility = 1;162 161 targets = ( 163 162 8D5B49AC048680CD000E48DA /* Ruby Support Plugin */, … … 322 321 i386, 323 322 ); 324 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;325 323 SYMROOT = ../../build; 326 324 }; trunk/Plug-Ins/Web Interface/Web Interface.xcodeproj/project.pbxproj
r3701 r3755 474 474 i386, 475 475 ); 476 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;477 476 }; 478 477 name = "Release (Universal)"; trunk/Settings/Common Settings.xcconfig
r3734 r3755 5 5 DSTROOT = / 6 6 FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Frameworks" "$(HOME)/Library/Frameworks" $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks 7 LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks"8 7 GCC_CW_ASM_SYNTAX = NO 9 8 GCC_C_LANGUAGE_STANDARD = gnu99 … … 14 13 GCC_ENABLE_OBJC_EXCEPTIONS = YES 15 14 GCC_FAST_MATH = YES 16 GCC_FAST_OBJC_DISPATCH = $(GCC_FAST_OBJC_DISPATCH _$(CURRENT_ARCH))17 GCC_FAST_OBJC_DISPATCH _= NO18 GCC_FAST_OBJC_DISPATCH _i386= YES19 GCC_FAST_OBJC_DISPATCH _ppc = NO20 GCC_FAST_OBJC_DISPATCH _ppc970= NO21 GCC_FAST_OBJC_DISPATCH _ppc7400= NO22 GCC_FAST_OBJC_DISPATCH _ppc64 = YES23 GCC_FAST_OBJC_DISPATCH _x86_64= YES15 GCC_FAST_OBJC_DISPATCH = $(GCC_FAST_OBJC_DISPATCH[arch=$(CURRENT_ARCH)]) 16 GCC_FAST_OBJC_DISPATCH[arch=] = NO 17 GCC_FAST_OBJC_DISPATCH[arch=i386] = YES 18 GCC_FAST_OBJC_DISPATCH[arch=ppc64] = YES 19 GCC_FAST_OBJC_DISPATCH[arch=ppc7400] = NO 20 GCC_FAST_OBJC_DISPATCH[arch=ppc970] = NO 21 GCC_FAST_OBJC_DISPATCH[arch=ppc] = NO 22 GCC_FAST_OBJC_DISPATCH[arch=x86_64] = YES 24 23 GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES 25 24 GCC_MODEL_TUNING = G5 … … 36 35 GCC_WARN_SIGN_COMPARE = YES 37 36 GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES 38 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(CURRENT_ARCH)) 39 MACOSX_DEPLOYMENT_TARGET_ = 10.3 40 MACOSX_DEPLOYMENT_TARGET_i386 = 10.4 41 MACOSX_DEPLOYMENT_TARGET_ppc = 10.3 42 MACOSX_DEPLOYMENT_TARGET_ppc970 = 10.3 43 MACOSX_DEPLOYMENT_TARGET_ppc7400 = 10.3 44 MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5 45 MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5 37 HEADER_SEARCH_PATHS = "$(SRCROOT)/Frameworks" 38 LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks" 39 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET[arch=$(CURRENT_ARCH)]) 40 MACOSX_DEPLOYMENT_TARGET[arch=] = 10.3 41 MACOSX_DEPLOYMENT_TARGET[arch=i386] = 10.4 42 MACOSX_DEPLOYMENT_TARGET[arch=ppc64] = 10.5 43 MACOSX_DEPLOYMENT_TARGET[arch=ppc7400] = 10.3 44 MACOSX_DEPLOYMENT_TARGET[arch=ppc970] = 10.3 45 MACOSX_DEPLOYMENT_TARGET[arch=ppc] = 10.3 46 MACOSX_DEPLOYMENT_TARGET[arch=x86_64] = 10.5 46 47 ONLY_LINK_ESSENTIAL_SYMBOLS = YES 47 48 OTHER_CFLAGS = -fconstant-cfstrings 48 49 PREBINDING = NO 49 50 PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO 51 SDKROOT = $(SDKROOT[arch=$(CURRENT_ARCH)]) 52 SDKROOT[arch=] = /Developer/SDKs/MacOSX10.3.9.sdk 53 SDKROOT[arch=i386] = /Developer/SDKs/MacOSX10.4u.sdk 54 SDKROOT[arch=ppc64] = /Developer/SDKs/MacOSX10.5.sdk 55 SDKROOT[arch=ppc7400] = /Developer/SDKs/MacOSX10.3.9.sdk 56 SDKROOT[arch=ppc970] = /Developer/SDKs/MacOSX10.3.9.sdk 57 SDKROOT[arch=ppc] = /Developer/SDKs/MacOSX10.3.9.sdk 58 SDKROOT[arch=x86_64] = /Developer/SDKs/MacOSX10.5.sdk 50 59 STRIP_INSTALLED_PRODUCT = NO 51 60 VALID_ARCHS = i386 ppc ppc970 ppc7400
