Revision: 138196 https://trac.macports.org/changeset/138196 Author: ksammons@macports.org Date: 2015-07-01 13:07:24 -0700 (Wed, 01 Jul 2015) Log Message: ----------- GSoC Pallet Branch: Removed Growl dependancy, fixed and updated the linking (thanks neverpanic), and older changes Modified Paths: -------------- branches/gsoc15-pallet/MacPorts_Framework/BetterAuthorizationSampleLib.c branches/gsoc15-pallet/MacPorts_Framework/MPHelperTool.m branches/gsoc15-pallet/MacPorts_Framework/MPHelperToolIPCTester.m branches/gsoc15-pallet/MacPorts_Framework/MPInterpreter.m branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m branches/gsoc15-pallet/MacPorts_Framework/MPPort.m branches/gsoc15-pallet/MacPorts_Framework/MPRegistry.m branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj branches/gsoc15-pallet/MacPorts_Framework/init.tcl branches/gsoc15-pallet/MacPorts_Framework/interpInit.tcl branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl branches/gsoc15-pallet/Pallet/MPActionLauncher.h branches/gsoc15-pallet/Pallet/MPActionLauncher.m branches/gsoc15-pallet/Pallet/MPActionsController.m branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.pbxproj branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate Added Paths: ----------- branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcshareddata/ branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcshareddata/MacPorts.Framework.xccheckout branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/ branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/ branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/WorkspaceSettings.xcsettings branches/gsoc15-pallet/MacPorts_Framework/Makefile branches/gsoc15-pallet/Pallet/Makefile branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcdebugger/ branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist Modified: branches/gsoc15-pallet/MacPorts_Framework/BetterAuthorizationSampleLib.c =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/BetterAuthorizationSampleLib.c 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/BetterAuthorizationSampleLib.c 2015-07-01 20:07:24 UTC (rev 138196) @@ -1737,7 +1737,6 @@ #endif // Create the socket and tell it to not generate SIGPIPE. - if (retval == noErr) { fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd == -1) { @@ -1776,7 +1775,9 @@ // Attempt to connect. if (retval == noErr) { + printf("FD: %d Sizeof\n", fd); if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) { + printf("Here: %d", errno); retval = BASErrnoToOSStatus(errno); } } @@ -1786,13 +1787,13 @@ if (retval == noErr) { retval = AuthorizationMakeExternalForm(auth, &extAuth); } - if (retval == noErr) { + if (retval == noErr) { retval = BASErrnoToOSStatus( BASWrite(fd, &extAuth, sizeof(extAuth), NULL) ); } // Write the request. - if (retval == noErr) { + if (retval == noErr) { retval = BASErrnoToOSStatus( BASWriteDictionary(request, fd) ); } Modified: branches/gsoc15-pallet/MacPorts_Framework/MPHelperTool.m =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/MPHelperTool.m 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/MPHelperTool.m 2015-07-01 20:07:24 UTC (rev 138196) @@ -922,32 +922,42 @@ //Add simplelog tcl command Tcl_CreateObjCommand(interpreter, "simplelog", SimpleLog_Command, NULL, NULL); - if (Tcl_PkgProvide(interpreter, "simplelog", "1.0") != TCL_OK) { + if (Tcl_PkgProvide(interpreter, "simplelog", "1.0") != TCL_OK) + { NSLog(@"Error in Tcl_PkgProvide: %s", Tcl_GetStringResult(interpreter)); retval = coreFoundationUnknownErr; //For Dbg CFDictionaryAddValue(response, CFSTR("simplelog"), CFSTR("NO")); } - else { + else + { CFDictionaryAddValue(response, CFSTR("simplelog"), CFSTR("YES")); } //Get path for and load interpInit.tcl file to Tcl Interpreter NSString * interpInitFilePath = (NSString *) (CFStringRef) CFDictionaryGetValue(request, CFSTR(kInterpInitFilePath)); - if (interpInitFilePath == nil) { + if(interpInitFilePath == nil) + { CFDictionaryAddValue(response, CFSTR("interpInitFilePath"), CFSTR("NO")); retval = coreFoundationUnknownErr; } else + { CFDictionaryAddValue(response, CFSTR("interpInitFilePath"), (CFStringRef)interpInitFilePath); - if( Tcl_EvalFile(interpreter, [interpInitFilePath UTF8String]) == TCL_ERROR) { + } + + NSLog(@"FOO TEST 2"); + + if(Tcl_EvalFile(interpreter, [interpInitFilePath UTF8String]) == TCL_ERROR) + { NSLog(@"Error in Tcl_EvalFile init.tcl: %s", Tcl_GetStringResult(interpreter)); Tcl_DeleteInterp(interpreter); retval = coreFoundationUnknownErr; CFDictionaryAddValue(response, CFSTR("interpInit.tcl Evaluation"), CFSTR("NO")); } - else { + else + { CFDictionaryAddValue(response, CFSTR("interpInit.tcl Evaluation"), CFSTR("YES")); } Modified: branches/gsoc15-pallet/MacPorts_Framework/MPHelperToolIPCTester.m =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/MPHelperToolIPCTester.m 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/MPHelperToolIPCTester.m 2015-07-01 20:07:24 UTC (rev 138196) @@ -92,6 +92,7 @@ } -(BOOL) installUninstallManipulation:(NSString *)portName { + NSLog(@"FOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"); BOOL ret = NO; MPRegistry * registry = [MPRegistry sharedRegistry]; Modified: branches/gsoc15-pallet/MacPorts_Framework/MPInterpreter.m =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/MPInterpreter.m 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/MPInterpreter.m 2015-07-01 20:07:24 UTC (rev 138196) @@ -40,7 +40,7 @@ #include "MPHelperNotificationsProtocol.h" static AuthorizationRef internalMacPortsAuthRef; static NSString* GenericPKGPath = @"/Library/Tcl"; -static NSString* PKGPath = @"/opt/local/share/macports/Tcl"; +static NSString* PKGPath = @"/opt/local/libexec/macports/lib/"; static NSTask* aTask; #pragma mark - @@ -187,7 +187,7 @@ -(BOOL) initTclInterpreter:(Tcl_Interp * *)interp withPath:(NSString *)path { BOOL result = NO; *interp = Tcl_CreateInterp(); - + if(*interp == NULL) { NSLog(@"Error in Tcl_CreateInterp, aborting."); return result; @@ -202,26 +202,31 @@ if (path == nil) path = PKGPath; - + /* NSString * mport_fastload = [[@"source [file join \"" stringByAppendingString:path] stringByAppendingString:@"\" macports1.0 macports_fastload.tcl]"]; if(Tcl_Eval(*interp, [mport_fastload UTF8String]) != TCL_OK) { NSLog(@"Error in Tcl_EvalFile macports_fastload.tcl: %s", Tcl_GetStringResult(*interp)); Tcl_DeleteInterp(*interp); return result; - } + }*/ Tcl_CreateObjCommand(*interp, "notifications", Notifications_Command, NULL, NULL); - if (Tcl_PkgProvide(*interp, "notifications", "1.0") != TCL_OK) { + if(Tcl_PkgProvide(*interp, "notifications", "1.0") != TCL_OK) + { NSLog(@"Error in Tcl_PkgProvide: %s", Tcl_GetStringResult(*interp)); Tcl_DeleteInterp(*interp); return result; } - - if( Tcl_EvalFile(*interp, [[[NSBundle bundleWithIdentifier:@"org.macports.frameworks.macports"] + if(Tcl_EvalFile(*interp, [[[NSBundle bundleWithIdentifier:@"org.macports.frameworks.macports"] pathForResource:@"init" - ofType:@"tcl"] UTF8String]) != TCL_OK) { + ofType:@"tcl"] UTF8String]) != TCL_OK) + { + const char * path = [[[NSBundle bundleWithIdentifier:@"org.macports.frameworks.macports"] + pathForResource:@"init" + ofType:@"tcl"] UTF8String]; + //printf("Test: %s", path); NSLog(@"Error in Tcl_EvalFile init.tcl: %s", Tcl_GetStringResult(*interp)); Tcl_DeleteInterp(*interp); return result; @@ -377,19 +382,26 @@ #pragma Port Settings #pragma Utilities -- (NSArray *)arrayFromTclListAsString:(NSString *)list { +- (NSArray *)arrayFromTclListAsString:(NSString *)list +{ NSMutableArray *array; int tclCount; int tclResult; int i; const char **tclElements; + const char * string = [list UTF8String]; tclResult = Tcl_SplitList(_interpreter, [list UTF8String], &tclCount, &tclElements); - if (tclResult == TCL_OK) { + + if (tclResult == TCL_OK) + { array = [[NSMutableArray alloc] initWithCapacity:tclCount]; - for (i = 0; i < tclCount; i++) { + for (i = 0; i < tclCount; i++) + { [array addObject:[NSString stringWithUTF8String:tclElements[i]]]; } - } else { + } + else + { array = [[[NSMutableArray alloc] init] autorelease]; } Tcl_Free((char *)tclElements); @@ -397,7 +409,8 @@ } - (NSDictionary *)dictionaryFromTclListAsString:(NSString *)list { - return [NSDictionary dictionaryWithDictionary:[self mutableDictionaryFromTclListAsString:list]]; + NSDictionary * foo = [NSDictionary dictionaryWithDictionary:[self mutableDictionaryFromTclListAsString:list]]; + return foo; } - (NSMutableDictionary *)mutableDictionaryFromTclListAsString:(NSString *)list { @@ -428,9 +441,9 @@ - (NSString *)evaluateStringAsString:(NSString *)statement error:(NSError**)mportError{ //NSLog(@"Calling evaluateStringAsString with argument %@", statement); + NSLog(@"Statement: %@", statement); + int return_code = Tcl_Eval(_interpreter, [statement UTF8String]); - int return_code = Tcl_Eval(_interpreter, [statement UTF8String]); - //Should I check for (return_code != TCL_Ok && return_code != TCL_RETURN) instead ? if (return_code != TCL_OK) { @@ -458,12 +471,14 @@ NSUnderlyingErrorKey, nil]; errDict = [NSDictionary dictionaryWithObjects:objArray forKeys:keyArray]; if (mportError != NULL) + { *mportError = [[[NSError alloc] initWithDomain:MPFrameworkErrorDomain code:TCL_ERROR userInfo:errDict] autorelease]; + } + return nil; } - return [NSString stringWithUTF8String:Tcl_GetStringResult(_interpreter)]; } @@ -517,6 +532,7 @@ //if ([notificationObject respondsToSelector:@selector(startServerThread)]) { NSThread * cThread = [NSThread currentThread]; + NSLog(@"STARTING SERVER THREAD with previous thread %@", [cThread threadDictionary]); //This is important to note ... the tcl command being executed is saved in the @@ -539,10 +555,6 @@ NSString * interpInitPath = [[NSBundle bundleForClass:[MPInterpreter class]] pathForResource:@"interpInit" ofType:@"tcl"]; - - - - request = [NSDictionary dictionaryWithObjectsAndKeys: @kMPHelperEvaluateTclCommand, @kBASCommandKey, statement, @kTclStringToBeEvaluated, @@ -569,7 +581,8 @@ (CFStringRef) bundleID, NULL); - //NSLog(@"BEFORE Tool Execution request is %@ , response is %@ \n\n", request, response); + NSLog(@"BEFORE Tool Execution request is %@ , response is %@ \n\n", request, response); + err = BASExecuteRequestInHelperTool(internalMacPortsAuthRef, kMPHelperCommandSet, (CFStringRef) bundleID, @@ -580,6 +593,7 @@ result = (NSString *) (CFStringRef) CFDictionaryGetValue(response, CFSTR(kTclStringEvaluationResult)); } else { //Try to recover error + NSLog(@"*****************************************"); failCode = BASDiagnoseFailure(internalMacPortsAuthRef, (CFStringRef) bundleID); @@ -649,7 +663,6 @@ [aTask setLaunchPath:[[NSBundle bundleForClass:[self class]] pathForResource:@"MPPortProcess" ofType:@""]]; [aTask setArguments:args]; [aTask launch]; - NSConnection *notificationsConnection = [NSConnection defaultConnection]; // Vending MPNotifications sharedListener [notificationsConnection setRootObject:[MPNotifications sharedListener]]; Modified: branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m 2015-07-01 20:07:24 UTC (rev 138196) @@ -73,7 +73,8 @@ } + (MPMacPorts *)sharedInstance { - return [self sharedInstanceWithPkgPath:[MPInterpreter PKGPath] portOptions:nil]; + MPMacPorts * test = [self sharedInstanceWithPkgPath:[MPInterpreter PKGPath] portOptions:nil]; + return test; } + (MPMacPorts *)sharedInstanceWithPkgPath:(NSString *)path portOptions:(NSArray *)options { @@ -171,6 +172,13 @@ id key; NSError * sError; + result = [NSMutableDictionary dictionaryWithDictionary: + [interpreter dictionaryFromTclListAsString: + [interpreter evaluateStringAsString:@"puts \"((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((\"" + error:&sError]]]; + + NSLog(@"Resulty De Dulty: %@", result); + result = [NSMutableDictionary dictionaryWithDictionary: [interpreter dictionaryFromTclListAsString: [interpreter evaluateStringAsString:@"return [mportlistall]" @@ -186,16 +194,20 @@ return [NSDictionary dictionaryWithDictionary:newResult]; } -- (NSDictionary *)search:(NSString *)query { - return [self search:query caseSensitive:YES]; +- (NSDictionary *)search:(NSString *)query +{ + NSDictionary * foo = [self search:query caseSensitive:YES]; + return foo; } - (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)isCasesensitive { - return [self search:query caseSensitive:isCasesensitive matchStyle:@"regex"]; + NSDictionary * foo = [self search:query caseSensitive:isCasesensitive matchStyle:@"regexp"]; + return foo; } - (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)sensitivity matchStyle:(NSString *)style { - return [self search:query caseSensitive:sensitivity matchStyle:style field:@"name"]; + NSDictionary * foo = [self search:query caseSensitive:sensitivity matchStyle:style field:@"name"]; + return foo; } - (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)sensitivity matchStyle:(NSString *)style field:(NSString *)fieldName { @@ -211,14 +223,14 @@ } NSError * sError; - - result = [NSMutableDictionary dictionaryWithDictionary: + + result = [NSMutableDictionary dictionaryWithDictionary: [interpreter dictionaryFromTclListAsString: [interpreter evaluateStringAsString: [NSString stringWithFormat:@"return [mportsearch %@ %@ %@ %@]", query, caseSensitivity, style, fieldName] error:&sError]]]; - + newResult = [NSMutableDictionary dictionaryWithCapacity:[result count]]; enumerator = [result keyEnumerator]; while (key = [enumerator nextObject]) { Modified: branches/gsoc15-pallet/MacPorts_Framework/MPPort.m =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/MPPort.m 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/MPPort.m 2015-07-01 20:07:24 UTC (rev 138196) @@ -236,7 +236,7 @@ //Send Global Notifications and update MPNotifications variable [self sendGlobalExecNotification:procedure withStatus:@"Started"]; - //NSString * tclCmd = [@"YES_" stringByAppendingString:procedure]; + NSString * tclCmd = [@"YES_" stringByAppendingString:procedure]; [[MPNotifications sharedListener] setPerformingTclCommand:procedure]; if ([parentMacPortsInstance authorizationMode]) { @@ -283,6 +283,7 @@ if (options != NULL) { [opts appendString: [NSString stringWithString:[options componentsJoinedByString:@" "]]]; + NSLog(@"Opts: %@", opts); } [opts appendString: @" }"]; @@ -293,24 +294,25 @@ [vrnts appendString: @" }"]; - //NSLog(@"Variants String: %@", vrnts); + NSLog(@"Variants String: %@", vrnts); //Send Global Notifications and update MPNotifications variable + if([target isEqual:@"install"]) + { + NSLog(@"HUR"); + target = @"activate"; + } + [self sendGlobalExecNotification:target withStatus:@"Started"]; - //NSString * tclCmd = [@"YES_" stringByAppendingString:target]; + NSString * tclCmd = [@"YES_" stringByAppendingString:target]; [[MPNotifications sharedListener] setPerformingTclCommand:target]; - - /* + NSLog(@"Interpreter string:\n%@",[NSString stringWithFormat: @"set portHandle [mportopen %@ %@ %@]; mportexec $portHandle %@; mportclose $portHandle", [self valueForKey:@"porturl"], opts, vrnts, target]); - */ - [interpreter evaluateStringWithPossiblePrivileges: - [NSString stringWithFormat: - @"set portHandle [mportopen %@ %@ %@]; mportexec $portHandle %@; mportclose $portHandle", - [self valueForKey:@"porturl"], opts, vrnts, target] - error:execError]; + + NSString * test = [interpreter evaluateStringWithPossiblePrivileges:[NSString stringWithFormat:@"exit; set foo [mportopen %@ %@ %@]; puts $foo; test", [self valueForKey:@"porturl"], opts, vrnts] error:execError]; + NSLog(@"Pills: %@", test); - [self setState:MPPortStateLearnState]; [[MPNotifications sharedListener] setPerformingTclCommand:@""]; [self sendGlobalExecNotification:target withStatus:@"Finished"]; Modified: branches/gsoc15-pallet/MacPorts_Framework/MPRegistry.m =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/MPRegistry.m 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/MPRegistry.m 2015-07-01 20:07:24 UTC (rev 138196) @@ -100,6 +100,7 @@ NSArray *versions; id item; raw = [self installedAsArray:name withVersion:version]; + NSLog(@"Raw = %@", raw); result = [(NSMutableDictionary *)[NSMutableDictionary alloc] initWithCapacity:[raw count]]; rawEnumerator = [raw objectEnumerator]; while (item = [rawEnumerator nextObject]) { @@ -121,8 +122,10 @@ NSString * result = [interpreter evaluateStringAsString: [NSString stringWithFormat:@"return [registry::installed %@ %@]", name, version] error:&anError]; + if (result == nil && anError) { //Recover from error here + NSLog(@"Moo"); return nil; } Modified: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj 2015-07-01 20:07:24 UTC (rev 138196) @@ -22,7 +22,6 @@ /* Begin PBXBuildFile section */ 2160109C1094C66300EE9CD0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED12AA60E3E7E900026773D /* Cocoa.framework */; }; - 2160109F1094C6ED00EE9CD0 /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; }; 216010A21094C6FD00EE9CD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ECD970D0E465C7800488335 /* Security.framework */; }; 216010A31094C6FD00EE9CD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ECD970D0E465C7800488335 /* Security.framework */; }; 216010C51094D34500EE9CD0 /* MPRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 48F811BE0CE4636A009630DE /* MPRegistry.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -60,11 +59,9 @@ 216010E71094D34500EE9CD0 /* MPHelperNotificationsCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 6E8563B50E5DDF7000C1D73C /* MPHelperNotificationsCommon.c */; }; 216010E81094D34500EE9CD0 /* MPNotifications+IPCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EE6DDCD0E6276AA00FB2115 /* MPNotifications+IPCAdditions.m */; }; 216010EA1094D34500EE9CD0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED12AA60E3E7E900026773D /* Cocoa.framework */; }; - 216010EB1094D34500EE9CD0 /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; }; 216010EC1094D34500EE9CD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ECD970D0E465C7800488335 /* Security.framework */; }; 218DEE2610162091003B5A3B /* SimpleLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 218DED83101612F1003B5A3B /* SimpleLog.m */; }; 21D95442100940FF00DEF58A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB6FC900E45DEA80057962C /* Foundation.framework */; }; - 21D954431009411400DEF58A /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; }; 21D954471009412F00DEF58A /* MPPortProcess.m in Sources */ = {isa = PBXBuildFile; fileRef = 21D954461009412F00DEF58A /* MPPortProcess.m */; }; 21D954721009475200DEF58A /* portProcessInit.tcl in Resources */ = {isa = PBXBuildFile; fileRef = 21D954711009475200DEF58A /* portProcessInit.tcl */; }; 21D9548C1009522100DEF58A /* MPPortProcess in Resources */ = {isa = PBXBuildFile; fileRef = 21D9543E100940EE00DEF58A /* MPPortProcess */; }; @@ -113,7 +110,6 @@ 6EC2609E0E42950C0013BC48 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EC2609D0E42950C0013BC48 /* CoreFoundation.framework */; }; 6ECD98110E484E8400488335 /* MPHelperTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECD98100E484E8400488335 /* MPHelperTool.m */; }; 6ECD99C60E48B91B00488335 /* MPHelperToolTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECD99C50E48B91B00488335 /* MPHelperToolTest.m */; }; - 6ED12AF10E3E9E210026773D /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; }; 6EE6DDA40E626D4A00FB2115 /* MacPorts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* MacPorts.framework */; }; 6EE6DDA70E626D5A00FB2115 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB6FC900E45DEA80057962C /* Foundation.framework */; }; 6EE6DDAB0E626DC900FB2115 /* MPHelperToolIPCTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EE6DDAA0E626DC900FB2115 /* MPHelperToolIPCTester.m */; }; @@ -227,7 +223,6 @@ 6E8563B70E5DDF7000C1D73C /* MPHelperNotificationsProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPHelperNotificationsProtocol.h; sourceTree = "<group>"; }; 6E88D1CA0DF4B90B00684E9F /* MPMacPortsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMacPortsTest.h; sourceTree = "<group>"; }; 6E88D1CB0DF4B90B00684E9F /* MPMacPortsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPMacPortsTest.m; sourceTree = "<group>"; }; - 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Tcl.framework; path = System/Library/Frameworks/Tcl.framework; sourceTree = SDKROOT; }; 6EB6FC900E45DEA80057962C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 6EC260700E426FC80013BC48 /* BetterAuthorizationSampleLib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = BetterAuthorizationSampleLib.c; sourceTree = "<group>"; }; 6EC260710E426FC80013BC48 /* BetterAuthorizationSampleLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BetterAuthorizationSampleLib.h; sourceTree = "<group>"; }; @@ -257,7 +252,6 @@ buildActionMask = 2147483647; files = ( 216010EA1094D34500EE9CD0 /* Cocoa.framework in Frameworks */, - 216010EB1094D34500EE9CD0 /* Tcl.framework in Frameworks */, 216010EC1094D34500EE9CD0 /* Security.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -267,7 +261,6 @@ buildActionMask = 2147483647; files = ( 21D95442100940FF00DEF58A /* Foundation.framework in Frameworks */, - 21D954431009411400DEF58A /* Tcl.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -291,7 +284,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6ED12AF10E3E9E210026773D /* Tcl.framework in Frameworks */, 6EC2609E0E42950C0013BC48 /* CoreFoundation.framework in Frameworks */, 6EB6FC910E45DEA80057962C /* Foundation.framework in Frameworks */, 216010A31094C6FD00EE9CD0 /* Security.framework in Frameworks */, @@ -312,7 +304,6 @@ buildActionMask = 2147483647; files = ( 2160109C1094C66300EE9CD0 /* Cocoa.framework in Frameworks */, - 2160109F1094C6ED00EE9CD0 /* Tcl.framework in Frameworks */, 216010A21094C6FD00EE9CD0 /* Security.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -348,7 +339,6 @@ 4822AAD40D7EB39200C4D4D7 /* Documentation */, 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, 034768DFFF38A50411DB9C8B /* Products */, - 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */, 6ED12AA60E3E7E900026773D /* Cocoa.framework */, 6EC2609D0E42950C0013BC48 /* CoreFoundation.framework */, 6EB6FC900E45DEA80057962C /* Foundation.framework */, @@ -791,7 +781,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/bin/env ruby"; - shellScript = "# This script just copies the framework to the build directory so that it can be found by Pallet\n# in any configuration.\nrequire 'fileutils'\n\nif File.directory? \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/MacPorts.framework\"\n FileUtils.rm_rf \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/MacPorts.framework\"\nend\n\nFileUtils.cp_r \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/#{ENV['CONFIGURATION']}/MacPorts.framework\", \"#{ENV['SRCROOT']}/../MacPorts_Framework/build\"\n"; + shellScript = "# This script just copies the framework to the build directory so that it can be found by Pallet\n# in any configuration.\n#require 'fileutils'\n\n#if File.directory? \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/MacPorts.framework\"\n# FileUtils.rm_rf \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/MacPorts.framework\"\n#end\n\n#FileUtils.cp_r \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/#{ENV['CONFIGURATION']}/MacPorts.framework\", \"#{ENV['SRCROOT']}/../MacPorts_Framework/build\"\n"; }; 489DD8F20C94365F00595506 /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -987,9 +977,15 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "/opt/local/libexec/macports/lib/**", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\""; + OTHER_LDFLAGS = ( + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", + ); PRODUCT_NAME = MacPorts; SYMROOT = build; WRAPPER_EXTENSION = framework; @@ -1015,9 +1011,15 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "/opt/local/libexec/macports/lib/**", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\""; + OTHER_LDFLAGS = ( + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", + ); PRODUCT_NAME = MacPorts; WRAPPER_EXTENSION = framework; ZERO_LINK = NO; @@ -1094,6 +1096,12 @@ GCC_MODEL_TUNING = G5; GCC_VERSION = ""; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; + OTHER_LDFLAGS = ( + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", + ); PREBINDING = NO; PRODUCT_NAME = MPHelperTool; SDKROOT = macosx10.8; @@ -1120,9 +1128,15 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "/opt/local/libexec/macports/lib/**", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\""; + OTHER_LDFLAGS = ( + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", + ); PRODUCT_NAME = MacPorts; WRAPPER_EXTENSION = framework; ZERO_LINK = NO; @@ -1148,11 +1162,15 @@ GCC_VERSION = ""; INFOPLIST_FILE = "Test-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; OTHER_LDFLAGS = ( "-framework", Cocoa, "-framework", SenTestingKit, + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", ); PREBINDING = NO; PRODUCT_NAME = Test; @@ -1194,6 +1212,9 @@ Foundation, "-framework", AppKit, + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", ); PREBINDING = NO; PRODUCT_NAME = MPHelperToolIPCTester; @@ -1215,11 +1236,15 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; GCC_VERSION = ""; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; OTHER_LDFLAGS = ( "-framework", Foundation, "-framework", AppKit, + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", ); PREBINDING = NO; PRODUCT_NAME = MPPortProcess; @@ -1250,9 +1275,15 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "/opt/local/libexec/macports/lib/**", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\""; + OTHER_LDFLAGS = ( + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", + ); PRODUCT_NAME = MacPorts; SYMROOT = build; WRAPPER_EXTENSION = framework; @@ -1280,9 +1311,15 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "/opt/local/libexec/macports/lib/**", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\""; + OTHER_LDFLAGS = ( + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", + ); PRODUCT_NAME = MacPorts; WRAPPER_EXTENSION = framework; ZERO_LINK = NO; @@ -1310,9 +1347,15 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "/opt/local/libexec/macports/lib/**", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\""; + OTHER_LDFLAGS = ( + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", + ); PRODUCT_NAME = MacPorts; WRAPPER_EXTENSION = framework; ZERO_LINK = NO; @@ -1332,11 +1375,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; OTHER_LDFLAGS = ( "-framework", Foundation, "-framework", AppKit, + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", ); PREBINDING = NO; PRODUCT_NAME = MPPortProcess; @@ -1355,11 +1402,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; OTHER_LDFLAGS = ( "-framework", Foundation, "-framework", AppKit, + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", ); PREBINDING = NO; PRODUCT_NAME = MPPortProcess; @@ -1387,12 +1438,17 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Test-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; + "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = /opt/local/libexec/macports/lib; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-framework", Cocoa, "-framework", SenTestingKit, + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", ); PREBINDING = NO; PRODUCT_NAME = Test; @@ -1420,11 +1476,16 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Test-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; + "LIBRARY_SEARCH_PATHS[arch=*]" = /opt/local/libexec/macports/lib; OTHER_LDFLAGS = ( "-framework", Cocoa, "-framework", SenTestingKit, + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", ); PREBINDING = NO; PRODUCT_NAME = Test; @@ -1481,6 +1542,12 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; + OTHER_LDFLAGS = ( + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", + ); PREBINDING = NO; PRODUCT_NAME = MPHelperTool; SDKROOT = macosx10.8; @@ -1497,6 +1564,12 @@ GCC_ENABLE_OBJC_GC = unsupported; GCC_MODEL_TUNING = G5; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; + OTHER_LDFLAGS = ( + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", + ); PREBINDING = NO; PRODUCT_NAME = MPHelperTool; SDKROOT = macosx10.8; @@ -1523,6 +1596,9 @@ Foundation, "-framework", AppKit, + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", ); PREBINDING = NO; PRODUCT_NAME = MPHelperToolIPCTester; @@ -1548,6 +1624,9 @@ Foundation, "-framework", AppKit, + "-I/opt/local/libexec/macports/include", + "-L/opt/local/libexec/macports/lib", + "-ltcl8.5", ); PREBINDING = NO; PRODUCT_NAME = MPHelperToolIPCTester; Added: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcshareddata/MacPorts.Framework.xccheckout =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcshareddata/MacPorts.Framework.xccheckout (rev 0) +++ branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcshareddata/MacPorts.Framework.xccheckout 2015-07-01 20:07:24 UTC (rev 138196) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IDESourceControlProjectFavoriteDictionaryKey</key> + <false/> + <key>IDESourceControlProjectIdentifier</key> + <string>DD3D32F4-3538-486F-ADA6-5EA92186B731</string> + <key>IDESourceControlProjectName</key> + <string>MacPorts.Framework</string> + <key>IDESourceControlProjectOriginsDictionary</key> + <dict> + <key>911C9AAC-EEFD-4108-81F6-689E5A923F11</key> + <string>https://svn.macports.org/repository/macports/branches/gsoc15-pallet</string> + </dict> + <key>IDESourceControlProjectPath</key> + <string>MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace</string> + <key>IDESourceControlProjectRelativeInstallPathDictionary</key> + <dict> + <key>911C9AAC-EEFD-4108-81F6-689E5A923F11</key> + <string>../../..</string> + </dict> + <key>IDESourceControlProjectRepositoryRootDictionary</key> + <dict> + <key>911C9AAC-EEFD-4108-81F6-689E5A923F11</key> + <string>https://svn.macports.org/repository/macports</string> + </dict> + <key>IDESourceControlProjectURL</key> + <string>https://svn.macports.org/repository/macports/branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj</string> + <key>IDESourceControlProjectVersion</key> + <integer>110</integer> + <key>IDESourceControlProjectWCCIdentifier</key> + <string>911C9AAC-EEFD-4108-81F6-689E5A923F11</string> + <key>IDESourceControlProjectWCConfigurations</key> + <array> + <dict> + <key>IDESourceControlRepositoryBranchesRelativeLocationKey</key> + <string>branches</string> + <key>IDESourceControlRepositoryExtensionIdentifierKey</key> + <string>public.vcs.subversion</string> + <key>IDESourceControlRepositoryTagsRelativeLocationKey</key> + <string>tags</string> + <key>IDESourceControlRepositoryTrunkRelativeLocationKey</key> + <string>trunk</string> + <key>IDESourceControlWCCIdentifierKey</key> + <string>911C9AAC-EEFD-4108-81F6-689E5A923F11</string> + <key>IDESourceControlWCCName</key> + <string>gsoc15-pallet</string> + </dict> + </array> +</dict> +</plist> Added: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate =================================================================== (Binary files differ) Property changes on: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/WorkspaceSettings.xcsettings =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/WorkspaceSettings.xcsettings (rev 0) +++ branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/WorkspaceSettings.xcsettings 2015-07-01 20:07:24 UTC (rev 138196) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildLocationStyle</key> + <string>UseTargetSettings</string> +</dict> +</plist> Added: branches/gsoc15-pallet/MacPorts_Framework/Makefile =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/Makefile (rev 0) +++ branches/gsoc15-pallet/MacPorts_Framework/Makefile 2015-07-01 20:07:24 UTC (rev 138196) @@ -0,0 +1,22 @@ +CC = gcc +SOURCES = $(*.m *.c) +FRAMEWORKS = -framework Foundation -framework AppKit -framework Cocoa -framework SenTestingKit -framework MacPorts -framework Growl +LIBRARIES = -lobjc +INCLUDE_FLAGS = -I/opt/local/libexec/macports/include -L/opt/local/libexec/macports/lib -ltcl8.5 +CFLAGS = -Wall -arch i386 -g -v $(SOURCES) +LDFLAGS = $(LIBRARIES) $(FRAMEWORKS) $(INCLUDE_FLAGS) +OUT = -o Build/main + +all: $(SOURCES) $(OUT) + +$(OUT): $(OBJECTS) + $(CC) -o $(OBJECTS) $@ $(CFLAGS) $(LDFLAGS) $(OUT) + +.m.o: + $(CC) -c -Wall $< -o $@ + +clean: + $(RM) *.o *.gch *.swp .DS_Store main interp + + + Modified: branches/gsoc15-pallet/MacPorts_Framework/init.tcl =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/init.tcl 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/init.tcl 2015-07-01 20:07:24 UTC (rev 138196) @@ -1,3 +1,6 @@ + +#set auto_path [concat $auto_path "/opt/local/libexec/macports/lib/"] + package require macports package require notifications @@ -38,6 +41,7 @@ #and log error Information in a similar fashion to code #in macports.tcl. proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""}} { + puts "IN THIS REALLY COOL SHIT NOW. NOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOW" if {[catch {registry_uninstall::uninstall $portname $version $revision $variants $optionslist} result]} { global errorInfo @@ -47,6 +51,7 @@ } } proc mportuninstall_composite {portname {v ""} {optionslist ""}} { + puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!IN THIS REALLY COOL SHIT NOW. NOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOW" if {[catch {registry_uninstall::uninstall_composite $portname $v $optionslist} result]} { global errorInfo @@ -105,7 +110,6 @@ } } - # Initialize dport # This must be done following parse of global options, as some options are # evaluated by dportinit. Modified: branches/gsoc15-pallet/MacPorts_Framework/interpInit.tcl =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/interpInit.tcl 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/interpInit.tcl 2015-07-01 20:07:24 UTC (rev 138196) @@ -39,6 +39,7 @@ #in macports.tcl. Note optionslist is not being used for now set mp_empty_list [list] proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } { + puts "HERRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR" if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} { global errorInfo @@ -48,6 +49,9 @@ } } proc mportuninstall_composite {portname {v ""} {optionslist ""} } { + puts "HETTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT" + exit + if {[catch {registry_uninstall::uninstall_composite $portname $v [array get options]} result]} { global errorInfo @@ -109,6 +113,9 @@ # Initialize dport # This must be done following parse of global options, as some options are # evaluated by dportinit. + +puts "I eat puppies for dinner." + if {[catch {mportinit ui_options global_options global_variations} result]} { global errorInfo puts "$errorInfo" Modified: branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl =================================================================== --- branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl 2015-07-01 20:07:24 UTC (rev 138196) @@ -39,6 +39,8 @@ #in macports.tcl. Note optionslist is not being used for now set mp_empty_list [list] proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } { + puts "Test" + exit if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} { global errorInfo @@ -48,6 +50,8 @@ } } proc mportuninstall_composite {portname {v ""} {optionslist ""} } { + puts "Moo" + exit if {[catch {registry_uninstall::uninstall_composite $portname $v [array get options]} result]} { global errorInfo Modified: branches/gsoc15-pallet/Pallet/MPActionLauncher.h =================================================================== --- branches/gsoc15-pallet/Pallet/MPActionLauncher.h 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/Pallet/MPActionLauncher.h 2015-07-01 20:07:24 UTC (rev 138196) @@ -15,8 +15,8 @@ #import <Cocoa/Cocoa.h> #import <MacPorts/MacPorts.h> -#import <Growl/Growl.h> + #import "GrowlNotifications.h" /*! @@ -24,7 +24,7 @@ @abstract Wrapper for MacPorts Framework actions @discussion Contains a shared per thread MacPorts Framework wrapper */ -@interface MPActionLauncher : NSObject <GrowlApplicationBridgeDelegate> { +@interface MPActionLauncher : NSObject <NSApplicationDelegate, NSUserNotificationCenterDelegate> { NSArray *ports; NSTask *actionTool; NSConnection *connectionToActionTool; @@ -79,7 +79,6 @@ */ - (void)upgradePort:(MPPort *)port; - /*! @brief Syncs the MacPorts installation in another thread */ @@ -92,6 +91,6 @@ - (void)cancelPortProcess; --(void) sendGrowlNotification: (int) type; +-(void) sendNotification: (int) type; @end Modified: branches/gsoc15-pallet/Pallet/MPActionLauncher.m =================================================================== --- branches/gsoc15-pallet/Pallet/MPActionLauncher.m 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/Pallet/MPActionLauncher.m 2015-07-01 20:07:24 UTC (rev 138196) @@ -56,11 +56,12 @@ [port installWithOptions:empty variants:empty error:&error]; //Check if we have received an error, send the apropriate notification, and if everything is fine //send a notification to the main thread that we have completed our operation, and to advance the queue + if(errorReceived) - [self sendGrowlNotification: GROWL_INSTALLFAILED]; + [self sendNotification: GROWL_INSTALLFAILED]; else { - [self sendGrowlNotification: GROWL_INSTALL]; + [self sendNotification: GROWL_INSTALL]; [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil]; } @@ -78,10 +79,10 @@ //Check if we have received an error, send the apropriate notification, and if everything is fine //send a notification to the main thread that we have completed our operation, and to advance the queue if(errorReceived) - [self sendGrowlNotification: GROWL_INSTALLFAILED]; + [self sendNotification: GROWL_INSTALLFAILED]; else { - [self sendGrowlNotification: GROWL_INSTALL]; + [self sendNotification: GROWL_INSTALL]; [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil]; } @@ -94,10 +95,10 @@ //Check if we have received an error, send the apropriate notification, and if everything is fine //send a notification to the main thread that we have completed our operation, and to advance the queue if(errorReceived) - [self sendGrowlNotification: GROWL_UNINSTALLFAILED]; + [self sendNotification: GROWL_UNINSTALLFAILED]; else { - [self sendGrowlNotification: GROWL_UNINSTALL]; + [self sendNotification: GROWL_UNINSTALL]; [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil]; } } @@ -109,10 +110,10 @@ //Check if we have received an error, send the apropriate notification, and if everything is fine //send a notification to the main thread that we have completed our operation, and to advance the queue if(errorReceived) - [self sendGrowlNotification: GROWL_UPGRADEFAILED]; + [self sendNotification: GROWL_UPGRADEFAILED]; else { - [self sendGrowlNotification: GROWL_UPGRADE]; + [self sendNotification: GROWL_UPGRADE]; [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil]; } } @@ -124,10 +125,10 @@ //Check if we have received an error, send the apropriate notification, and if everything is fine //send a notification to the main thread that we have completed our operation, and to advance the queue if(errorReceived) - [self sendGrowlNotification: GROWL_SYNCFAILED]; + [self sendNotification: GROWL_SYNCFAILED]; else { - [self sendGrowlNotification: GROWL_SYNC]; + [self sendNotification: GROWL_SYNC]; [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil]; } } @@ -138,11 +139,12 @@ [[MPMacPorts sharedInstance] selfUpdate:&error]; //Check if we have received an error, send the apropriate notification, and if everything is fine //send a notification to the main thread that we have completed our operation, and to advance the queue + if(errorReceived) - [self sendGrowlNotification: GROWL_SELFUPDATEFAILED]; + [self sendNotification: GROWL_SELFUPDATEFAILED]; else { - [self sendGrowlNotification: GROWL_SELFUPDATE]; + [self sendNotification: GROWL_SELFUPDATE]; [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil]; } } @@ -152,69 +154,62 @@ [[MPMacPorts sharedInstance] cancelCurrentCommand]; } -//sendGrowlNotification is the method used to send our Growl notifications, via the Growl framework. It takes one argument, which is the +- (void)applicationDidFinishLaunching:(NSNotification *)aNotification +{ + [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self]; +} + +- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification{ + return YES; +} + +//sendNotification is the method used to send our notifications, via the Notification Center. It takes one argument, which is the //type of notification we are sending, as defined in GrowlNotifications.h It initializes the strings we will be sending to the -//Growl Framework that comprise our notification, and finaly sends the notification --(void) sendGrowlNotification:(int)type +//Notification Center that comprise our notification, and finaly sends the notification +-(void) sendNotification:(int)type { //The notification needs a title. We initialize an array containing the titles for each type of notification - NSString *growlTitles[GROWL_TYPES]; - growlTitles[GROWL_INSTALL] = [NSString stringWithString: @"Installation Completed"]; - growlTitles[GROWL_UNINSTALL] = [NSString stringWithString: @"Uninstall Completed"]; - growlTitles[GROWL_UPGRADE] = [NSString stringWithString: @"Upgrade Completed"]; - growlTitles[GROWL_SYNC] = [NSString stringWithString: @"Sync Completed"]; - growlTitles[GROWL_SELFUPDATE] = [NSString stringWithString: @"Selfupdate Completed"]; - growlTitles[GROWL_INSTALLFAILED] = [NSString stringWithString: @"Installation Failed"]; - growlTitles[GROWL_UNINSTALLFAILED] = [NSString stringWithString: @"Uninstall Failed"]; - growlTitles[GROWL_UPGRADEFAILED] = [NSString stringWithString: @"Upgrade Failed"]; - growlTitles[GROWL_SYNCFAILED] = [NSString stringWithString: @"Sync Failed"]; - growlTitles[GROWL_SELFUPDATEFAILED] = [NSString stringWithString: @"Selfupdate Failed"]; + NSString *notificationTitles[GROWL_TYPES]; + notificationTitles[GROWL_INSTALL] = @"Installation Completed"; + notificationTitles[GROWL_UNINSTALL] = @"Uninstall Completed"; + notificationTitles[GROWL_UPGRADE] = @"Upgrade Completed"; + notificationTitles[GROWL_SYNC] = @"Sync Completed"; + notificationTitles[GROWL_SELFUPDATE] = @"Selfupdate Completed"; + notificationTitles[GROWL_INSTALLFAILED] = @"Installation Failed"; + notificationTitles[GROWL_UNINSTALLFAILED] = @"Uninstall Failed"; + notificationTitles[GROWL_UPGRADEFAILED] = @"Upgrade Failed"; + notificationTitles[GROWL_SYNCFAILED] = @"Sync Failed"; + notificationTitles[GROWL_SELFUPDATEFAILED] = @"Selfupdate Failed"; - growlTitles[GROWL_ALLOPS] = [NSString stringWithString: @"Operations Completed"]; - growlTitles[GROWL_ALLOPSFAILED] = [NSString stringWithString: @"Operations Failed"]; + notificationTitles[GROWL_ALLOPS] = @"Operations Completed"; + notificationTitles[GROWL_ALLOPSFAILED] = @"Operations Failed"; //The notification also needs a description. We initialize an array containing the descriptions for each type of notification - NSString *growlDescriptions[GROWL_TYPES]; - growlDescriptions[GROWL_INSTALL] = [NSString stringWithString: @"Operation completed successfully"]; - growlDescriptions[GROWL_UNINSTALL] = [NSString stringWithString: @"Operation completed successfully"]; - growlDescriptions[GROWL_UPGRADE] = [NSString stringWithString: @"Operation completed successfully"]; - growlDescriptions[GROWL_SYNC] = [NSString stringWithString: @"Operation completed successfully"]; - growlDescriptions[GROWL_SELFUPDATE] = [NSString stringWithString: @"Operation completed successfully"]; - growlDescriptions[GROWL_INSTALLFAILED] = [NSString stringWithString: @"Operation Failed"]; - growlDescriptions[GROWL_UNINSTALLFAILED] = [NSString stringWithString: @"Operation Failed"]; - growlDescriptions[GROWL_UPGRADEFAILED] = [NSString stringWithString: @"Operation Failed"]; - growlDescriptions[GROWL_SYNCFAILED] = [NSString stringWithString: @"Operation Failed"]; - growlDescriptions[GROWL_SELFUPDATEFAILED] = [NSString stringWithString: @"Operation Failed"]; + NSString *notificationDescriptions[GROWL_TYPES]; + notificationDescriptions[GROWL_INSTALL] = @"Operation completed successfully"; + notificationDescriptions[GROWL_UNINSTALL] = @"Operation completed successfully"; + notificationDescriptions[GROWL_UPGRADE] = @"Operation completed successfully"; + notificationDescriptions[GROWL_SYNC] = @"Operation completed successfully"; + notificationDescriptions[GROWL_SELFUPDATE] = @"Operation completed successfully"; + notificationDescriptions[GROWL_INSTALLFAILED] = @"Operation Failed"; + notificationDescriptions[GROWL_UNINSTALLFAILED] = @"Operation Failed"; + notificationDescriptions[GROWL_UPGRADEFAILED] = @"Operation Failed"; + notificationDescriptions[GROWL_SYNCFAILED] = @"Operation Failed"; + notificationDescriptions[GROWL_SELFUPDATEFAILED] = @"Operation Failed"; - growlDescriptions[GROWL_ALLOPS] = [NSString stringWithString: @"All Operations Completed Succesfully"]; - growlDescriptions[GROWL_ALLOPSFAILED] = [NSString stringWithString: @"Operations Failed"]; + notificationDescriptions[GROWL_ALLOPS] = @"All Operations Completed Succesfully"; + notificationDescriptions[GROWL_ALLOPSFAILED] = @"Operations Failed"; - //And the notification also needs a name, which Growl uses to identify it. We initialize an array containing - //these names here - NSString *growlNotificationNames[GROWL_TYPES]; - growlNotificationNames[GROWL_INSTALL] = [NSString stringWithString: @"InstallCompleted"]; - growlNotificationNames[GROWL_UNINSTALL] = [NSString stringWithString: @"UninstallCompleted"]; - growlNotificationNames[GROWL_UPGRADE] = [NSString stringWithString: @"UpgradeCompleted"]; - growlNotificationNames[GROWL_SYNC] = [NSString stringWithString: @"SyncCompleted"]; - growlNotificationNames[GROWL_SELFUPDATE] = [NSString stringWithString: @"SelfupdateCompleted"]; - growlNotificationNames[GROWL_INSTALLFAILED] = [NSString stringWithString: @"InstallFailed"]; - growlNotificationNames[GROWL_UNINSTALLFAILED] = [NSString stringWithString: @"UninstallFailed"]; - growlNotificationNames[GROWL_UPGRADEFAILED] = [NSString stringWithString: @"UpgradeFailed"]; - growlNotificationNames[GROWL_SYNCFAILED] = [NSString stringWithString: @"SyncFailed"]; - growlNotificationNames[GROWL_SELFUPDATEFAILED] = [NSString stringWithString: @"SelfupdateFailed"]; - growlNotificationNames[GROWL_ALLOPS] = [NSString stringWithString: @"OperationsCompleted"]; - growlNotificationNames[GROWL_ALLOPSFAILED] = [NSString stringWithString: @"OperationsFailed"]; - - - /*################# These initializations should be moved to [init], and only call the following functions #################*/ - - //Before we can send our messages, we need to call setGrowlDelegate once, due to a bug with the Growl Framework - [GrowlApplicationBridge setGrowlDelegate:(id) @""]; - //And finaly, we send our notification, by calling notifyWithTitle with the appropriate title/description/name - [GrowlApplicationBridge notifyWithTitle: growlTitles[type] description: growlDescriptions[type]\ - notificationName:growlNotificationNames[type] iconData:nil priority: 0\ - isSticky: NO clickContext:nil]; + //Call the notification center to do it's notificational duties. + NSUserNotification *notification = [[NSUserNotification alloc] init]; + notification.title = notificationTitles[type]; + notification.informativeText = notificationDescriptions[type]; + notification.soundName = NSUserNotificationDefaultSoundName; + + [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification]; + [notification release]; + } @end Modified: branches/gsoc15-pallet/Pallet/MPActionsController.m =================================================================== --- branches/gsoc15-pallet/Pallet/MPActionsController.m 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/Pallet/MPActionsController.m 2015-07-01 20:07:24 UTC (rev 138196) @@ -435,8 +435,9 @@ [[NSNotificationCenter defaultCenter] removeObserver:self name:@"advanceQ" object:nil]; int allops=GROWL_ALLOPS; - [[MPActionLauncher sharedInstance] - performSelectorInBackground:@selector(sendGrowlNotification:) withObject:(id) allops]; + //FIXME + //[[MPActionLauncher sharedInstance] + //performSelectorInBackground:@selector(sendGrowlNotification:) withObject:(id) allops]; } Added: branches/gsoc15-pallet/Pallet/Makefile =================================================================== --- branches/gsoc15-pallet/Pallet/Makefile (rev 0) +++ branches/gsoc15-pallet/Pallet/Makefile 2015-07-01 20:07:24 UTC (rev 138196) @@ -0,0 +1,22 @@ +CC = gcc +SOURCES = $(wildcard *.m *.c) +FRAMEWORKS = -framework Foundation -framework AppKit -framework Cocoa -framework SenTestingKit -framework MacPorts -framework Growl +LIBRARIES = -lobjc +INCLUDE_FLAGS = -I/Users/mrappleseed/GSoC/gsoc15-pallet/MacPorts_Framework/ -I/opt/local/libexec/macports/include -L/opt/local/libexec/macports/lib -ltcl8.5 +CFLAGS = -Wall -arch i386 -g -v $(SOURCES) +LDFLAGS = $(LIBRARIES) $(FRAMEWORKS) $(INCLUDE_FLAGS) +OUT = -o Build/main + +all: $(SOURCES) $(OUT) + +$(OUT): $(OBJECTS) + $(CC) -o $(OBJECTS) $@ $(CFLAGS) $(LDFLAGS) $(OUT) + +.m.o: + $(CC) -c -Wall $< -o $@ + +clean: + $(RM) *.o *.gch *.swp .DS_Store main interp + + + Modified: branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.pbxproj =================================================================== --- branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.pbxproj 2015-07-01 19:49:09 UTC (rev 138195) +++ branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.pbxproj 2015-07-01 20:07:24 UTC (rev 138196) @@ -26,11 +26,6 @@ 1D24FCAB11CD32090063E2A5 /* TB_InstallWithVar.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D24FCAA11CD32090063E2A5 /* TB_InstallWithVar.icns */; }; 1D24FCAC11CD32090063E2A5 /* TB_InstallWithVar.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D24FCAA11CD32090063E2A5 /* TB_InstallWithVar.icns */; }; 1D4B877F11A5496B00AD9D33 /* Growl Registration Ticket.growlRegDict in Resources */ = {isa = PBXBuildFile; fileRef = 1D4B877E11A5496B00AD9D33 /* Growl Registration Ticket.growlRegDict */; }; - 1D4B878011A5498200AD9D33 /* Growl Registration Ticket.growlRegDict in Resources */ = {isa = PBXBuildFile; fileRef = 1D4B877E11A5496B00AD9D33 /* Growl Registration Ticket.growlRegDict */; }; - 1D4B87BB11A54DE000AD9D33 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D4B87BA11A54DE000AD9D33 /* Growl.framework */; }; - 1D4B87BC11A54DE000AD9D33 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D4B87BA11A54DE000AD9D33 /* Growl.framework */; }; - 1D4B87CE11A54FEF00AD9D33 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1D4B87BA11A54DE000AD9D33 /* Growl.framework */; }; - 1D4B87D411A5500100AD9D33 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1D4B87BA11A54DE000AD9D33 /* Growl.framework */; }; 1D9B73F911F0F6D6006013F5 /* MPQueueTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */; }; 1D9B73FA11F0F6D6006013F5 /* MPQueueTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */; }; 1DA3219411F748330004ECB1 /* MPCheckbox.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DA3219311F748330004ECB1 /* MPCheckbox.m */; }; @@ -150,7 +145,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 1D4B87CE11A54FEF00AD9D33 /* Growl.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -160,7 +154,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 1D4B87D411A5500100AD9D33 /* Growl.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -185,7 +178,6 @@ 1D24FC5F11CD1C770063E2A5 /* GrowlNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrowlNotifications.h; sourceTree = "<group>"; }; 1D24FCAA11CD32090063E2A5 /* TB_InstallWithVar.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TB_InstallWithVar.icns; sourceTree = "<group>"; }; 1D4B877E11A5496B00AD9D33 /* Growl Registration Ticket.growlRegDict */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Growl Registration Ticket.growlRegDict"; sourceTree = "<group>"; }; - 1D4B87BA11A54DE000AD9D33 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = "Growl-1.2.1-Framework/Growl.framework"; sourceTree = "<group>"; }; 1D9B73F711F0F6D6006013F5 /* MPQueueTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPQueueTableView.h; sourceTree = "<group>"; }; 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPQueueTableView.m; sourceTree = "<group>"; }; 1DA3219211F748330004ECB1 /* MPCheckbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCheckbox.h; sourceTree = "<group>"; }; @@ -235,7 +227,6 @@ files = ( 21900DE01095001700ED79CF /* MacPorts.framework in Frameworks */, 21900DE11095001700ED79CF /* Cocoa.framework in Frameworks */, - 1D4B87BB11A54DE000AD9D33 /* Growl.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -245,7 +236,6 @@ files = ( 21900E031095030B00ED79CF /* MacPorts.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, - 1D4B87BC11A54DE000AD9D33 /* Growl.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -338,7 +328,6 @@ isa = PBXGroup; children = ( 1D24FC5F11CD1C770063E2A5 /* GrowlNotifications.h */, - 1D4B87BA11A54DE000AD9D33 /* Growl.framework */, 21F165400FE2C04300542AEE /* MacPorts.Framework.xcodeproj */, 21F166FC0FE32DF000542AEE /* Models */, 21F167570FE3343600542AEE /* Controllers */, @@ -552,7 +541,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1D4B878011A5498200AD9D33 /* Growl Registration Ticket.growlRegDict in Resources */, 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, 21FC226D0FE88A2A00B1E835 /* Installed.tiff in Resources */, @@ -809,7 +797,6 @@ "$(inherited)", "\"$(SRCROOT)/../MacPorts_Framework/build\"", "\"$(SRCROOT)/../MacPorts_Framework/build/Release\"", - "\"$(SRCROOT)/Growl-1.2.1-Framework\"", ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; @@ -820,6 +807,12 @@ GCC_PREFIX_HEADER = Pallet_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; + OTHER_LDFLAGS = ( + "-I$prefix/libexec/macports/include", + "-L$prefix/libexec/macports/lib", + "-ltcl8.5", + ); PRODUCT_NAME = Pallet; SDKROOT = macosx; }; @@ -831,10 +824,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Growl-1.2.1-Framework\"", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_GC = unsupported; @@ -844,6 +834,13 @@ GCC_PREFIX_HEADER = Pallet_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; + OTHER_LDFLAGS = ( + "-I$prefix/libexec/macports/include", + "-L$prefix/libexec/macports/lib", + "-ltcl8.5", + ); + "OTHER_LDFLAGS[arch=*]" = "-ltcl8.5"; PRODUCT_NAME = Pallet; SDKROOT = macosx; }; @@ -859,14 +856,24 @@ "\"$(SRCROOT)/../MacPorts_Framework/build\"", "$(inherited)", "\"$(SRCROOT)/../MacPorts_Framework/build/Release\"", - "\"$(SRCROOT)/Growl-1.2.1-Framework\"", ); + "FRAMEWORK_SEARCH_PATHS[arch=*]" = ( + "\"$(SRCROOT)/../MacPorts_Framework/build\"", + "$(inherited)", + "\"$(SRCROOT)/../MacPorts_Framework/build/Release\"", + ); GCC_ENABLE_OBJC_GC = unsupported; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Pallet_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**"; + OTHER_LDFLAGS = ( + "-I$prefix/libexec/macports/include", + "-L$prefix/libexec/macports/lib", + "-ltcl8.5", + ); PRODUCT_NAME = Pallet; SDKROOT = macosx; }; Modified: branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate =================================================================== (Binary files differ) Added: branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist =================================================================== --- branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist (rev 0) +++ branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 2015-07-01 20:07:24 UTC (rev 138196) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Bucket + type = "1" + version = "2.0"> + <Breakpoints> + <BreakpointProxy + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> + <BreakpointContent + shouldBeEnabled = "No" + ignoreCount = "0" + continueAfterRunningActions = "No" + filePath = "MPActionLauncher.m" + timestampString = "456866266.106236" + startingColumnNumber = "9223372036854775807" + endingColumnNumber = "9223372036854775807" + startingLineNumber = "38" + endingLineNumber = "38" + landmarkName = "-loadPorts" + landmarkType = "5"> + </BreakpointContent> + </BreakpointProxy> + <BreakpointProxy + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> + <BreakpointContent + shouldBeEnabled = "No" + ignoreCount = "0" + continueAfterRunningActions = "No" + filePath = "MPActionLauncher.m" + timestampString = "456866266.106236" + startingColumnNumber = "9223372036854775807" + endingColumnNumber = "9223372036854775807" + startingLineNumber = "39" + endingLineNumber = "39" + landmarkName = "-loadPorts" + landmarkType = "5"> + </BreakpointContent> + </BreakpointProxy> + </Breakpoints> +</Bucket>