<!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>[143493] contrib/MacPorts_Framework</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/143493">143493</a></dd>
<dt>Author</dt> <dd>ksammons@macports.org</dd>
<dt>Date</dt> <dd>2015-12-13 12:43:34 -0800 (Sun, 13 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged MacPorts_Framework GSoC changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribMacPorts_FrameworkBetterAuthorizationSampleLibc">contrib/MacPorts_Framework/BetterAuthorizationSampleLib.c</a></li>
<li><a href="#contribMacPorts_FrameworkInfoplist">contrib/MacPorts_Framework/Info.plist</a></li>
<li><a href="#contribMacPorts_FrameworkMPHelperToolm">contrib/MacPorts_Framework/MPHelperTool.m</a></li>
<li><a href="#contribMacPorts_FrameworkMPHelperToolIPCTesterm">contrib/MacPorts_Framework/MPHelperToolIPCTester.m</a></li>
<li><a href="#contribMacPorts_FrameworkMPInterpreterm">contrib/MacPorts_Framework/MPInterpreter.m</a></li>
<li><a href="#contribMacPorts_FrameworkMPMacPortsh">contrib/MacPorts_Framework/MPMacPorts.h</a></li>
<li><a href="#contribMacPorts_FrameworkMPMacPortsm">contrib/MacPorts_Framework/MPMacPorts.m</a></li>
<li><a href="#contribMacPorts_FrameworkMPPorth">contrib/MacPorts_Framework/MPPort.h</a></li>
<li><a href="#contribMacPorts_FrameworkMPPortm">contrib/MacPorts_Framework/MPPort.m</a></li>
<li><a href="#contribMacPorts_FrameworkMPPortProcessm">contrib/MacPorts_Framework/MPPortProcess.m</a></li>
<li><a href="#contribMacPorts_FrameworkMPRegistrym">contrib/MacPorts_Framework/MPRegistry.m</a></li>
<li><a href="#contribMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectpbxproj">contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj</a></li>
<li><a href="#contribMacPorts_Frameworkinittcl">contrib/MacPorts_Framework/init.tcl</a></li>
<li><a href="#contribMacPorts_FrameworkinterpInittcl">contrib/MacPorts_Framework/interpInit.tcl</a></li>
<li><a href="#contribMacPorts_FrameworkportProcessInittcl">contrib/MacPorts_Framework/portProcessInit.tcl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/</li>
<li>contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/xcuserdata/</li>
<li><a href="#contribMacPorts_FrameworkMakefile">contrib/MacPorts_Framework/Makefile</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#contribMacPorts_Framework">contrib/MacPorts_Framework/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribMacPorts_Framework"></a>
<div class="propset"><h4>Property changes: contrib/MacPorts_Framework</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/gsoc10-gui/MacPorts_Framework:67321-72221
</span><span class="cx"> + /branches/gsoc09-gui/MacPorts_Framework:50819-65490
</span><span class="cx">/branches/gsoc10-gui/MacPorts_Framework:67321-72221
</span><span class="cx">/branches/gsoc15-pallet/MacPorts_Framework:136747-143492
</span><a id="contribMacPorts_FrameworkBetterAuthorizationSampleLibc"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/BetterAuthorizationSampleLib.c (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/BetterAuthorizationSampleLib.c 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/BetterAuthorizationSampleLib.c 2015-12-13 20:43:34 UTC (rev 143493)
</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="contribMacPorts_FrameworkInfoplist"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/Info.plist (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/Info.plist 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/Info.plist 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -29,5 +29,9 @@
</span><span class="cx"> <key>x86_64</key>
</span><span class="cx"> <string>10.6.0</string>
</span><span class="cx"> </dict>
</span><ins>+ <key>SMAuthorizedClients</key>
+ <array>
+ <string>identifier org.macports.framework.macports and certificate leaf = H&quot;6a52be62749c0ff3d3192d010737a433423c0513&quot;</string>
+ </array>
</ins><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre></div>
<a id="contribMacPorts_FrameworkMPHelperToolm"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MPHelperTool.m (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MPHelperTool.m 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MPHelperTool.m 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -899,7 +899,7 @@
</span><span class="cx"> //Get the tcl Interpreter pkg path
</span><span class="cx"> NSString * tclPkgPath = (NSString *) (CFStringRef) CFDictionaryGetValue(request, CFSTR(kTclInterpreterInitPath));
</span><span class="cx"> if (tclPkgPath == nil) {
</span><del>- retval == coreFoundationUnknownErr;
</del><ins>+ retval = coreFoundationUnknownErr;
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> CFDictionaryAddValue(response, CFSTR("TclPkgPath"), (CFStringRef)tclPkgPath);
</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 class="lines">@@ -1069,8 +1079,8 @@
</span><span class="cx"> //asl_close(logClient);
</span><span class="cx">
</span><span class="cx"> [notifier closeConnection];
</span><del>- [notifier release];
- [ipcFilePath release];
</del><ins>+ notifier = nil;
+ ipcFilePath = nil;
</ins><span class="cx">
</span><span class="cx"> [pool release];
</span><span class="cx">
</span></span></pre></div>
<a id="contribMacPorts_FrameworkMPHelperToolIPCTesterm"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MPHelperToolIPCTester.m (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MPHelperToolIPCTester.m 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MPHelperToolIPCTester.m 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -172,6 +172,7 @@
</span><span class="cx"> if([pm installUninstallManipulation:@"pngcrush"]) {
</span><span class="cx"> NSLog(@"pngcrush INSTALLATION SUCCESSFUL");
</span><span class="cx"> }
</span><ins>+ /*
</ins><span class="cx"> else {
</span><span class="cx"> NSLog(@"pngcrush INSTALLATION UNSUCCESSFUL");
</span><span class="cx"> }
</span><span class="lines">@@ -181,7 +182,7 @@
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> NSLog(@"SELFUPDATE UNSUCCESSFUL");
</span><del>- }
</del><ins>+ }*/
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="contribMacPorts_FrameworkMPInterpreterm"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MPInterpreter.m (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MPInterpreter.m 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MPInterpreter.m 2015-12-13 20:43:34 UTC (rev 143493)
</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="contribMacPorts_FrameworkMPMacPortsh"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MPMacPorts.h (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MPMacPorts.h 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MPMacPorts.h 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -90,6 +90,22 @@
</span><span class="cx"> - (BOOL) setPortOptions:(NSArray *)options;
</span><span class="cx">
</span><span class="cx"> /*!
</span><ins>+ @brief Runs the diagnose command.
+ */
+- (id)diagnose:(NSError**)sError;
+
+/*!
+ @brief Runs the reclaim command.
+ */
+- (id)reclaim:(NSError**)sError;
+
+/*!
+ @brief Runs the rev-upgrade command.
+ */
+- (id)revupgrade:(NSError**)sError;
+
+
+/*!
</ins><span class="cx"> @brief Synchronizes the ports tree without checking for upgrades to the MacPorts base.
</span><span class="cx"> */
</span><span class="cx"> - (id)sync:(NSError **)sError;
</span></span></pre></div>
<a id="contribMacPorts_FrameworkMPMacPortsm"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MPMacPorts.m (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MPMacPorts.m 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MPMacPorts.m 2015-12-13 20:43:34 UTC (rev 143493)
</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">@@ -130,8 +131,94 @@
</span><span class="cx">
</span><span class="cx"> #pragma MacPorts API
</span><span class="cx">
</span><ins>+- (id)revupgrade:(NSError **)sError
+{
+ NSString * result = nil;
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_revupgrade_Started" object:nil];
+ [[MPNotifications sharedListener] setPerformingTclCommand:@"revupgrade"];
+
+ //FIXME
+ /*
+ if ([self authorizationMode])
+ {
+ result = [interpreter evaluateStringWithMPHelperTool:@"mportrevupgrade" error:sError];
+ }
+ else
+ {
+ result = [interpreter evaluateStringWithPossiblePrivileges:@"mportrevupgrade" error:sError];
+ }*/
+
+ /*result = [interpreter evaluateStringAsString:@"exec port rev-upgrade 2>foo.txt > foo.txt; set test [exec cat foo.txt]; file delete -force foo.txt; return \"Port revupgrade output:\n $test\"" error:sError];
+ NSAlert * alert = [[NSAlert alloc]init];
+ [alert setMessageText:result];
+ [alert runModal];*/
+ result = [interpreter evaluateStringAsString:@"macports::rev_upgrade" error:sError];
+
+ [[MPNotifications sharedListener] setPerformingTclCommand:@""];
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_revupgrade_Finished" object:nil];
+
+ return result;
</ins><span class="cx">
</span><ins>+}
</ins><span class="cx">
</span><ins>+- (id)reclaim:(NSError**)sError
+{
+ NSString * result = nil;
+
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_reclaim_Started" object:nil];
+ [[MPNotifications sharedListener] setPerformingTclCommand:@"reclaim"];
+
+ //FIXME
+ /*
+ if ([self authorizationMode])
+ {
+ result = [interpreter evaluateStringWithMPHelperTool:@"mportreclaim" error:sError];
+ }
+ else
+ {
+ result = [interpreter evaluateStringWithPossiblePrivileges:@"mportreclaim" error:sError];
+ }*/
+
+ result = [interpreter evaluateStringAsString:@"reclaim::main \"\"" error:sError];
+
+ [[MPNotifications sharedListener] setPerformingTclCommand:@""];
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_reclaim_Finished" object:nil];
+
+ return result;
+}
+
+
+- (id)diagnose:(NSError**)sError
+{
+ NSString * result = nil;
+
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_diagnose_Started" object:nil];
+ [[MPNotifications sharedListener] setPerformingTclCommand:@"diagnose"];
+
+ //FIXME
+ /*
+ if ([self authorizationMode])
+ {
+ result = [interpreter evaluateStringWithMPHelperTool:@"mportdiagnose" error:sError];
+ }
+ else
+ {
+ result = [interpreter evaluateStringWithPossiblePrivileges:@"mportdiagnose" error:sError];
+ }*/
+
+ result = [interpreter evaluateStringAsString:@"global display_message; incr display_message 1; puts \"Display_Message in XCode: $display_message\"; ui_msg \"Test\"" error:sError];
+ /*NSAlert * alert = [[NSAlert alloc]init];
+ [alert setMessageText:result];
+ [alert runModal];*/
+
+ NSLog(@"RESULT: %@", result);
+
+ [[MPNotifications sharedListener] setPerformingTclCommand:@""];
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_diagnose_Finished" object:nil];
+
+ return result;
+}
+
</ins><span class="cx"> - (id)sync:(NSError**)sError {
</span><span class="cx"> NSString * result = nil;
</span><span class="cx">
</span><span class="lines">@@ -171,6 +258,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 +280,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 +309,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="contribMacPorts_FrameworkMPPorth"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MPPort.h (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MPPort.h 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MPPort.h 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -116,7 +116,6 @@
</span><span class="cx"> */
</span><span class="cx"> - (NSArray *)depends;
</span><span class="cx">
</span><del>-
</del><span class="cx"> /*!
</span><span class="cx"> @brief Deactivates and uninstalls this MPPort from the MacPorts system
</span><span class="cx"> @param version An NSString indicating which version of this port to uninstall
</span></span></pre></div>
<a id="contribMacPorts_FrameworkMPPortm"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MPPort.m (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MPPort.m 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MPPort.m 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> -(void)sendGlobalExecNotification:(NSString *)target withStatus:(NSString *)status {
</span><del>- NSString * notificationName = [NSString stringWithString:@"MacPorts"];
</del><ins>+ NSString * notificationName = @"MacPorts";
</ins><span class="cx"> notificationName = [notificationName stringByAppendingString:target];
</span><span class="cx"> notificationName = [notificationName stringByAppendingString:status];
</span><span class="cx">
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx">
</span><span class="cx"> NSString *opts, *v;
</span><span class="cx"> MPInterpreter *interpreter;
</span><del>- opts = [NSString stringWithString:@" "];
</del><ins>+ opts = @" ";
</ins><span class="cx"> //v = [NSString stringWithString:[self name]];
</span><span class="cx"> interpreter = [MPInterpreter sharedInterpreter];
</span><span class="cx">
</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 * foo = [interpreter evaluateStringAsString:[NSString stringWithFormat:@"ui_msg \"Test\""] error:execError];
+ NSString * test = [interpreter evaluateStringAsString:[NSString stringWithFormat:@"set portHandle [mportopen %@ %@ %@]; mportexec $portHandle %@; mportclose $portHandle", [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 class="lines">@@ -322,7 +324,7 @@
</span><span class="cx"> - (void)execPortProc:(NSString *)procedure withParams:(NSArray *)params error:(NSError **)execError {
</span><span class="cx">
</span><span class="cx"> //params can contain either NSStrings or NSArrays
</span><del>- NSString * sparams = [NSString stringWithString:@" "];
</del><ins>+ NSString * sparams = @" ";
</ins><span class="cx"> NSEnumerator * penums = [params objectEnumerator];
</span><span class="cx"> MPInterpreter *interpreter = [MPInterpreter sharedInterpreter];
</span><span class="cx">
</span><span class="lines">@@ -341,7 +343,13 @@
</span><span class="cx"> sparams = [sparams stringByAppendingString:@" "];
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ NSLog(@"Interpreter string: %@", [NSString stringWithFormat:@"[%@ %@]", procedure,sparams]);
</ins><span class="cx">
</span><ins>+ [interpreter evaluateStringAsString:[NSString stringWithFormat:@"[%@ %@]" , procedure, sparams]
+ error:execError];
+
+ /*
</ins><span class="cx"> if( [parentMacPortsInstance authorizationMode] ) {
</span><span class="cx"> [interpreter evaluateStringWithMPHelperTool:[NSString stringWithFormat:@"[%@ %@]" , procedure, sparams]
</span><span class="cx"> error:execError];
</span><span class="lines">@@ -349,7 +357,7 @@
</span><span class="cx"> else {
</span><span class="cx"> [interpreter evaluateStringAsString:[NSString stringWithFormat:@"[%@ %@]" , procedure, sparams]
</span><span class="cx"> error:execError];
</span><del>- }
</del><ins>+ }*/
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -427,7 +435,7 @@
</span><span class="cx"> fclose(file);
</span><span class="cx"> unlink("mpfw_default_variants");
</span><span class="cx">
</span><del>- NSLog(@"Default variants count: %i", [defaultVariants count]);
</del><ins>+ NSLog(@"Default variants count: %lu", (unsigned long)[defaultVariants count]);
</ins><span class="cx"> //Code for fetching default variants
</span><span class="cx"> [self setObject:[NSString stringWithString:[defaultVariants componentsJoinedByString:@" "]] forKey:@"default_variantsAsString"];
</span><span class="cx"> [self setObject:defaultVariants forKey:@"default_variants"];
</span></span></pre></div>
<a id="contribMacPorts_FrameworkMPPortProcessm"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MPPortProcess.m (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MPPortProcess.m 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MPPortProcess.m 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> @implementation MPPortProcess
</span><span class="cx">
</span><span class="cx"> - (id)initWithPKGPath:(NSString*)pkgPath {
</span><ins>+ NSLog(@"Fool");
</ins><span class="cx"> PKGPath = pkgPath;
</span><span class="cx"> [self initializeInterpreter];
</span><span class="cx"> return self;
</span><span class="lines">@@ -54,12 +55,13 @@
</span><span class="cx"> Tcl_DeleteInterp(interpreter);
</span><span class="cx"> }
</span><span class="cx"> // Load macports_fastload.tcl from PKGPath/macports1.0
</span><ins>+ /*
</ins><span class="cx"> NSString * mport_fastload = [[@"source [file join \"" stringByAppendingString:PKGPath]
</span><span class="cx"> stringByAppendingString:@"\" macports1.0 macports_fastload.tcl]"];
</span><span class="cx"> if(Tcl_Eval(interpreter, [mport_fastload UTF8String]) == TCL_ERROR) {
</span><span class="cx"> NSLog(@"Error in Tcl_EvalFile macports_fastload.tcl: %s", Tcl_GetStringResult(interpreter));
</span><span class="cx"> Tcl_DeleteInterp(interpreter);
</span><del>- }
</del><ins>+ }*/
</ins><span class="cx"> // Load notifications methods
</span><span class="cx"> Tcl_CreateObjCommand(interpreter, "simplelog", SimpleLog_Command, NULL, NULL);
</span><span class="cx"> if (Tcl_PkgProvide(interpreter, "simplelog", "1.0") != TCL_OK) {
</span><span class="lines">@@ -80,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> NSConnection *portProcessConnection;
</span><span class="cx"> portProcessConnection = [NSConnection defaultConnection];
</span><del>- NSString *PKGPath = [[NSString alloc] initWithCString:argv[1] encoding:NSUTF8StringEncoding];
</del><ins>+ NSString *PKGPath = [[NSString alloc] initWithCString:argv[1] encoding:NSASCIIStringEncoding];
</ins><span class="cx">
</span><span class="cx"> MPPortProcess *portProcess = [[MPPortProcess alloc] initWithPKGPath:PKGPath];
</span><span class="cx">
</span></span></pre></div>
<a id="contribMacPorts_FrameworkMPRegistrym"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MPRegistry.m (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MPRegistry.m 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MPRegistry.m 2015-12-13 20:43:34 UTC (rev 143493)
</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="contribMacPorts_FrameworkMacPortsFrameworkxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> archiveVersion = 1;
</span><span class="cx"> classes = {
</span><span class="cx"> };
</span><del>- objectVersion = 42;
</del><ins>+ objectVersion = 46;
</ins><span class="cx"> objects = {
</span><span class="cx">
</span><span class="cx"> /* Begin PBXAggregateTarget section */
</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">@@ -610,7 +600,7 @@
</span><span class="cx"> 489DD8EF0C94365F00595506 /* Resources */,
</span><span class="cx"> 489DD8F00C94365F00595506 /* Sources */,
</span><span class="cx"> 489DD8F10C94365F00595506 /* Frameworks */,
</span><del>- 489DD8F20C94365F00595506 /* ShellScript */,
</del><ins>+ 489DD8F20C94365F00595506 /* Run Script */,
</ins><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="lines">@@ -620,7 +610,7 @@
</span><span class="cx"> name = Test;
</span><span class="cx"> productName = "Test Cases";
</span><span class="cx"> productReference = 489DD8F40C94365F00595506 /* Test.octest */;
</span><del>- productType = "com.apple.product-type.bundle";
</del><ins>+ productType = "com.apple.product-type.bundle.ocunit-test";
</ins><span class="cx"> };
</span><span class="cx"> 6EC260860E426FF10013BC48 /* MPHelperInstallTool */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="lines">@@ -702,9 +692,10 @@
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><span class="cx"> BuildIndependentTargetsInParallel = NO;
</span><ins>+ LastUpgradeCheck = 0510;
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "MacPorts.Framework" */;
</span><del>- compatibilityVersion = "Xcode 2.4";
</del><ins>+ compatibilityVersion = "Xcode 3.2";
</ins><span class="cx"> developmentRegion = English;
</span><span class="cx"> hasScannedForEncodings = 1;
</span><span class="cx"> knownRegions = (
</span><span class="lines">@@ -790,9 +781,9 @@
</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><del>- 489DD8F20C94365F00595506 /* ShellScript */ = {
</del><ins>+ 489DD8F20C94365F00595506 /* Run Script */ = {
</ins><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> comments = "cd ~\nif [ -f /Library/LaunchDaemons/org.macports.frameworks.macports.plist ]\nthen\n\techo removing BAStuff\n\tsh mptooluninstall.sh\n\techo done removing BAStuff\nelse\n\techo nothing to Remove\nfi";
</span><span class="lines">@@ -800,11 +791,12 @@
</span><span class="cx"> );
</span><span class="cx"> inputPaths = (
</span><span class="cx"> );
</span><ins>+ name = "Run Script";
</ins><span class="cx"> outputPaths = (
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n\n#rm -rf notifications.dylib\n\n\n";
</del><ins>+ shellScript = "# Run the unit tests in this test bundle.\n# \"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n\n#rm -rf notifications.dylib\n\n\n";
</ins><span class="cx"> };
</span><span class="cx"> DFE353640CFB8F0C003BACFC /* ShellScript */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -967,8 +959,8 @@
</span><span class="cx"> 1DEB91AE08733DA50010E9CD /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
</del><ins>+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx"> COPY_PHASE_STRIP = NO;
</span><span class="cx"> DYLIB_COMPATIBILITY_VERSION = 1;
</span><span class="cx"> DYLIB_CURRENT_VERSION = 1.2;
</span><span class="lines">@@ -976,6 +968,7 @@
</span><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_EXCEPTIONS = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_OPTIMIZATION_LEVEL = 0;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="lines">@@ -985,9 +978,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">@@ -998,10 +997,13 @@
</span><span class="cx"> 1DEB91AF08733DA50010E9CD /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><ins>+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx"> DYLIB_COMPATIBILITY_VERSION = 1;
</span><span class="cx"> DYLIB_CURRENT_VERSION = 1.2;
</span><span class="cx"> FRAMEWORK_VERSION = A;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="lines">@@ -1011,9 +1013,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">@@ -1023,15 +1031,14 @@
</span><span class="cx"> 1DEB91B208733DA50010E9CD /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
- DEBUG_INFORMATION_FORMAT = stabs;
- GCC_ENABLE_OBJC_GC = YES;
</del><ins>+ CODE_SIGN_IDENTITY = "";
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES;
</span><del>- ONLY_ACTIVE_ARCH = NO;
</del><ins>+ ONLY_ACTIVE_ARCH = YES;
</ins><span class="cx"> PREBINDING = NO;
</span><del>- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
</del><ins>+ SDKROOT = macosx;
</ins><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="lines">@@ -1039,13 +1046,14 @@
</span><span class="cx"> 1DEB91B308733DA50010E9CD /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
</del><span class="cx"> ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
</span><del>- GCC_ENABLE_OBJC_GC = YES;
</del><ins>+ CODE_SIGN_IDENTITY = "";
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES;
</span><span class="cx"> PREBINDING = NO;
</span><del>- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
</del><ins>+ SDKROOT = macosx;
</ins><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="lines">@@ -1053,14 +1061,14 @@
</span><span class="cx"> 216010B01094C7FC00EE9CD0 /* Release-Tiger */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
- GCC_ENABLE_OBJC_GC = YES;
- GCC_VERSION = 4.0;
</del><ins>+ CODE_SIGN_IDENTITY = "";
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_VERSION = "";
</ins><span class="cx"> GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES;
</span><span class="cx"> PREBINDING = NO;
</span><del>- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
</del><ins>+ SDKROOT = macosx;
</ins><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="cx"> name = "Release-Tiger";
</span><span class="lines">@@ -1069,13 +1077,18 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><ins>+ ARCHS_STANDARD_32_64 = "";
+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_MODEL_TUNING = G5;
</span><ins>+ GCC_VERSION = "";
</ins><span class="cx"> INSTALL_PATH = /usr/local/bin;
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPHelperInstallTool;
</span><ins>+ SDKROOT = macosx;
</ins><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="cx"> name = "Release-Tiger";
</span><span class="lines">@@ -1084,13 +1097,23 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_MODEL_TUNING = G5;
</span><ins>+ GCC_VERSION = "";
</ins><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><ins>+ SDKROOT = macosx;
</ins><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="cx"> name = "Release-Tiger";
</span><span class="lines">@@ -1098,22 +1121,32 @@
</span><span class="cx"> 216010B31094C7FC00EE9CD0 /* Release-Tiger */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><ins>+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx"> DYLIB_COMPATIBILITY_VERSION = 1;
</span><span class="cx"> DYLIB_CURRENT_VERSION = 1.2;
</span><span class="cx"> FRAMEWORK_VERSION = A;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_PREFIX_HEADER = MacPorts.Framework_Prefix.pch;
</span><ins>+ GCC_VERSION = "";
</ins><span class="cx"> INFOPLIST_FILE = Info.plist;
</span><span class="cx"> INSTALL_PATH = "";
</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">@@ -1123,7 +1156,8 @@
</span><span class="cx"> 216010B41094C7FC00EE9CD0 /* Release-Tiger */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(NATIVE_ARCH)";
</del><ins>+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS = (
</span><span class="cx"> "$(value)",
</span><span class="lines">@@ -1131,20 +1165,27 @@
</span><span class="cx"> );
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
</span><ins>+ GCC_VERSION = "";
</ins><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><ins>+ SDKROOT = macosx;
</ins><span class="cx"> WRAPPER_EXTENSION = octest;
</span><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="lines">@@ -1153,9 +1194,12 @@
</span><span class="cx"> 216010B51094C7FC00EE9CD0 /* Release-Tiger */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_VERSION = "";
</ins><span class="cx"> PRODUCT_NAME = Docs;
</span><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="lines">@@ -1165,25 +1209,30 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
</del><span class="cx"> ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><del>- GCC_ENABLE_OBJC_GC = required;
- GCC_MODEL_TUNING = G5;
</del><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_MODEL_TUNING = "";
</ins><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><ins>+ GCC_VERSION = "";
</ins><span class="cx"> INSTALL_PATH = /usr/local/bin;
</span><ins>+ MACOSX_DEPLOYMENT_TARGET = "";
</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 = MPHelperToolIPCTester;
</span><del>- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
</del><ins>+ SDKROOT = macosx;
</ins><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="cx"> name = "Release-Tiger";
</span><span class="lines">@@ -1192,18 +1241,25 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_MODEL_TUNING = G5;
</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><ins>+ GCC_VERSION = "";
</ins><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">@@ -1214,8 +1270,9 @@
</span><span class="cx"> 216010EF1094D34500EE9CD0 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
</del><span class="cx"> ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
</span><ins>+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx"> CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
</span><span class="cx"> COPY_PHASE_STRIP = NO;
</span><span class="cx"> DYLIB_COMPATIBILITY_VERSION = 1;
</span><span class="lines">@@ -1224,6 +1281,7 @@
</span><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_EXCEPTIONS = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_OPTIMIZATION_LEVEL = 0;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="lines">@@ -1233,9 +1291,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">@@ -1246,13 +1310,15 @@
</span><span class="cx"> 216010F01094D34500EE9CD0 /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
</del><span class="cx"> ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
</span><ins>+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx"> CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
</span><span class="cx"> DYLIB_COMPATIBILITY_VERSION = 1;
</span><span class="cx"> DYLIB_CURRENT_VERSION = 1;
</span><span class="cx"> FRAMEWORK_VERSION = A;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="lines">@@ -1262,9 +1328,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">@@ -1274,25 +1346,34 @@
</span><span class="cx"> 216010F11094D34500EE9CD0 /* Release-Tiger */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
</del><span class="cx"> ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
</span><ins>+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx"> CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
</span><span class="cx"> DYLIB_COMPATIBILITY_VERSION = 1;
</span><span class="cx"> DYLIB_CURRENT_VERSION = 1;
</span><span class="cx"> FRAMEWORK_VERSION = A;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_PREFIX_HEADER = MacPorts.Framework_Prefix.pch;
</span><ins>+ GCC_VERSION = "";
</ins><span class="cx"> INFOPLIST_FILE = Info.plist;
</span><span class="cx"> INSTALL_PATH = "@executable_path/../Frameworks";
</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">@@ -1303,19 +1384,25 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = NO;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_OPTIMIZATION_LEVEL = 0;
</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">@@ -1326,18 +1413,24 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_MODEL_TUNING = G5;
</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">@@ -1348,7 +1441,8 @@
</span><span class="cx"> 489DD8F70C94366000595506 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(NATIVE_ARCH)";
</del><ins>+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx"> COPY_PHASE_STRIP = NO;
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS = (
</span><span class="cx"> "$(value)",
</span><span class="lines">@@ -1357,6 +1451,7 @@
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_OPTIMIZATION_LEVEL = 0;
</span><span class="lines">@@ -1364,15 +1459,21 @@
</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><ins>+ SDKROOT = macosx;
</ins><span class="cx"> WRAPPER_EXTENSION = octest;
</span><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="lines">@@ -1381,7 +1482,8 @@
</span><span class="cx"> 489DD8F80C94366000595506 /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- ARCHS = "$(NATIVE_ARCH)";
</del><ins>+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS = (
</span><span class="cx"> "$(value)",
</span><span class="lines">@@ -1389,20 +1491,27 @@
</span><span class="cx"> );
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
</span><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</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><ins>+ SDKROOT = macosx;
</ins><span class="cx"> WRAPPER_EXTENSION = octest;
</span><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="lines">@@ -1412,14 +1521,18 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><del>- COPY_PHASE_STRIP = NO;
</del><ins>+ ARCHS_STANDARD_32_64 = "";
+ CODE_SIGN_IDENTITY = "";
+ COPY_PHASE_STRIP = YES;
</ins><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><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><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPHelperInstallTool;
</span><ins>+ SDKROOT = macosx;
</ins><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="cx"> };
</span><span class="lines">@@ -1427,13 +1540,17 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><ins>+ ARCHS_STANDARD_32_64 = "ppc i386 ppc64 x86_64 x64";
+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_MODEL_TUNING = G5;
</span><span class="cx"> INSTALL_PATH = /usr/local/bin;
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> PRODUCT_NAME = MPHelperInstallTool;
</span><ins>+ SDKROOT = macosx;
</ins><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="lines">@@ -1442,14 +1559,23 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = NO;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = YES;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><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><ins>+ SDKROOT = macosx;
</ins><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="cx"> };
</span><span class="lines">@@ -1457,13 +1583,22 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><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><ins>+ SDKROOT = macosx;
</ins><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="lines">@@ -1472,26 +1607,30 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
</del><span class="cx"> ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = NO;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = YES;
</span><del>- GCC_ENABLE_OBJC_GC = required;
- GCC_MODEL_TUNING = G5;
</del><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_MODEL_TUNING = "";
</ins><span class="cx"> GCC_OPTIMIZATION_LEVEL = 0;
</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>+ MACOSX_DEPLOYMENT_TARGET = "";
</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 = MPHelperToolIPCTester;
</span><del>- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
</del><ins>+ SDKROOT = macosx;
</ins><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="cx"> };
</span><span class="lines">@@ -1499,25 +1638,29 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> ALWAYS_SEARCH_USER_PATHS = NO;
</span><del>- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
</del><span class="cx"> ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><del>- GCC_ENABLE_OBJC_GC = required;
- GCC_MODEL_TUNING = G5;
</del><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_MODEL_TUNING = "";
</ins><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>+ MACOSX_DEPLOYMENT_TARGET = "";
</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 = MPHelperToolIPCTester;
</span><del>- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
</del><ins>+ SDKROOT = macosx;
</ins><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="lines">@@ -1525,8 +1668,10 @@
</span><span class="cx"> DFE353660CFB8F0C003BACFC /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = NO;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> GCC_OPTIMIZATION_LEVEL = 0;
</span><span class="cx"> PRODUCT_NAME = Docs;
</span><span class="cx"> };
</span><span class="lines">@@ -1535,9 +1680,11 @@
</span><span class="cx"> DFE353670CFB8F0C003BACFC /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><ins>+ CODE_SIGN_IDENTITY = "";
</ins><span class="cx"> COPY_PHASE_STRIP = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
</span><span class="cx"> GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><ins>+ GCC_ENABLE_OBJC_GC = unsupported;
</ins><span class="cx"> PRODUCT_NAME = Docs;
</span><span class="cx"> ZERO_LINK = NO;
</span><span class="cx"> };
</span></span></pre></div>
<a id="contribMacPorts_FrameworkMakefilefromrev143492branchesgsoc15palletMacPorts_FrameworkMakefile"></a>
<div class="copfile"><h4>Copied: contrib/MacPorts_Framework/Makefile (from rev 143492, branches/gsoc15-pallet/MacPorts_Framework/Makefile) (0 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/Makefile (rev 0)
+++ contrib/MacPorts_Framework/Makefile 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+CC = gcc
+SOURCES = $(*.m *.c)
+FRAMEWORKS = -framework Foundation -framework AppKit -framework Cocoa -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="contribMacPorts_Frameworkinittcl"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/init.tcl (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/init.tcl 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/init.tcl 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -1,21 +1,23 @@
</span><span class="cx"> package require macports
</span><span class="cx"> package require notifications
</span><span class="cx">
</span><del>-proc ui_init {priority prefix channels message} {
</del><ins>+proc ui_init {priority prefix channels args} {
+ global display_message
+
</ins><span class="cx"> switch $priority {
</span><span class="cx"> msg {
</span><span class="cx"> set nottype "MPMsgNotification"
</span><span class="cx"> }
</span><span class="cx"> debug {
</span><span class="cx"> set nottype "MPDebugNotification"
</span><del>- puts "Recieved Debug init"
</del><ins>+ puts "Debug: $args"
</ins><span class="cx"> }
</span><span class="cx"> warn {
</span><span class="cx"> set nottype "MPWarnNotification"
</span><span class="cx"> }
</span><span class="cx"> error {
</span><span class="cx"> set nottype "MPErrorNotification"
</span><del>- puts "Recieved Error"
</del><ins>+ puts "Error: $args"
</ins><span class="cx"> }
</span><span class="cx"> info {
</span><span class="cx"> set nottype "MPInfoNotification"
</span><span class="lines">@@ -27,7 +29,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc ::ui_$priority {message} [subst {
</span><del>- notifications send $nottype "$channels($priority) $prefix" "\$message"
</del><ins>+ notifications send $nottype "$prefix" "\$message"
</ins><span class="cx"> ui_message $priority $prefix "" "\$message"
</span><span class="cx"> }]
</span><span class="cx"> }
</span><span class="lines">@@ -37,6 +39,10 @@
</span><span class="cx"> #Wrapping the following API routines to catch errors
</span><span class="cx"> #and log error Information in a similar fashion to code
</span><span class="cx"> #in macports.tcl.
</span><ins>+proc test {} {
+ puts "TEST"
+}
+
</ins><span class="cx"> proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""}} {
</span><span class="cx"> if {[catch {registry_uninstall::uninstall $portname $version $revision $variants $optionslist} result]} {
</span><span class="cx">
</span><span class="lines">@@ -105,10 +111,11 @@
</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><ins>+global display_message
+set display_message 0
</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="contribMacPorts_FrameworkinterpInittcl"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/interpInit.tcl (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/interpInit.tcl 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/interpInit.tcl 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><span class="cx"> package require macports
</span><span class="cx"> package require simplelog
</span><span class="cx">
</span><del>-
</del><span class="cx"> proc ui_init {priority prefix channels message} {
</span><span class="cx"> switch $priority {
</span><span class="cx"> msg {
</span><span class="lines">@@ -13,6 +12,7 @@
</span><span class="cx"> }
</span><span class="cx"> warn {
</span><span class="cx"> set nottype "MPWarnNotification"
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx"> error {
</span><span class="cx"> set nottype "MPErrorNotification"
</span><span class="lines">@@ -38,6 +38,9 @@
</span><span class="cx"> #and log error Information in a similar fashion to code
</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><ins>+proc test {} {
+ puts "TEST"
+}
</ins><span class="cx"> proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
</span><span class="cx"> if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} {
</span><span class="cx">
</span><span class="lines">@@ -109,6 +112,7 @@
</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>+
</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="contribMacPorts_FrameworkportProcessInittcl"></a>
<div class="modfile"><h4>Modified: contrib/MacPorts_Framework/portProcessInit.tcl (143492 => 143493)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/MacPorts_Framework/portProcessInit.tcl 2015-12-13 20:41:07 UTC (rev 143492)
+++ contrib/MacPorts_Framework/portProcessInit.tcl 2015-12-13 20:43:34 UTC (rev 143493)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> proc ::ui_$priority {message} [subst {
</span><span class="cx"> simplelog "$nottype $channels($priority) $prefix" "\$message"
</span><del>- ui_message $priority $prefix "" "\$message"
</del><ins>+ ui_message $priority $prefix"" "\$message"
</ins><span class="cx"> }]
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -38,6 +38,10 @@
</span><span class="cx"> #and log error Information in a similar fashion to code
</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><ins>+proc test {} {
+ puts "TEST"
+}
+
</ins><span class="cx"> proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
</span><span class="cx"> if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} {
</span><span class="cx">
</span><span class="lines">@@ -48,6 +52,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> proc mportuninstall_composite {portname {v ""} {optionslist ""} } {
</span><ins>+ ui_msg "I am here, hear me moo"
</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>
</div>
</body>
</html>