<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138196] branches/gsoc15-pallet</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138196">138196</a></dd>
<dt>Author</dt> <dd>ksammons@macports.org</dd>
<dt>Date</dt> <dd>2015-07-01 13:07:24 -0700 (Wed, 01 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GSoC Pallet Branch: Removed Growl dependancy, fixed and updated the linking (thanks neverpanic), and older changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkBetterAuthorizationSampleLibc">branches/gsoc15-pallet/MacPorts_Framework/BetterAuthorizationSampleLib.c</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMPHelperToolm">branches/gsoc15-pallet/MacPorts_Framework/MPHelperTool.m</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMPHelperToolIPCTesterm">branches/gsoc15-pallet/MacPorts_Framework/MPHelperToolIPCTester.m</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMPInterpreterm">branches/gsoc15-pallet/MacPorts_Framework/MPInterpreter.m</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMPMacPortsm">branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMPPortm">branches/gsoc15-pallet/MacPorts_Framework/MPPort.m</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMPRegistrym">branches/gsoc15-pallet/MacPorts_Framework/MPRegistry.m</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectpbxproj">branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchesgsoc15palletMacPorts_Frameworkinittcl">branches/gsoc15-pallet/MacPorts_Framework/init.tcl</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkinterpInittcl">branches/gsoc15-pallet/MacPorts_Framework/interpInit.tcl</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkportProcessInittcl">branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl</a></li>
<li><a href="#branchesgsoc15palletPalletMPActionLauncherh">branches/gsoc15-pallet/Pallet/MPActionLauncher.h</a></li>
<li><a href="#branchesgsoc15palletPalletMPActionLauncherm">branches/gsoc15-pallet/Pallet/MPActionLauncher.m</a></li>
<li><a href="#branchesgsoc15palletPalletMPActionsControllerm">branches/gsoc15-pallet/Pallet/MPActionsController.m</a></li>
<li><a href="#branchesgsoc15palletPalletPalletxcodeprojprojectpbxproj">branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchesgsoc15palletPalletPalletxcodeprojprojectxcworkspacexcuserdatamrappleseedxcuserdatadUserInterfaceStatexcuserstate">branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcshareddata/</li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectxcworkspacexcshareddataMacPortsFrameworkxccheckout">branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcshareddata/MacPorts.Framework.xccheckout</a></li>
<li>branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/</li>
<li>branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/</li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectxcworkspacexcuserdatamrappleseedxcuserdatadUserInterfaceStatexcuserstate">branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectxcworkspacexcuserdatamrappleseedxcuserdatadWorkspaceSettingsxcsettings">branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/WorkspaceSettings.xcsettings</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMakefile">branches/gsoc15-pallet/MacPorts_Framework/Makefile</a></li>
<li><a href="#branchesgsoc15palletPalletMakefile">branches/gsoc15-pallet/Pallet/Makefile</a></li>
<li>branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcdebugger/</li>
<li><a href="#branchesgsoc15palletPalletPalletxcodeprojxcuserdatamrappleseedxcuserdatadxcdebuggerBreakpoints_v2xcbkptlist">branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc15palletMacPorts_FrameworkBetterAuthorizationSampleLibc"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/BetterAuthorizationSampleLib.c (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1737,7 +1737,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Create the socket and tell it to not generate SIGPIPE.
</span><del>-
</del><span class="cx"> if (retval == noErr) {
</span><span class="cx"> fd = socket(AF_UNIX, SOCK_STREAM, 0);
</span><span class="cx"> if (fd == -1) {
</span><span class="lines">@@ -1776,7 +1775,9 @@
</span><span class="cx"> // Attempt to connect.
</span><span class="cx">
</span><span class="cx"> if (retval == noErr) {
</span><ins>+ printf("FD: %d Sizeof\n", fd);
</ins><span class="cx"> if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) {
</span><ins>+ printf("Here: %d", errno);
</ins><span class="cx"> retval = BASErrnoToOSStatus(errno);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1786,13 +1787,13 @@
</span><span class="cx"> if (retval == noErr) {
</span><span class="cx"> retval = AuthorizationMakeExternalForm(auth, &extAuth);
</span><span class="cx"> }
</span><del>- if (retval == noErr) {
</del><ins>+ if (retval == noErr) {
</ins><span class="cx"> retval = BASErrnoToOSStatus( BASWrite(fd, &extAuth, sizeof(extAuth), NULL) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Write the request.
</span><span class="cx">
</span><del>- if (retval == noErr) {
</del><ins>+ if (retval == noErr) {
</ins><span class="cx"> retval = BASErrnoToOSStatus( BASWriteDictionary(request, fd) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMPHelperToolm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/MPHelperTool.m (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -922,32 +922,42 @@
</span><span class="cx">
</span><span class="cx"> //Add simplelog tcl command
</span><span class="cx"> Tcl_CreateObjCommand(interpreter, "simplelog", SimpleLog_Command, NULL, NULL);
</span><del>- if (Tcl_PkgProvide(interpreter, "simplelog", "1.0") != TCL_OK) {
</del><ins>+ if (Tcl_PkgProvide(interpreter, "simplelog", "1.0") != TCL_OK)
+ {
</ins><span class="cx"> NSLog(@"Error in Tcl_PkgProvide: %s", Tcl_GetStringResult(interpreter));
</span><span class="cx"> retval = coreFoundationUnknownErr;
</span><span class="cx"> //For Dbg
</span><span class="cx"> CFDictionaryAddValue(response, CFSTR("simplelog"), CFSTR("NO"));
</span><span class="cx"> }
</span><del>- else {
</del><ins>+ else
+ {
</ins><span class="cx"> CFDictionaryAddValue(response, CFSTR("simplelog"), CFSTR("YES"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> //Get path for and load interpInit.tcl file to Tcl Interpreter
</span><span class="cx"> NSString * interpInitFilePath = (NSString *) (CFStringRef) CFDictionaryGetValue(request, CFSTR(kInterpInitFilePath));
</span><del>- if (interpInitFilePath == nil) {
</del><ins>+ if(interpInitFilePath == nil)
+ {
</ins><span class="cx"> CFDictionaryAddValue(response, CFSTR("interpInitFilePath"), CFSTR("NO"));
</span><span class="cx"> retval = coreFoundationUnknownErr;
</span><span class="cx"> }
</span><span class="cx"> else
</span><ins>+ {
</ins><span class="cx"> CFDictionaryAddValue(response, CFSTR("interpInitFilePath"), (CFStringRef)interpInitFilePath);
</span><del>- if( Tcl_EvalFile(interpreter, [interpInitFilePath UTF8String]) == TCL_ERROR) {
</del><ins>+ }
+
+ NSLog(@"FOO TEST 2");
+
+ if(Tcl_EvalFile(interpreter, [interpInitFilePath UTF8String]) == TCL_ERROR)
+ {
</ins><span class="cx"> NSLog(@"Error in Tcl_EvalFile init.tcl: %s", Tcl_GetStringResult(interpreter));
</span><span class="cx"> Tcl_DeleteInterp(interpreter);
</span><span class="cx"> retval = coreFoundationUnknownErr;
</span><span class="cx"> CFDictionaryAddValue(response, CFSTR("interpInit.tcl Evaluation"), CFSTR("NO"));
</span><span class="cx"> }
</span><del>- else {
</del><ins>+ else
+ {
</ins><span class="cx"> CFDictionaryAddValue(response, CFSTR("interpInit.tcl Evaluation"), CFSTR("YES"));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMPHelperToolIPCTesterm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/MPHelperToolIPCTester.m (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -(BOOL) installUninstallManipulation:(NSString *)portName {
</span><ins>+ NSLog(@"FOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO");
</ins><span class="cx"> BOOL ret = NO;
</span><span class="cx">
</span><span class="cx"> MPRegistry * registry = [MPRegistry sharedRegistry];
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMPInterpreterm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/MPInterpreter.m (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include "MPHelperNotificationsProtocol.h"
</span><span class="cx"> static AuthorizationRef internalMacPortsAuthRef;
</span><span class="cx"> static NSString* GenericPKGPath = @"/Library/Tcl";
</span><del>-static NSString* PKGPath = @"/opt/local/share/macports/Tcl";
</del><ins>+static NSString* PKGPath = @"/opt/local/libexec/macports/lib/";
</ins><span class="cx"> static NSTask* aTask;
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> -(BOOL) initTclInterpreter:(Tcl_Interp * *)interp withPath:(NSString *)path {
</span><span class="cx"> BOOL result = NO;
</span><span class="cx"> *interp = Tcl_CreateInterp();
</span><del>-
</del><ins>+
</ins><span class="cx"> if(*interp == NULL) {
</span><span class="cx"> NSLog(@"Error in Tcl_CreateInterp, aborting.");
</span><span class="cx"> return result;
</span><span class="lines">@@ -202,26 +202,31 @@
</span><span class="cx"> if (path == nil)
</span><span class="cx"> path = PKGPath;
</span><span class="cx">
</span><del>-
</del><ins>+ /*
</ins><span class="cx"> NSString * mport_fastload = [[@"source [file join \"" stringByAppendingString:path]
</span><span class="cx"> stringByAppendingString:@"\" macports1.0 macports_fastload.tcl]"];
</span><span class="cx"> if(Tcl_Eval(*interp, [mport_fastload UTF8String]) != TCL_OK) {
</span><span class="cx"> NSLog(@"Error in Tcl_EvalFile macports_fastload.tcl: %s", Tcl_GetStringResult(*interp));
</span><span class="cx"> Tcl_DeleteInterp(*interp);
</span><span class="cx"> return result;
</span><del>- }
</del><ins>+ }*/
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> Tcl_CreateObjCommand(*interp, "notifications", Notifications_Command, NULL, NULL);
</span><del>- if (Tcl_PkgProvide(*interp, "notifications", "1.0") != TCL_OK) {
</del><ins>+ if(Tcl_PkgProvide(*interp, "notifications", "1.0") != TCL_OK)
+ {
</ins><span class="cx"> NSLog(@"Error in Tcl_PkgProvide: %s", Tcl_GetStringResult(*interp));
</span><span class="cx"> Tcl_DeleteInterp(*interp);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>-
- if( Tcl_EvalFile(*interp, [[[NSBundle bundleWithIdentifier:@"org.macports.frameworks.macports"]
</del><ins>+ if(Tcl_EvalFile(*interp, [[[NSBundle bundleWithIdentifier:@"org.macports.frameworks.macports"]
</ins><span class="cx"> pathForResource:@"init"
</span><del>- ofType:@"tcl"] UTF8String]) != TCL_OK) {
</del><ins>+ ofType:@"tcl"] UTF8String]) != TCL_OK)
+ {
+ const char * path = [[[NSBundle bundleWithIdentifier:@"org.macports.frameworks.macports"]
+ pathForResource:@"init"
+ ofType:@"tcl"] UTF8String];
+ //printf("Test: %s", path);
</ins><span class="cx"> NSLog(@"Error in Tcl_EvalFile init.tcl: %s", Tcl_GetStringResult(*interp));
</span><span class="cx"> Tcl_DeleteInterp(*interp);
</span><span class="cx"> return result;
</span><span class="lines">@@ -377,19 +382,26 @@
</span><span class="cx"> #pragma Port Settings
</span><span class="cx">
</span><span class="cx"> #pragma Utilities
</span><del>-- (NSArray *)arrayFromTclListAsString:(NSString *)list {
</del><ins>+- (NSArray *)arrayFromTclListAsString:(NSString *)list
+{
</ins><span class="cx"> NSMutableArray *array;
</span><span class="cx"> int tclCount;
</span><span class="cx"> int tclResult;
</span><span class="cx"> int i;
</span><span class="cx"> const char **tclElements;
</span><ins>+ const char * string = [list UTF8String];
</ins><span class="cx"> tclResult = Tcl_SplitList(_interpreter, [list UTF8String], &tclCount, &tclElements);
</span><del>- if (tclResult == TCL_OK) {
</del><ins>+
+ if (tclResult == TCL_OK)
+ {
</ins><span class="cx"> array = [[NSMutableArray alloc] initWithCapacity:tclCount];
</span><del>- for (i = 0; i < tclCount; i++) {
</del><ins>+ for (i = 0; i < tclCount; i++)
+ {
</ins><span class="cx"> [array addObject:[NSString stringWithUTF8String:tclElements[i]]];
</span><span class="cx"> }
</span><del>- } else {
</del><ins>+ }
+ else
+ {
</ins><span class="cx"> array = [[[NSMutableArray alloc] init] autorelease];
</span><span class="cx"> }
</span><span class="cx"> Tcl_Free((char *)tclElements);
</span><span class="lines">@@ -397,7 +409,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSDictionary *)dictionaryFromTclListAsString:(NSString *)list {
</span><del>- return [NSDictionary dictionaryWithDictionary:[self mutableDictionaryFromTclListAsString:list]];
</del><ins>+ NSDictionary * foo = [NSDictionary dictionaryWithDictionary:[self mutableDictionaryFromTclListAsString:list]];
+ return foo;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSMutableDictionary *)mutableDictionaryFromTclListAsString:(NSString *)list {
</span><span class="lines">@@ -428,9 +441,9 @@
</span><span class="cx">
</span><span class="cx"> - (NSString *)evaluateStringAsString:(NSString *)statement error:(NSError**)mportError{
</span><span class="cx"> //NSLog(@"Calling evaluateStringAsString with argument %@", statement);
</span><ins>+ NSLog(@"Statement: %@", statement);
+ int return_code = Tcl_Eval(_interpreter, [statement UTF8String]);
</ins><span class="cx">
</span><del>- int return_code = Tcl_Eval(_interpreter, [statement UTF8String]);
-
</del><span class="cx"> //Should I check for (return_code != TCL_Ok && return_code != TCL_RETURN) instead ?
</span><span class="cx"> if (return_code != TCL_OK) {
</span><span class="cx">
</span><span class="lines">@@ -458,12 +471,14 @@
</span><span class="cx"> NSUnderlyingErrorKey, nil];
</span><span class="cx"> errDict = [NSDictionary dictionaryWithObjects:objArray forKeys:keyArray];
</span><span class="cx"> if (mportError != NULL)
</span><ins>+ {
</ins><span class="cx"> *mportError = [[[NSError alloc] initWithDomain:MPFrameworkErrorDomain
</span><span class="cx"> code:TCL_ERROR
</span><span class="cx"> userInfo:errDict] autorelease];
</span><ins>+ }
+
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> return [NSString stringWithUTF8String:Tcl_GetStringResult(_interpreter)];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -517,6 +532,7 @@
</span><span class="cx">
</span><span class="cx"> //if ([notificationObject respondsToSelector:@selector(startServerThread)]) {
</span><span class="cx"> NSThread * cThread = [NSThread currentThread];
</span><ins>+
</ins><span class="cx"> NSLog(@"STARTING SERVER THREAD with previous thread %@", [cThread threadDictionary]);
</span><span class="cx">
</span><span class="cx"> //This is important to note ... the tcl command being executed is saved in the
</span><span class="lines">@@ -539,10 +555,6 @@
</span><span class="cx"> NSString * interpInitPath = [[NSBundle bundleForClass:[MPInterpreter class]]
</span><span class="cx"> pathForResource:@"interpInit" ofType:@"tcl"];
</span><span class="cx">
</span><del>-
-
-
-
</del><span class="cx"> request = [NSDictionary dictionaryWithObjectsAndKeys:
</span><span class="cx"> @kMPHelperEvaluateTclCommand, @kBASCommandKey,
</span><span class="cx"> statement, @kTclStringToBeEvaluated,
</span><span class="lines">@@ -569,7 +581,8 @@
</span><span class="cx"> (CFStringRef) bundleID,
</span><span class="cx"> NULL);
</span><span class="cx">
</span><del>- //NSLog(@"BEFORE Tool Execution request is %@ , response is %@ \n\n", request, response);
</del><ins>+ NSLog(@"BEFORE Tool Execution request is %@ , response is %@ \n\n", request, response);
+
</ins><span class="cx"> err = BASExecuteRequestInHelperTool(internalMacPortsAuthRef,
</span><span class="cx"> kMPHelperCommandSet,
</span><span class="cx"> (CFStringRef) bundleID,
</span><span class="lines">@@ -580,6 +593,7 @@
</span><span class="cx"> result = (NSString *) (CFStringRef) CFDictionaryGetValue(response, CFSTR(kTclStringEvaluationResult));
</span><span class="cx"> }
</span><span class="cx"> else { //Try to recover error
</span><ins>+ NSLog(@"*****************************************");
</ins><span class="cx"> failCode = BASDiagnoseFailure(internalMacPortsAuthRef, (CFStringRef) bundleID);
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -649,7 +663,6 @@
</span><span class="cx"> [aTask setLaunchPath:[[NSBundle bundleForClass:[self class]] pathForResource:@"MPPortProcess" ofType:@""]];
</span><span class="cx"> [aTask setArguments:args];
</span><span class="cx"> [aTask launch];
</span><del>-
</del><span class="cx"> NSConnection *notificationsConnection = [NSConnection defaultConnection];
</span><span class="cx"> // Vending MPNotifications sharedListener
</span><span class="cx"> [notificationsConnection setRootObject:[MPNotifications sharedListener]];
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMPMacPortsm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -73,7 +73,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (MPMacPorts *)sharedInstance {
</span><del>- return [self sharedInstanceWithPkgPath:[MPInterpreter PKGPath] portOptions:nil];
</del><ins>+ MPMacPorts * test = [self sharedInstanceWithPkgPath:[MPInterpreter PKGPath] portOptions:nil];
+ return test;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (MPMacPorts *)sharedInstanceWithPkgPath:(NSString *)path portOptions:(NSArray *)options {
</span><span class="lines">@@ -171,6 +172,13 @@
</span><span class="cx"> id key;
</span><span class="cx"> NSError * sError;
</span><span class="cx">
</span><ins>+ result = [NSMutableDictionary dictionaryWithDictionary:
+ [interpreter dictionaryFromTclListAsString:
+ [interpreter evaluateStringAsString:@"puts \"((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((\""
+ error:&sError]]];
+
+ NSLog(@"Resulty De Dulty: %@", result);
+
</ins><span class="cx"> result = [NSMutableDictionary dictionaryWithDictionary:
</span><span class="cx"> [interpreter dictionaryFromTclListAsString:
</span><span class="cx"> [interpreter evaluateStringAsString:@"return [mportlistall]"
</span><span class="lines">@@ -186,16 +194,20 @@
</span><span class="cx"> return [NSDictionary dictionaryWithDictionary:newResult];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSDictionary *)search:(NSString *)query {
- return [self search:query caseSensitive:YES];
</del><ins>+- (NSDictionary *)search:(NSString *)query
+{
+ NSDictionary * foo = [self search:query caseSensitive:YES];
+ return foo;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)isCasesensitive {
</span><del>- return [self search:query caseSensitive:isCasesensitive matchStyle:@"regex"];
</del><ins>+ NSDictionary * foo = [self search:query caseSensitive:isCasesensitive matchStyle:@"regexp"];
+ return foo;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)sensitivity matchStyle:(NSString *)style {
</span><del>- return [self search:query caseSensitive:sensitivity matchStyle:style field:@"name"];
</del><ins>+ NSDictionary * foo = [self search:query caseSensitive:sensitivity matchStyle:style field:@"name"];
+ return foo;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)sensitivity matchStyle:(NSString *)style field:(NSString *)fieldName {
</span><span class="lines">@@ -211,14 +223,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSError * sError;
</span><del>-
- result = [NSMutableDictionary dictionaryWithDictionary:
</del><ins>+
+ result = [NSMutableDictionary dictionaryWithDictionary:
</ins><span class="cx"> [interpreter dictionaryFromTclListAsString:
</span><span class="cx"> [interpreter evaluateStringAsString:
</span><span class="cx"> [NSString stringWithFormat:@"return [mportsearch %@ %@ %@ %@]",
</span><span class="cx"> query, caseSensitivity, style, fieldName]
</span><span class="cx"> error:&sError]]];
</span><del>-
</del><ins>+
</ins><span class="cx"> newResult = [NSMutableDictionary dictionaryWithCapacity:[result count]];
</span><span class="cx"> enumerator = [result keyEnumerator];
</span><span class="cx"> while (key = [enumerator nextObject]) {
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMPPortm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/MPPort.m (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx">
</span><span class="cx"> //Send Global Notifications and update MPNotifications variable
</span><span class="cx"> [self sendGlobalExecNotification:procedure withStatus:@"Started"];
</span><del>- //NSString * tclCmd = [@"YES_" stringByAppendingString:procedure];
</del><ins>+ NSString * tclCmd = [@"YES_" stringByAppendingString:procedure];
</ins><span class="cx"> [[MPNotifications sharedListener] setPerformingTclCommand:procedure];
</span><span class="cx">
</span><span class="cx"> if ([parentMacPortsInstance authorizationMode]) {
</span><span class="lines">@@ -283,6 +283,7 @@
</span><span class="cx">
</span><span class="cx"> if (options != NULL) {
</span><span class="cx"> [opts appendString: [NSString stringWithString:[options componentsJoinedByString:@" "]]];
</span><ins>+ NSLog(@"Opts: %@", opts);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [opts appendString: @" }"];
</span><span class="lines">@@ -293,24 +294,25 @@
</span><span class="cx">
</span><span class="cx"> [vrnts appendString: @" }"];
</span><span class="cx">
</span><del>- //NSLog(@"Variants String: %@", vrnts);
</del><ins>+ NSLog(@"Variants String: %@", vrnts);
</ins><span class="cx"> //Send Global Notifications and update MPNotifications variable
</span><ins>+ if([target isEqual:@"install"])
+ {
+ NSLog(@"HUR");
+ target = @"activate";
+ }
+
</ins><span class="cx"> [self sendGlobalExecNotification:target withStatus:@"Started"];
</span><del>- //NSString * tclCmd = [@"YES_" stringByAppendingString:target];
</del><ins>+ NSString * tclCmd = [@"YES_" stringByAppendingString:target];
</ins><span class="cx"> [[MPNotifications sharedListener] setPerformingTclCommand:target];
</span><del>-
- /*
</del><ins>+
</ins><span class="cx"> NSLog(@"Interpreter string:\n%@",[NSString stringWithFormat:
</span><span class="cx"> @"set portHandle [mportopen %@ %@ %@]; mportexec $portHandle %@; mportclose $portHandle",
</span><span class="cx"> [self valueForKey:@"porturl"], opts, vrnts, target]);
</span><del>- */
- [interpreter evaluateStringWithPossiblePrivileges:
- [NSString stringWithFormat:
- @"set portHandle [mportopen %@ %@ %@]; mportexec $portHandle %@; mportclose $portHandle",
- [self valueForKey:@"porturl"], opts, vrnts, target]
- error:execError];
</del><ins>+
+ NSString * test = [interpreter evaluateStringWithPossiblePrivileges:[NSString stringWithFormat:@"exit; set foo [mportopen %@ %@ %@]; puts $foo; test", [self valueForKey:@"porturl"], opts, vrnts] error:execError];
+ NSLog(@"Pills: %@", test);
</ins><span class="cx">
</span><del>-
</del><span class="cx"> [self setState:MPPortStateLearnState];
</span><span class="cx"> [[MPNotifications sharedListener] setPerformingTclCommand:@""];
</span><span class="cx"> [self sendGlobalExecNotification:target withStatus:@"Finished"];
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMPRegistrym"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/MPRegistry.m (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> NSArray *versions;
</span><span class="cx"> id item;
</span><span class="cx"> raw = [self installedAsArray:name withVersion:version];
</span><ins>+ NSLog(@"Raw = %@", raw);
</ins><span class="cx"> result = [(NSMutableDictionary *)[NSMutableDictionary alloc] initWithCapacity:[raw count]];
</span><span class="cx"> rawEnumerator = [raw objectEnumerator];
</span><span class="cx"> while (item = [rawEnumerator nextObject]) {
</span><span class="lines">@@ -121,8 +122,10 @@
</span><span class="cx"> NSString * result = [interpreter evaluateStringAsString:
</span><span class="cx"> [NSString stringWithFormat:@"return [registry::installed %@ %@]", name, version]
</span><span class="cx"> error:&anError];
</span><ins>+
</ins><span class="cx"> if (result == nil && anError) {
</span><span class="cx"> //Recover from error here
</span><ins>+ NSLog(@"Moo");
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx">
</span><span class="cx"> /* Begin PBXBuildFile section */
</span><span class="cx"> 2160109C1094C66300EE9CD0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED12AA60E3E7E900026773D /* Cocoa.framework */; };
</span><del>- 2160109F1094C6ED00EE9CD0 /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; };
</del><span class="cx"> 216010A21094C6FD00EE9CD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ECD970D0E465C7800488335 /* Security.framework */; };
</span><span class="cx"> 216010A31094C6FD00EE9CD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ECD970D0E465C7800488335 /* Security.framework */; };
</span><span class="cx"> 216010C51094D34500EE9CD0 /* MPRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 48F811BE0CE4636A009630DE /* MPRegistry.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="lines">@@ -60,11 +59,9 @@
</span><span class="cx"> 216010E71094D34500EE9CD0 /* MPHelperNotificationsCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 6E8563B50E5DDF7000C1D73C /* MPHelperNotificationsCommon.c */; };
</span><span class="cx"> 216010E81094D34500EE9CD0 /* MPNotifications+IPCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EE6DDCD0E6276AA00FB2115 /* MPNotifications+IPCAdditions.m */; };
</span><span class="cx"> 216010EA1094D34500EE9CD0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED12AA60E3E7E900026773D /* Cocoa.framework */; };
</span><del>- 216010EB1094D34500EE9CD0 /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; };
</del><span class="cx"> 216010EC1094D34500EE9CD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ECD970D0E465C7800488335 /* Security.framework */; };
</span><span class="cx"> 218DEE2610162091003B5A3B /* SimpleLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 218DED83101612F1003B5A3B /* SimpleLog.m */; };
</span><span class="cx"> 21D95442100940FF00DEF58A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB6FC900E45DEA80057962C /* Foundation.framework */; };
</span><del>- 21D954431009411400DEF58A /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; };
</del><span class="cx"> 21D954471009412F00DEF58A /* MPPortProcess.m in Sources */ = {isa = PBXBuildFile; fileRef = 21D954461009412F00DEF58A /* MPPortProcess.m */; };
</span><span class="cx"> 21D954721009475200DEF58A /* portProcessInit.tcl in Resources */ = {isa = PBXBuildFile; fileRef = 21D954711009475200DEF58A /* portProcessInit.tcl */; };
</span><span class="cx"> 21D9548C1009522100DEF58A /* MPPortProcess in Resources */ = {isa = PBXBuildFile; fileRef = 21D9543E100940EE00DEF58A /* MPPortProcess */; };
</span><span class="lines">@@ -113,7 +110,6 @@
</span><span class="cx"> 6EC2609E0E42950C0013BC48 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EC2609D0E42950C0013BC48 /* CoreFoundation.framework */; };
</span><span class="cx"> 6ECD98110E484E8400488335 /* MPHelperTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECD98100E484E8400488335 /* MPHelperTool.m */; };
</span><span class="cx"> 6ECD99C60E48B91B00488335 /* MPHelperToolTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECD99C50E48B91B00488335 /* MPHelperToolTest.m */; };
</span><del>- 6ED12AF10E3E9E210026773D /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; };
</del><span class="cx"> 6EE6DDA40E626D4A00FB2115 /* MacPorts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* MacPorts.framework */; };
</span><span class="cx"> 6EE6DDA70E626D5A00FB2115 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB6FC900E45DEA80057962C /* Foundation.framework */; };
</span><span class="cx"> 6EE6DDAB0E626DC900FB2115 /* MPHelperToolIPCTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EE6DDAA0E626DC900FB2115 /* MPHelperToolIPCTester.m */; };
</span><span class="lines">@@ -227,7 +223,6 @@
</span><span class="cx"> 6E8563B70E5DDF7000C1D73C /* MPHelperNotificationsProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPHelperNotificationsProtocol.h; sourceTree = "<group>"; };
</span><span class="cx"> 6E88D1CA0DF4B90B00684E9F /* MPMacPortsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMacPortsTest.h; sourceTree = "<group>"; };
</span><span class="cx"> 6E88D1CB0DF4B90B00684E9F /* MPMacPortsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPMacPortsTest.m; sourceTree = "<group>"; };
</span><del>- 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Tcl.framework; path = System/Library/Frameworks/Tcl.framework; sourceTree = SDKROOT; };
</del><span class="cx"> 6EB6FC900E45DEA80057962C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
</span><span class="cx"> 6EC260700E426FC80013BC48 /* BetterAuthorizationSampleLib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = BetterAuthorizationSampleLib.c; sourceTree = "<group>"; };
</span><span class="cx"> 6EC260710E426FC80013BC48 /* BetterAuthorizationSampleLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BetterAuthorizationSampleLib.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -257,7 +252,6 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> 216010EA1094D34500EE9CD0 /* Cocoa.framework in Frameworks */,
</span><del>- 216010EB1094D34500EE9CD0 /* Tcl.framework in Frameworks */,
</del><span class="cx"> 216010EC1094D34500EE9CD0 /* Security.framework in Frameworks */,
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="lines">@@ -267,7 +261,6 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> 21D95442100940FF00DEF58A /* Foundation.framework in Frameworks */,
</span><del>- 21D954431009411400DEF58A /* Tcl.framework in Frameworks */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -291,7 +284,6 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 6ED12AF10E3E9E210026773D /* Tcl.framework in Frameworks */,
</del><span class="cx"> 6EC2609E0E42950C0013BC48 /* CoreFoundation.framework in Frameworks */,
</span><span class="cx"> 6EB6FC910E45DEA80057962C /* Foundation.framework in Frameworks */,
</span><span class="cx"> 216010A31094C6FD00EE9CD0 /* Security.framework in Frameworks */,
</span><span class="lines">@@ -312,7 +304,6 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> 2160109C1094C66300EE9CD0 /* Cocoa.framework in Frameworks */,
</span><del>- 2160109F1094C6ED00EE9CD0 /* Tcl.framework in Frameworks */,
</del><span class="cx"> 216010A21094C6FD00EE9CD0 /* Security.framework in Frameworks */,
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="lines">@@ -348,7 +339,6 @@
</span><span class="cx"> 4822AAD40D7EB39200C4D4D7 /* Documentation */,
</span><span class="cx"> 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
</span><span class="cx"> 034768DFFF38A50411DB9C8B /* Products */,
</span><del>- 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */,
</del><span class="cx"> 6ED12AA60E3E7E900026773D /* Cocoa.framework */,
</span><span class="cx"> 6EC2609D0E42950C0013BC48 /* CoreFoundation.framework */,
</span><span class="cx"> 6EB6FC900E45DEA80057962C /* Foundation.framework */,
</span><span class="lines">@@ -791,7 +781,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = "/usr/bin/env ruby";
</span><del>- 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";
</del><ins>+ 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";
</ins><span class="cx"> };
</span><span class="cx"> 489DD8F20C94365F00595506 /* Run Script */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -987,9 +977,15 @@
</span><span class="cx"> LIBRARY_SEARCH_PATHS = (
</span><span class="cx"> "$(inherited)",
</span><span class="cx"> "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
</span><ins>+ "/opt/local/libexec/macports/lib/**",
</ins><span class="cx"> );
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
</span><ins>+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PRODUCT_NAME = MacPorts;
</span><span class="cx"> SYMROOT = build;
</span><span class="cx"> WRAPPER_EXTENSION = framework;
</span><span class="lines">@@ -1015,9 +1011,15 @@
</span><span class="cx"> LIBRARY_SEARCH_PATHS = (
</span><span class="cx"> "$(inherited)",
</span><span class="cx"> "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
</span><ins>+ "/opt/local/libexec/macports/lib/**",
</ins><span class="cx"> );
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
</span><ins>+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PRODUCT_NAME = MacPorts;
</span><span class="cx"> WRAPPER_EXTENSION = framework;
</span><span class="cx"> ZERO_LINK = NO;
</span><span class="lines">@@ -1094,6 +1096,12 @@
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_VERSION = "";
</span><span class="cx"> INSTALL_PATH = /usr/local/bin;
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPHelperTool;
</span><span class="cx"> SDKROOT = macosx10.8;
</span><span class="lines">@@ -1120,9 +1128,15 @@
</span><span class="cx"> LIBRARY_SEARCH_PATHS = (
</span><span class="cx"> "$(inherited)",
</span><span class="cx"> "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
</span><ins>+ "/opt/local/libexec/macports/lib/**",
</ins><span class="cx"> );
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
</span><ins>+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PRODUCT_NAME = MacPorts;
</span><span class="cx"> WRAPPER_EXTENSION = framework;
</span><span class="cx"> ZERO_LINK = NO;
</span><span class="lines">@@ -1148,11 +1162,15 @@
</span><span class="cx"> GCC_VERSION = "";
</span><span class="cx"> INFOPLIST_FILE = "Test-Info.plist";
</span><span class="cx"> INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
</ins><span class="cx"> OTHER_LDFLAGS = (
</span><span class="cx"> "-framework",
</span><span class="cx"> Cocoa,
</span><span class="cx"> "-framework",
</span><span class="cx"> SenTestingKit,
</span><ins>+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
</ins><span class="cx"> );
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = Test;
</span><span class="lines">@@ -1194,6 +1212,9 @@
</span><span class="cx"> Foundation,
</span><span class="cx"> "-framework",
</span><span class="cx"> AppKit,
</span><ins>+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
</ins><span class="cx"> );
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPHelperToolIPCTester;
</span><span class="lines">@@ -1215,11 +1236,15 @@
</span><span class="cx"> GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
</span><span class="cx"> GCC_VERSION = "";
</span><span class="cx"> INSTALL_PATH = /usr/local/bin;
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
</ins><span class="cx"> OTHER_LDFLAGS = (
</span><span class="cx"> "-framework",
</span><span class="cx"> Foundation,
</span><span class="cx"> "-framework",
</span><span class="cx"> AppKit,
</span><ins>+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
</ins><span class="cx"> );
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPPortProcess;
</span><span class="lines">@@ -1250,9 +1275,15 @@
</span><span class="cx"> LIBRARY_SEARCH_PATHS = (
</span><span class="cx"> "$(inherited)",
</span><span class="cx"> "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
</span><ins>+ "/opt/local/libexec/macports/lib/**",
</ins><span class="cx"> );
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
</span><ins>+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PRODUCT_NAME = MacPorts;
</span><span class="cx"> SYMROOT = build;
</span><span class="cx"> WRAPPER_EXTENSION = framework;
</span><span class="lines">@@ -1280,9 +1311,15 @@
</span><span class="cx"> LIBRARY_SEARCH_PATHS = (
</span><span class="cx"> "$(inherited)",
</span><span class="cx"> "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
</span><ins>+ "/opt/local/libexec/macports/lib/**",
</ins><span class="cx"> );
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
</span><ins>+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PRODUCT_NAME = MacPorts;
</span><span class="cx"> WRAPPER_EXTENSION = framework;
</span><span class="cx"> ZERO_LINK = NO;
</span><span class="lines">@@ -1310,9 +1347,15 @@
</span><span class="cx"> LIBRARY_SEARCH_PATHS = (
</span><span class="cx"> "$(inherited)",
</span><span class="cx"> "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
</span><ins>+ "/opt/local/libexec/macports/lib/**",
</ins><span class="cx"> );
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
</span><span class="cx"> LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
</span><ins>+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PRODUCT_NAME = MacPorts;
</span><span class="cx"> WRAPPER_EXTENSION = framework;
</span><span class="cx"> ZERO_LINK = NO;
</span><span class="lines">@@ -1332,11 +1375,15 @@
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
</span><span class="cx"> INSTALL_PATH = /usr/local/bin;
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
</ins><span class="cx"> OTHER_LDFLAGS = (
</span><span class="cx"> "-framework",
</span><span class="cx"> Foundation,
</span><span class="cx"> "-framework",
</span><span class="cx"> AppKit,
</span><ins>+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
</ins><span class="cx"> );
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPPortProcess;
</span><span class="lines">@@ -1355,11 +1402,15 @@
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
</span><span class="cx"> INSTALL_PATH = /usr/local/bin;
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
</ins><span class="cx"> OTHER_LDFLAGS = (
</span><span class="cx"> "-framework",
</span><span class="cx"> Foundation,
</span><span class="cx"> "-framework",
</span><span class="cx"> AppKit,
</span><ins>+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
</ins><span class="cx"> );
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPPortProcess;
</span><span class="lines">@@ -1387,12 +1438,17 @@
</span><span class="cx"> GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
</span><span class="cx"> INFOPLIST_FILE = "Test-Info.plist";
</span><span class="cx"> INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = /opt/local/libexec/macports/lib;
</ins><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx"> OTHER_LDFLAGS = (
</span><span class="cx"> "-framework",
</span><span class="cx"> Cocoa,
</span><span class="cx"> "-framework",
</span><span class="cx"> SenTestingKit,
</span><ins>+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
</ins><span class="cx"> );
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = Test;
</span><span class="lines">@@ -1420,11 +1476,16 @@
</span><span class="cx"> GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
</span><span class="cx"> INFOPLIST_FILE = "Test-Info.plist";
</span><span class="cx"> INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ "LIBRARY_SEARCH_PATHS[arch=*]" = /opt/local/libexec/macports/lib;
</ins><span class="cx"> OTHER_LDFLAGS = (
</span><span class="cx"> "-framework",
</span><span class="cx"> Cocoa,
</span><span class="cx"> "-framework",
</span><span class="cx"> SenTestingKit,
</span><ins>+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
</ins><span class="cx"> );
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = Test;
</span><span class="lines">@@ -1481,6 +1542,12 @@
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_OPTIMIZATION_LEVEL = 0;
</span><span class="cx"> INSTALL_PATH = /usr/local/bin;
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPHelperTool;
</span><span class="cx"> SDKROOT = macosx10.8;
</span><span class="lines">@@ -1497,6 +1564,12 @@
</span><span class="cx"> GCC_ENABLE_OBJC_GC = unsupported;
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> INSTALL_PATH = /usr/local/bin;
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPHelperTool;
</span><span class="cx"> SDKROOT = macosx10.8;
</span><span class="lines">@@ -1523,6 +1596,9 @@
</span><span class="cx"> Foundation,
</span><span class="cx"> "-framework",
</span><span class="cx"> AppKit,
</span><ins>+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
</ins><span class="cx"> );
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPHelperToolIPCTester;
</span><span class="lines">@@ -1548,6 +1624,9 @@
</span><span class="cx"> Foundation,
</span><span class="cx"> "-framework",
</span><span class="cx"> AppKit,
</span><ins>+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
</ins><span class="cx"> );
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPHelperToolIPCTester;
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectxcworkspacexcshareddataMacPortsFrameworkxccheckout"></a>
<div class="addfile"><h4>Added: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcshareddata/MacPorts.Framework.xccheckout (0 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<?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>
</ins></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectxcworkspacexcuserdatamrappleseedxcuserdatadUserInterfaceStatexcuserstate"></a>
<div class="binary"><h4>Added: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectxcworkspacexcuserdatamrappleseedxcuserdatadWorkspaceSettingsxcsettings"></a>
<div class="addfile"><h4>Added: branches/gsoc15-pallet/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/WorkspaceSettings.xcsettings (0 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?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>
</ins></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMakefile"></a>
<div class="addfile"><h4>Added: branches/gsoc15-pallet/MacPorts_Framework/Makefile (0 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-pallet/MacPorts_Framework/Makefile (rev 0)
+++ branches/gsoc15-pallet/MacPorts_Framework/Makefile 2015-07-01 20:07:24 UTC (rev 138196)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+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
+
+
+
</ins></span></pre></div>
<a id="branchesgsoc15palletMacPorts_Frameworkinittcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/init.tcl (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,6 @@
</span><ins>+
+#set auto_path [concat $auto_path "/opt/local/libexec/macports/lib/"]
+
</ins><span class="cx"> package require macports
</span><span class="cx"> package require notifications
</span><span class="cx">
</span><span class="lines">@@ -38,6 +41,7 @@
</span><span class="cx"> #and log error Information in a similar fashion to code
</span><span class="cx"> #in macports.tcl.
</span><span class="cx"> proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""}} {
</span><ins>+ puts "IN THIS REALLY COOL SHIT NOW. NOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOW"
</ins><span class="cx"> if {[catch {registry_uninstall::uninstall $portname $version $revision $variants $optionslist} result]} {
</span><span class="cx">
</span><span class="cx"> global errorInfo
</span><span class="lines">@@ -47,6 +51,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> proc mportuninstall_composite {portname {v ""} {optionslist ""}} {
</span><ins>+ puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!IN THIS REALLY COOL SHIT NOW. NOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOW"
</ins><span class="cx"> if {[catch {registry_uninstall::uninstall_composite $portname $v $optionslist} result]} {
</span><span class="cx">
</span><span class="cx"> global errorInfo
</span><span class="lines">@@ -105,7 +110,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> # Initialize dport
</span><span class="cx"> # This must be done following parse of global options, as some options are
</span><span class="cx"> # evaluated by dportinit.
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkinterpInittcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/interpInit.tcl (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #in macports.tcl. Note optionslist is not being used for now
</span><span class="cx"> set mp_empty_list [list]
</span><span class="cx"> proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
</span><ins>+ puts "HERRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR"
</ins><span class="cx"> if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} {
</span><span class="cx">
</span><span class="cx"> global errorInfo
</span><span class="lines">@@ -48,6 +49,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> proc mportuninstall_composite {portname {v ""} {optionslist ""} } {
</span><ins>+ puts "HETTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT"
+ exit
+
</ins><span class="cx"> if {[catch {registry_uninstall::uninstall_composite $portname $v [array get options]} result]} {
</span><span class="cx">
</span><span class="cx"> global errorInfo
</span><span class="lines">@@ -109,6 +113,9 @@
</span><span class="cx"> # Initialize dport
</span><span class="cx"> # This must be done following parse of global options, as some options are
</span><span class="cx"> # evaluated by dportinit.
</span><ins>+
+puts "I eat puppies for dinner."
+
</ins><span class="cx"> if {[catch {mportinit ui_options global_options global_variations} result]} {
</span><span class="cx"> global errorInfo
</span><span class="cx"> puts "$errorInfo"
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkportProcessInittcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx"> #in macports.tcl. Note optionslist is not being used for now
</span><span class="cx"> set mp_empty_list [list]
</span><span class="cx"> proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
</span><ins>+ puts "Test"
+ exit
</ins><span class="cx"> if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} {
</span><span class="cx">
</span><span class="cx"> global errorInfo
</span><span class="lines">@@ -48,6 +50,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> proc mportuninstall_composite {portname {v ""} {optionslist ""} } {
</span><ins>+ puts "Moo"
+ exit
</ins><span class="cx"> if {[catch {registry_uninstall::uninstall_composite $portname $v [array get options]} result]} {
</span><span class="cx">
</span><span class="cx"> global errorInfo
</span></span></pre></div>
<a id="branchesgsoc15palletPalletMPActionLauncherh"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/Pallet/MPActionLauncher.h (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -15,8 +15,8 @@
</span><span class="cx">
</span><span class="cx"> #import <Cocoa/Cocoa.h>
</span><span class="cx"> #import <MacPorts/MacPorts.h>
</span><del>-#import <Growl/Growl.h>
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> #import "GrowlNotifications.h"
</span><span class="cx">
</span><span class="cx"> /*!
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> @abstract Wrapper for MacPorts Framework actions
</span><span class="cx"> @discussion Contains a shared per thread MacPorts Framework wrapper
</span><span class="cx"> */
</span><del>-@interface MPActionLauncher : NSObject <GrowlApplicationBridgeDelegate> {
</del><ins>+@interface MPActionLauncher : NSObject <NSApplicationDelegate, NSUserNotificationCenterDelegate> {
</ins><span class="cx"> NSArray *ports;
</span><span class="cx"> NSTask *actionTool;
</span><span class="cx"> NSConnection *connectionToActionTool;
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx"> */
</span><span class="cx"> - (void)upgradePort:(MPPort *)port;
</span><span class="cx">
</span><del>-
</del><span class="cx"> /*!
</span><span class="cx"> @brief Syncs the MacPorts installation in another thread
</span><span class="cx"> */
</span><span class="lines">@@ -92,6 +91,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)cancelPortProcess;
</span><span class="cx">
</span><del>--(void) sendGrowlNotification: (int) type;
</del><ins>+-(void) sendNotification: (int) type;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchesgsoc15palletPalletMPActionLauncherm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/Pallet/MPActionLauncher.m (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,11 +56,12 @@
</span><span class="cx"> [port installWithOptions:empty variants:empty error:&error];
</span><span class="cx"> //Check if we have received an error, send the apropriate notification, and if everything is fine
</span><span class="cx"> //send a notification to the main thread that we have completed our operation, and to advance the queue
</span><ins>+
</ins><span class="cx"> if(errorReceived)
</span><del>- [self sendGrowlNotification: GROWL_INSTALLFAILED];
</del><ins>+ [self sendNotification: GROWL_INSTALLFAILED];
</ins><span class="cx"> else
</span><span class="cx"> {
</span><del>- [self sendGrowlNotification: GROWL_INSTALL];
</del><ins>+ [self sendNotification: GROWL_INSTALL];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,10 +79,10 @@
</span><span class="cx"> //Check if we have received an error, send the apropriate notification, and if everything is fine
</span><span class="cx"> //send a notification to the main thread that we have completed our operation, and to advance the queue
</span><span class="cx"> if(errorReceived)
</span><del>- [self sendGrowlNotification: GROWL_INSTALLFAILED];
</del><ins>+ [self sendNotification: GROWL_INSTALLFAILED];
</ins><span class="cx"> else
</span><span class="cx"> {
</span><del>- [self sendGrowlNotification: GROWL_INSTALL];
</del><ins>+ [self sendNotification: GROWL_INSTALL];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -94,10 +95,10 @@
</span><span class="cx"> //Check if we have received an error, send the apropriate notification, and if everything is fine
</span><span class="cx"> //send a notification to the main thread that we have completed our operation, and to advance the queue
</span><span class="cx"> if(errorReceived)
</span><del>- [self sendGrowlNotification: GROWL_UNINSTALLFAILED];
</del><ins>+ [self sendNotification: GROWL_UNINSTALLFAILED];
</ins><span class="cx"> else
</span><span class="cx"> {
</span><del>- [self sendGrowlNotification: GROWL_UNINSTALL];
</del><ins>+ [self sendNotification: GROWL_UNINSTALL];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -109,10 +110,10 @@
</span><span class="cx"> //Check if we have received an error, send the apropriate notification, and if everything is fine
</span><span class="cx"> //send a notification to the main thread that we have completed our operation, and to advance the queue
</span><span class="cx"> if(errorReceived)
</span><del>- [self sendGrowlNotification: GROWL_UPGRADEFAILED];
</del><ins>+ [self sendNotification: GROWL_UPGRADEFAILED];
</ins><span class="cx"> else
</span><span class="cx"> {
</span><del>- [self sendGrowlNotification: GROWL_UPGRADE];
</del><ins>+ [self sendNotification: GROWL_UPGRADE];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -124,10 +125,10 @@
</span><span class="cx"> //Check if we have received an error, send the apropriate notification, and if everything is fine
</span><span class="cx"> //send a notification to the main thread that we have completed our operation, and to advance the queue
</span><span class="cx"> if(errorReceived)
</span><del>- [self sendGrowlNotification: GROWL_SYNCFAILED];
</del><ins>+ [self sendNotification: GROWL_SYNCFAILED];
</ins><span class="cx"> else
</span><span class="cx"> {
</span><del>- [self sendGrowlNotification: GROWL_SYNC];
</del><ins>+ [self sendNotification: GROWL_SYNC];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -138,11 +139,12 @@
</span><span class="cx"> [[MPMacPorts sharedInstance] selfUpdate:&error];
</span><span class="cx"> //Check if we have received an error, send the apropriate notification, and if everything is fine
</span><span class="cx"> //send a notification to the main thread that we have completed our operation, and to advance the queue
</span><ins>+
</ins><span class="cx"> if(errorReceived)
</span><del>- [self sendGrowlNotification: GROWL_SELFUPDATEFAILED];
</del><ins>+ [self sendNotification: GROWL_SELFUPDATEFAILED];
</ins><span class="cx"> else
</span><span class="cx"> {
</span><del>- [self sendGrowlNotification: GROWL_SELFUPDATE];
</del><ins>+ [self sendNotification: GROWL_SELFUPDATE];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -152,69 +154,62 @@
</span><span class="cx"> [[MPMacPorts sharedInstance] cancelCurrentCommand];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-//sendGrowlNotification is the method used to send our Growl notifications, via the Growl framework. It takes one argument, which is the
</del><ins>+- (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
</ins><span class="cx"> //type of notification we are sending, as defined in GrowlNotifications.h It initializes the strings we will be sending to the
</span><del>-//Growl Framework that comprise our notification, and finaly sends the notification
--(void) sendGrowlNotification:(int)type
</del><ins>+//Notification Center that comprise our notification, and finaly sends the notification
+-(void) sendNotification:(int)type
</ins><span class="cx"> {
</span><span class="cx"> //The notification needs a title. We initialize an array containing the titles for each type of notification
</span><del>- 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"];
</del><ins>+ 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";
</ins><span class="cx">
</span><del>- growlTitles[GROWL_ALLOPS] = [NSString stringWithString: @"Operations Completed"];
- growlTitles[GROWL_ALLOPSFAILED] = [NSString stringWithString: @"Operations Failed"];
</del><ins>+ notificationTitles[GROWL_ALLOPS] = @"Operations Completed";
+ notificationTitles[GROWL_ALLOPSFAILED] = @"Operations Failed";
</ins><span class="cx">
</span><span class="cx"> //The notification also needs a description. We initialize an array containing the descriptions for each type of notification
</span><del>- 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"];
</del><ins>+ 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";
</ins><span class="cx">
</span><del>- growlDescriptions[GROWL_ALLOPS] = [NSString stringWithString: @"All Operations Completed Succesfully"];
- growlDescriptions[GROWL_ALLOPSFAILED] = [NSString stringWithString: @"Operations Failed"];
</del><ins>+ notificationDescriptions[GROWL_ALLOPS] = @"All Operations Completed Succesfully";
+ notificationDescriptions[GROWL_ALLOPSFAILED] = @"Operations Failed";
</ins><span class="cx">
</span><del>- //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"];
</del><span class="cx">
</span><del>- 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];
</del><ins>+ //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];
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchesgsoc15palletPalletMPActionsControllerm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/Pallet/MPActionsController.m (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -435,8 +435,9 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:@"advanceQ" object:nil];
</span><span class="cx">
</span><span class="cx"> int allops=GROWL_ALLOPS;
</span><del>- [[MPActionLauncher sharedInstance]
- performSelectorInBackground:@selector(sendGrowlNotification:) withObject:(id) allops];
</del><ins>+ //FIXME
+ //[[MPActionLauncher sharedInstance]
+ //performSelectorInBackground:@selector(sendGrowlNotification:) withObject:(id) allops];
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesgsoc15palletPalletMakefile"></a>
<div class="addfile"><h4>Added: branches/gsoc15-pallet/Pallet/Makefile (0 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-pallet/Pallet/Makefile (rev 0)
+++ branches/gsoc15-pallet/Pallet/Makefile 2015-07-01 20:07:24 UTC (rev 138196)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+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
+
+
+
</ins></span></pre></div>
<a id="branchesgsoc15palletPalletPalletxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.pbxproj (138195 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,11 +26,6 @@
</span><span class="cx"> 1D24FCAB11CD32090063E2A5 /* TB_InstallWithVar.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D24FCAA11CD32090063E2A5 /* TB_InstallWithVar.icns */; };
</span><span class="cx"> 1D24FCAC11CD32090063E2A5 /* TB_InstallWithVar.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D24FCAA11CD32090063E2A5 /* TB_InstallWithVar.icns */; };
</span><span class="cx"> 1D4B877F11A5496B00AD9D33 /* Growl Registration Ticket.growlRegDict in Resources */ = {isa = PBXBuildFile; fileRef = 1D4B877E11A5496B00AD9D33 /* Growl Registration Ticket.growlRegDict */; };
</span><del>- 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 */; };
</del><span class="cx"> 1D9B73F911F0F6D6006013F5 /* MPQueueTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */; };
</span><span class="cx"> 1D9B73FA11F0F6D6006013F5 /* MPQueueTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */; };
</span><span class="cx"> 1DA3219411F748330004ECB1 /* MPCheckbox.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DA3219311F748330004ECB1 /* MPCheckbox.m */; };
</span><span class="lines">@@ -150,7 +145,6 @@
</span><span class="cx"> dstPath = "";
</span><span class="cx"> dstSubfolderSpec = 10;
</span><span class="cx"> files = (
</span><del>- 1D4B87CE11A54FEF00AD9D33 /* Growl.framework in CopyFiles */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -160,7 +154,6 @@
</span><span class="cx"> dstPath = "";
</span><span class="cx"> dstSubfolderSpec = 10;
</span><span class="cx"> files = (
</span><del>- 1D4B87D411A5500100AD9D33 /* Growl.framework in CopyFiles */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -185,7 +178,6 @@
</span><span class="cx"> 1D24FC5F11CD1C770063E2A5 /* GrowlNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrowlNotifications.h; sourceTree = "<group>"; };
</span><span class="cx"> 1D24FCAA11CD32090063E2A5 /* TB_InstallWithVar.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TB_InstallWithVar.icns; sourceTree = "<group>"; };
</span><span class="cx"> 1D4B877E11A5496B00AD9D33 /* Growl Registration Ticket.growlRegDict */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Growl Registration Ticket.growlRegDict"; sourceTree = "<group>"; };
</span><del>- 1D4B87BA11A54DE000AD9D33 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = "Growl-1.2.1-Framework/Growl.framework"; sourceTree = "<group>"; };
</del><span class="cx"> 1D9B73F711F0F6D6006013F5 /* MPQueueTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPQueueTableView.h; sourceTree = "<group>"; };
</span><span class="cx"> 1D9B73F811F0F6D6006013F5 /* MPQueueTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPQueueTableView.m; sourceTree = "<group>"; };
</span><span class="cx"> 1DA3219211F748330004ECB1 /* MPCheckbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCheckbox.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -235,7 +227,6 @@
</span><span class="cx"> files = (
</span><span class="cx"> 21900DE01095001700ED79CF /* MacPorts.framework in Frameworks */,
</span><span class="cx"> 21900DE11095001700ED79CF /* Cocoa.framework in Frameworks */,
</span><del>- 1D4B87BB11A54DE000AD9D33 /* Growl.framework in Frameworks */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -245,7 +236,6 @@
</span><span class="cx"> files = (
</span><span class="cx"> 21900E031095030B00ED79CF /* MacPorts.framework in Frameworks */,
</span><span class="cx"> 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
</span><del>- 1D4B87BC11A54DE000AD9D33 /* Growl.framework in Frameworks */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -338,7 +328,6 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> 1D24FC5F11CD1C770063E2A5 /* GrowlNotifications.h */,
</span><del>- 1D4B87BA11A54DE000AD9D33 /* Growl.framework */,
</del><span class="cx"> 21F165400FE2C04300542AEE /* MacPorts.Framework.xcodeproj */,
</span><span class="cx"> 21F166FC0FE32DF000542AEE /* Models */,
</span><span class="cx"> 21F167570FE3343600542AEE /* Controllers */,
</span><span class="lines">@@ -552,7 +541,6 @@
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 1D4B878011A5498200AD9D33 /* Growl Registration Ticket.growlRegDict in Resources */,
</del><span class="cx"> 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
</span><span class="cx"> 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
</span><span class="cx"> 21FC226D0FE88A2A00B1E835 /* Installed.tiff in Resources */,
</span><span class="lines">@@ -809,7 +797,6 @@
</span><span class="cx"> "$(inherited)",
</span><span class="cx"> "\"$(SRCROOT)/../MacPorts_Framework/build\"",
</span><span class="cx"> "\"$(SRCROOT)/../MacPorts_Framework/build/Release\"",
</span><del>- "\"$(SRCROOT)/Growl-1.2.1-Framework\"",
</del><span class="cx"> );
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = YES;
</span><span class="lines">@@ -820,6 +807,12 @@
</span><span class="cx"> GCC_PREFIX_HEADER = Pallet_Prefix.pch;
</span><span class="cx"> INFOPLIST_FILE = Info.plist;
</span><span class="cx"> INSTALL_PATH = "$(HOME)/Applications";
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ OTHER_LDFLAGS = (
+ "-I$prefix/libexec/macports/include",
+ "-L$prefix/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PRODUCT_NAME = Pallet;
</span><span class="cx"> SDKROOT = macosx;
</span><span class="cx"> };
</span><span class="lines">@@ -831,10 +824,7 @@
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><span class="cx"> COMBINE_HIDPI_IMAGES = YES;
</span><span class="cx"> COPY_PHASE_STRIP = NO;
</span><del>- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/Growl-1.2.1-Framework\"",
- );
</del><ins>+ FRAMEWORK_SEARCH_PATHS = "$(inherited)";
</ins><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = YES;
</span><span class="cx"> GCC_ENABLE_OBJC_GC = unsupported;
</span><span class="lines">@@ -844,6 +834,13 @@
</span><span class="cx"> GCC_PREFIX_HEADER = Pallet_Prefix.pch;
</span><span class="cx"> INFOPLIST_FILE = Info.plist;
</span><span class="cx"> INSTALL_PATH = "$(HOME)/Applications";
</span><ins>+ 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";
</ins><span class="cx"> PRODUCT_NAME = Pallet;
</span><span class="cx"> SDKROOT = macosx;
</span><span class="cx"> };
</span><span class="lines">@@ -859,14 +856,24 @@
</span><span class="cx"> "\"$(SRCROOT)/../MacPorts_Framework/build\"",
</span><span class="cx"> "$(inherited)",
</span><span class="cx"> "\"$(SRCROOT)/../MacPorts_Framework/build/Release\"",
</span><del>- "\"$(SRCROOT)/Growl-1.2.1-Framework\"",
</del><span class="cx"> );
</span><ins>+ "FRAMEWORK_SEARCH_PATHS[arch=*]" = (
+ "\"$(SRCROOT)/../MacPorts_Framework/build\"",
+ "$(inherited)",
+ "\"$(SRCROOT)/../MacPorts_Framework/build/Release\"",
+ );
</ins><span class="cx"> GCC_ENABLE_OBJC_GC = unsupported;
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_PREFIX_HEADER = Pallet_Prefix.pch;
</span><span class="cx"> INFOPLIST_FILE = Info.plist;
</span><span class="cx"> INSTALL_PATH = "$(HOME)/Applications";
</span><ins>+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ OTHER_LDFLAGS = (
+ "-I$prefix/libexec/macports/include",
+ "-L$prefix/libexec/macports/lib",
+ "-ltcl8.5",
+ );
</ins><span class="cx"> PRODUCT_NAME = Pallet;
</span><span class="cx"> SDKROOT = macosx;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchesgsoc15palletPalletPalletxcodeprojprojectxcworkspacexcuserdatamrappleseedxcuserdatadUserInterfaceStatexcuserstate"></a>
<div class="binary"><h4>Modified: branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="branchesgsoc15palletPalletPalletxcodeprojxcuserdatamrappleseedxcuserdatadxcdebuggerBreakpoints_v2xcbkptlist"></a>
<div class="addfile"><h4>Added: branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/xcuserdata/mrappleseed.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist (0 => 138196)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<?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>
</ins></span></pre>
</div>
</div>
</body>
</html>