[143493] contrib/MacPorts_Framework
ksammons at macports.org
ksammons at macports.org
Sun Dec 13 12:43:34 PST 2015
Revision: 143493
https://trac.macports.org/changeset/143493
Author: ksammons at macports.org
Date: 2015-12-13 12:43:34 -0800 (Sun, 13 Dec 2015)
Log Message:
-----------
Merged MacPorts_Framework GSoC changes
Modified Paths:
--------------
contrib/MacPorts_Framework/BetterAuthorizationSampleLib.c
contrib/MacPorts_Framework/Info.plist
contrib/MacPorts_Framework/MPHelperTool.m
contrib/MacPorts_Framework/MPHelperToolIPCTester.m
contrib/MacPorts_Framework/MPInterpreter.m
contrib/MacPorts_Framework/MPMacPorts.h
contrib/MacPorts_Framework/MPMacPorts.m
contrib/MacPorts_Framework/MPPort.h
contrib/MacPorts_Framework/MPPort.m
contrib/MacPorts_Framework/MPPortProcess.m
contrib/MacPorts_Framework/MPRegistry.m
contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj
contrib/MacPorts_Framework/init.tcl
contrib/MacPorts_Framework/interpInit.tcl
contrib/MacPorts_Framework/portProcessInit.tcl
Added Paths:
-----------
contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.xcworkspace/
contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/xcuserdata/
contrib/MacPorts_Framework/Makefile
Property Changed:
----------------
contrib/MacPorts_Framework/
Property changes on: contrib/MacPorts_Framework
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc09-gui/MacPorts_Framework:50819-65490
/branches/gsoc10-gui/MacPorts_Framework:67321-72221
+ /branches/gsoc09-gui/MacPorts_Framework:50819-65490
/branches/gsoc10-gui/MacPorts_Framework:67321-72221
/branches/gsoc15-pallet/MacPorts_Framework:136747-143492
Modified: contrib/MacPorts_Framework/BetterAuthorizationSampleLib.c
===================================================================
--- 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)
@@ -1737,7 +1737,6 @@
#endif
// Create the socket and tell it to not generate SIGPIPE.
-
if (retval == noErr) {
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd == -1) {
@@ -1776,7 +1775,9 @@
// Attempt to connect.
if (retval == noErr) {
+ printf("FD: %d Sizeof\n", fd);
if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) {
+ printf("Here: %d", errno);
retval = BASErrnoToOSStatus(errno);
}
}
@@ -1786,13 +1787,13 @@
if (retval == noErr) {
retval = AuthorizationMakeExternalForm(auth, &extAuth);
}
- if (retval == noErr) {
+ if (retval == noErr) {
retval = BASErrnoToOSStatus( BASWrite(fd, &extAuth, sizeof(extAuth), NULL) );
}
// Write the request.
- if (retval == noErr) {
+ if (retval == noErr) {
retval = BASErrnoToOSStatus( BASWriteDictionary(request, fd) );
}
Modified: contrib/MacPorts_Framework/Info.plist
===================================================================
--- 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)
@@ -29,5 +29,9 @@
<key>x86_64</key>
<string>10.6.0</string>
</dict>
+ <key>SMAuthorizedClients</key>
+ <array>
+ <string>identifier org.macports.framework.macports and certificate leaf = H"6a52be62749c0ff3d3192d010737a433423c0513"</string>
+ </array>
</dict>
</plist>
Modified: contrib/MacPorts_Framework/MPHelperTool.m
===================================================================
--- 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)
@@ -899,7 +899,7 @@
//Get the tcl Interpreter pkg path
NSString * tclPkgPath = (NSString *) (CFStringRef) CFDictionaryGetValue(request, CFSTR(kTclInterpreterInitPath));
if (tclPkgPath == nil) {
- retval == coreFoundationUnknownErr;
+ retval = coreFoundationUnknownErr;
}
else
CFDictionaryAddValue(response, CFSTR("TclPkgPath"), (CFStringRef)tclPkgPath);
@@ -922,32 +922,42 @@
//Add simplelog tcl command
Tcl_CreateObjCommand(interpreter, "simplelog", SimpleLog_Command, NULL, NULL);
- if (Tcl_PkgProvide(interpreter, "simplelog", "1.0") != TCL_OK) {
+ if (Tcl_PkgProvide(interpreter, "simplelog", "1.0") != TCL_OK)
+ {
NSLog(@"Error in Tcl_PkgProvide: %s", Tcl_GetStringResult(interpreter));
retval = coreFoundationUnknownErr;
//For Dbg
CFDictionaryAddValue(response, CFSTR("simplelog"), CFSTR("NO"));
}
- else {
+ else
+ {
CFDictionaryAddValue(response, CFSTR("simplelog"), CFSTR("YES"));
}
//Get path for and load interpInit.tcl file to Tcl Interpreter
NSString * interpInitFilePath = (NSString *) (CFStringRef) CFDictionaryGetValue(request, CFSTR(kInterpInitFilePath));
- if (interpInitFilePath == nil) {
+ if(interpInitFilePath == nil)
+ {
CFDictionaryAddValue(response, CFSTR("interpInitFilePath"), CFSTR("NO"));
retval = coreFoundationUnknownErr;
}
else
+ {
CFDictionaryAddValue(response, CFSTR("interpInitFilePath"), (CFStringRef)interpInitFilePath);
- if( Tcl_EvalFile(interpreter, [interpInitFilePath UTF8String]) == TCL_ERROR) {
+ }
+
+ NSLog(@"FOO TEST 2");
+
+ if(Tcl_EvalFile(interpreter, [interpInitFilePath UTF8String]) == TCL_ERROR)
+ {
NSLog(@"Error in Tcl_EvalFile init.tcl: %s", Tcl_GetStringResult(interpreter));
Tcl_DeleteInterp(interpreter);
retval = coreFoundationUnknownErr;
CFDictionaryAddValue(response, CFSTR("interpInit.tcl Evaluation"), CFSTR("NO"));
}
- else {
+ else
+ {
CFDictionaryAddValue(response, CFSTR("interpInit.tcl Evaluation"), CFSTR("YES"));
}
@@ -1069,8 +1079,8 @@
//asl_close(logClient);
[notifier closeConnection];
- [notifier release];
- [ipcFilePath release];
+ notifier = nil;
+ ipcFilePath = nil;
[pool release];
Modified: contrib/MacPorts_Framework/MPHelperToolIPCTester.m
===================================================================
--- 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)
@@ -172,6 +172,7 @@
if([pm installUninstallManipulation:@"pngcrush"]) {
NSLog(@"pngcrush INSTALLATION SUCCESSFUL");
}
+ /*
else {
NSLog(@"pngcrush INSTALLATION UNSUCCESSFUL");
}
@@ -181,7 +182,7 @@
}
else {
NSLog(@"SELFUPDATE UNSUCCESSFUL");
- }
+ }*/
return 0;
Modified: contrib/MacPorts_Framework/MPInterpreter.m
===================================================================
--- 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)
@@ -40,7 +40,7 @@
#include "MPHelperNotificationsProtocol.h"
static AuthorizationRef internalMacPortsAuthRef;
static NSString* GenericPKGPath = @"/Library/Tcl";
-static NSString* PKGPath = @"/opt/local/share/macports/Tcl";
+static NSString* PKGPath = @"/opt/local/libexec/macports/lib/";
static NSTask* aTask;
#pragma mark -
@@ -187,7 +187,7 @@
-(BOOL) initTclInterpreter:(Tcl_Interp * *)interp withPath:(NSString *)path {
BOOL result = NO;
*interp = Tcl_CreateInterp();
-
+
if(*interp == NULL) {
NSLog(@"Error in Tcl_CreateInterp, aborting.");
return result;
@@ -202,26 +202,31 @@
if (path == nil)
path = PKGPath;
-
+ /*
NSString * mport_fastload = [[@"source [file join \"" stringByAppendingString:path]
stringByAppendingString:@"\" macports1.0 macports_fastload.tcl]"];
if(Tcl_Eval(*interp, [mport_fastload UTF8String]) != TCL_OK) {
NSLog(@"Error in Tcl_EvalFile macports_fastload.tcl: %s", Tcl_GetStringResult(*interp));
Tcl_DeleteInterp(*interp);
return result;
- }
+ }*/
Tcl_CreateObjCommand(*interp, "notifications", Notifications_Command, NULL, NULL);
- if (Tcl_PkgProvide(*interp, "notifications", "1.0") != TCL_OK) {
+ if(Tcl_PkgProvide(*interp, "notifications", "1.0") != TCL_OK)
+ {
NSLog(@"Error in Tcl_PkgProvide: %s", Tcl_GetStringResult(*interp));
Tcl_DeleteInterp(*interp);
return result;
}
-
- if( Tcl_EvalFile(*interp, [[[NSBundle bundleWithIdentifier:@"org.macports.frameworks.macports"]
+ if(Tcl_EvalFile(*interp, [[[NSBundle bundleWithIdentifier:@"org.macports.frameworks.macports"]
pathForResource:@"init"
- ofType:@"tcl"] UTF8String]) != TCL_OK) {
+ ofType:@"tcl"] UTF8String]) != TCL_OK)
+ {
+ const char * path = [[[NSBundle bundleWithIdentifier:@"org.macports.frameworks.macports"]
+ pathForResource:@"init"
+ ofType:@"tcl"] UTF8String];
+ //printf("Test: %s", path);
NSLog(@"Error in Tcl_EvalFile init.tcl: %s", Tcl_GetStringResult(*interp));
Tcl_DeleteInterp(*interp);
return result;
@@ -377,19 +382,26 @@
#pragma Port Settings
#pragma Utilities
-- (NSArray *)arrayFromTclListAsString:(NSString *)list {
+- (NSArray *)arrayFromTclListAsString:(NSString *)list
+{
NSMutableArray *array;
int tclCount;
int tclResult;
int i;
const char **tclElements;
+ const char * string = [list UTF8String];
tclResult = Tcl_SplitList(_interpreter, [list UTF8String], &tclCount, &tclElements);
- if (tclResult == TCL_OK) {
+
+ if (tclResult == TCL_OK)
+ {
array = [[NSMutableArray alloc] initWithCapacity:tclCount];
- for (i = 0; i < tclCount; i++) {
+ for (i = 0; i < tclCount; i++)
+ {
[array addObject:[NSString stringWithUTF8String:tclElements[i]]];
}
- } else {
+ }
+ else
+ {
array = [[[NSMutableArray alloc] init] autorelease];
}
Tcl_Free((char *)tclElements);
@@ -397,7 +409,8 @@
}
- (NSDictionary *)dictionaryFromTclListAsString:(NSString *)list {
- return [NSDictionary dictionaryWithDictionary:[self mutableDictionaryFromTclListAsString:list]];
+ NSDictionary * foo = [NSDictionary dictionaryWithDictionary:[self mutableDictionaryFromTclListAsString:list]];
+ return foo;
}
- (NSMutableDictionary *)mutableDictionaryFromTclListAsString:(NSString *)list {
@@ -428,9 +441,9 @@
- (NSString *)evaluateStringAsString:(NSString *)statement error:(NSError**)mportError{
//NSLog(@"Calling evaluateStringAsString with argument %@", statement);
+ NSLog(@"Statement: %@", statement);
+ int return_code = Tcl_Eval(_interpreter, [statement UTF8String]);
- int return_code = Tcl_Eval(_interpreter, [statement UTF8String]);
-
//Should I check for (return_code != TCL_Ok && return_code != TCL_RETURN) instead ?
if (return_code != TCL_OK) {
@@ -458,12 +471,14 @@
NSUnderlyingErrorKey, nil];
errDict = [NSDictionary dictionaryWithObjects:objArray forKeys:keyArray];
if (mportError != NULL)
+ {
*mportError = [[[NSError alloc] initWithDomain:MPFrameworkErrorDomain
code:TCL_ERROR
userInfo:errDict] autorelease];
+ }
+
return nil;
}
-
return [NSString stringWithUTF8String:Tcl_GetStringResult(_interpreter)];
}
@@ -517,6 +532,7 @@
//if ([notificationObject respondsToSelector:@selector(startServerThread)]) {
NSThread * cThread = [NSThread currentThread];
+
NSLog(@"STARTING SERVER THREAD with previous thread %@", [cThread threadDictionary]);
//This is important to note ... the tcl command being executed is saved in the
@@ -539,10 +555,6 @@
NSString * interpInitPath = [[NSBundle bundleForClass:[MPInterpreter class]]
pathForResource:@"interpInit" ofType:@"tcl"];
-
-
-
-
request = [NSDictionary dictionaryWithObjectsAndKeys:
@kMPHelperEvaluateTclCommand, @kBASCommandKey,
statement, @kTclStringToBeEvaluated,
@@ -569,7 +581,8 @@
(CFStringRef) bundleID,
NULL);
- //NSLog(@"BEFORE Tool Execution request is %@ , response is %@ \n\n", request, response);
+ NSLog(@"BEFORE Tool Execution request is %@ , response is %@ \n\n", request, response);
+
err = BASExecuteRequestInHelperTool(internalMacPortsAuthRef,
kMPHelperCommandSet,
(CFStringRef) bundleID,
@@ -580,6 +593,7 @@
result = (NSString *) (CFStringRef) CFDictionaryGetValue(response, CFSTR(kTclStringEvaluationResult));
}
else { //Try to recover error
+ NSLog(@"*****************************************");
failCode = BASDiagnoseFailure(internalMacPortsAuthRef, (CFStringRef) bundleID);
@@ -649,7 +663,6 @@
[aTask setLaunchPath:[[NSBundle bundleForClass:[self class]] pathForResource:@"MPPortProcess" ofType:@""]];
[aTask setArguments:args];
[aTask launch];
-
NSConnection *notificationsConnection = [NSConnection defaultConnection];
// Vending MPNotifications sharedListener
[notificationsConnection setRootObject:[MPNotifications sharedListener]];
Modified: contrib/MacPorts_Framework/MPMacPorts.h
===================================================================
--- 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)
@@ -90,6 +90,22 @@
- (BOOL) setPortOptions:(NSArray *)options;
/*!
+ @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;
+
+
+/*!
@brief Synchronizes the ports tree without checking for upgrades to the MacPorts base.
*/
- (id)sync:(NSError **)sError;
Modified: contrib/MacPorts_Framework/MPMacPorts.m
===================================================================
--- 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)
@@ -73,7 +73,8 @@
}
+ (MPMacPorts *)sharedInstance {
- return [self sharedInstanceWithPkgPath:[MPInterpreter PKGPath] portOptions:nil];
+ MPMacPorts * test = [self sharedInstanceWithPkgPath:[MPInterpreter PKGPath] portOptions:nil];
+ return test;
}
+ (MPMacPorts *)sharedInstanceWithPkgPath:(NSString *)path portOptions:(NSArray *)options {
@@ -130,8 +131,94 @@
#pragma MacPorts API
+- (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;
+}
+- (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;
+}
+
- (id)sync:(NSError**)sError {
NSString * result = nil;
@@ -171,6 +258,13 @@
id key;
NSError * sError;
+ result = [NSMutableDictionary dictionaryWithDictionary:
+ [interpreter dictionaryFromTclListAsString:
+ [interpreter evaluateStringAsString:@"puts \"((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((\""
+ error:&sError]]];
+
+ NSLog(@"Resulty De Dulty: %@", result);
+
result = [NSMutableDictionary dictionaryWithDictionary:
[interpreter dictionaryFromTclListAsString:
[interpreter evaluateStringAsString:@"return [mportlistall]"
@@ -186,16 +280,20 @@
return [NSDictionary dictionaryWithDictionary:newResult];
}
-- (NSDictionary *)search:(NSString *)query {
- return [self search:query caseSensitive:YES];
+- (NSDictionary *)search:(NSString *)query
+{
+ NSDictionary * foo = [self search:query caseSensitive:YES];
+ return foo;
}
- (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)isCasesensitive {
- return [self search:query caseSensitive:isCasesensitive matchStyle:@"regex"];
+ NSDictionary * foo = [self search:query caseSensitive:isCasesensitive matchStyle:@"regexp"];
+ return foo;
}
- (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)sensitivity matchStyle:(NSString *)style {
- return [self search:query caseSensitive:sensitivity matchStyle:style field:@"name"];
+ NSDictionary * foo = [self search:query caseSensitive:sensitivity matchStyle:style field:@"name"];
+ return foo;
}
- (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)sensitivity matchStyle:(NSString *)style field:(NSString *)fieldName {
@@ -211,14 +309,14 @@
}
NSError * sError;
-
- result = [NSMutableDictionary dictionaryWithDictionary:
+
+ result = [NSMutableDictionary dictionaryWithDictionary:
[interpreter dictionaryFromTclListAsString:
[interpreter evaluateStringAsString:
[NSString stringWithFormat:@"return [mportsearch %@ %@ %@ %@]",
query, caseSensitivity, style, fieldName]
error:&sError]]];
-
+
newResult = [NSMutableDictionary dictionaryWithCapacity:[result count]];
enumerator = [result keyEnumerator];
while (key = [enumerator nextObject]) {
Modified: contrib/MacPorts_Framework/MPPort.h
===================================================================
--- 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)
@@ -116,7 +116,6 @@
*/
- (NSArray *)depends;
-
/*!
@brief Deactivates and uninstalls this MPPort from the MacPorts system
@param version An NSString indicating which version of this port to uninstall
Modified: contrib/MacPorts_Framework/MPPort.m
===================================================================
--- 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)
@@ -201,7 +201,7 @@
-(void)sendGlobalExecNotification:(NSString *)target withStatus:(NSString *)status {
- NSString * notificationName = [NSString stringWithString:@"MacPorts"];
+ NSString * notificationName = @"MacPorts";
notificationName = [notificationName stringByAppendingString:target];
notificationName = [notificationName stringByAppendingString:status];
@@ -221,7 +221,7 @@
NSString *opts, *v;
MPInterpreter *interpreter;
- opts = [NSString stringWithString:@" "];
+ opts = @" ";
//v = [NSString stringWithString:[self name]];
interpreter = [MPInterpreter sharedInterpreter];
@@ -236,7 +236,7 @@
//Send Global Notifications and update MPNotifications variable
[self sendGlobalExecNotification:procedure withStatus:@"Started"];
- //NSString * tclCmd = [@"YES_" stringByAppendingString:procedure];
+ NSString * tclCmd = [@"YES_" stringByAppendingString:procedure];
[[MPNotifications sharedListener] setPerformingTclCommand:procedure];
if ([parentMacPortsInstance authorizationMode]) {
@@ -283,6 +283,7 @@
if (options != NULL) {
[opts appendString: [NSString stringWithString:[options componentsJoinedByString:@" "]]];
+ NSLog(@"Opts: %@", opts);
}
[opts appendString: @" }"];
@@ -293,24 +294,25 @@
[vrnts appendString: @" }"];
- //NSLog(@"Variants String: %@", vrnts);
+ NSLog(@"Variants String: %@", vrnts);
//Send Global Notifications and update MPNotifications variable
+ if([target isEqual:@"install"])
+ {
+ NSLog(@"HUR");
+ target = @"activate";
+ }
+
[self sendGlobalExecNotification:target withStatus:@"Started"];
- //NSString * tclCmd = [@"YES_" stringByAppendingString:target];
+ NSString * tclCmd = [@"YES_" stringByAppendingString:target];
[[MPNotifications sharedListener] setPerformingTclCommand:target];
-
- /*
+
NSLog(@"Interpreter string:\n%@",[NSString stringWithFormat:
@"set portHandle [mportopen %@ %@ %@]; mportexec $portHandle %@; mportclose $portHandle",
[self valueForKey:@"porturl"], opts, vrnts, target]);
- */
- [interpreter evaluateStringWithPossiblePrivileges:
- [NSString stringWithFormat:
- @"set portHandle [mportopen %@ %@ %@]; mportexec $portHandle %@; mportclose $portHandle",
- [self valueForKey:@"porturl"], opts, vrnts, target]
- error:execError];
+ NSString * 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);
-
[self setState:MPPortStateLearnState];
[[MPNotifications sharedListener] setPerformingTclCommand:@""];
[self sendGlobalExecNotification:target withStatus:@"Finished"];
@@ -322,7 +324,7 @@
- (void)execPortProc:(NSString *)procedure withParams:(NSArray *)params error:(NSError **)execError {
//params can contain either NSStrings or NSArrays
- NSString * sparams = [NSString stringWithString:@" "];
+ NSString * sparams = @" ";
NSEnumerator * penums = [params objectEnumerator];
MPInterpreter *interpreter = [MPInterpreter sharedInterpreter];
@@ -341,7 +343,13 @@
sparams = [sparams stringByAppendingString:@" "];
}
}
+
+ NSLog(@"Interpreter string: %@", [NSString stringWithFormat:@"[%@ %@]", procedure,sparams]);
+ [interpreter evaluateStringAsString:[NSString stringWithFormat:@"[%@ %@]" , procedure, sparams]
+ error:execError];
+
+ /*
if( [parentMacPortsInstance authorizationMode] ) {
[interpreter evaluateStringWithMPHelperTool:[NSString stringWithFormat:@"[%@ %@]" , procedure, sparams]
error:execError];
@@ -349,7 +357,7 @@
else {
[interpreter evaluateStringAsString:[NSString stringWithFormat:@"[%@ %@]" , procedure, sparams]
error:execError];
- }
+ }*/
}
@@ -427,7 +435,7 @@
fclose(file);
unlink("mpfw_default_variants");
- NSLog(@"Default variants count: %i", [defaultVariants count]);
+ NSLog(@"Default variants count: %lu", (unsigned long)[defaultVariants count]);
//Code for fetching default variants
[self setObject:[NSString stringWithString:[defaultVariants componentsJoinedByString:@" "]] forKey:@"default_variantsAsString"];
[self setObject:defaultVariants forKey:@"default_variants"];
Modified: contrib/MacPorts_Framework/MPPortProcess.m
===================================================================
--- 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)
@@ -18,6 +18,7 @@
@implementation MPPortProcess
- (id)initWithPKGPath:(NSString*)pkgPath {
+ NSLog(@"Fool");
PKGPath = pkgPath;
[self initializeInterpreter];
return self;
@@ -54,12 +55,13 @@
Tcl_DeleteInterp(interpreter);
}
// Load macports_fastload.tcl from PKGPath/macports1.0
+ /*
NSString * mport_fastload = [[@"source [file join \"" stringByAppendingString:PKGPath]
stringByAppendingString:@"\" macports1.0 macports_fastload.tcl]"];
if(Tcl_Eval(interpreter, [mport_fastload UTF8String]) == TCL_ERROR) {
NSLog(@"Error in Tcl_EvalFile macports_fastload.tcl: %s", Tcl_GetStringResult(interpreter));
Tcl_DeleteInterp(interpreter);
- }
+ }*/
// Load notifications methods
Tcl_CreateObjCommand(interpreter, "simplelog", SimpleLog_Command, NULL, NULL);
if (Tcl_PkgProvide(interpreter, "simplelog", "1.0") != TCL_OK) {
@@ -80,7 +82,7 @@
NSConnection *portProcessConnection;
portProcessConnection = [NSConnection defaultConnection];
- NSString *PKGPath = [[NSString alloc] initWithCString:argv[1] encoding:NSUTF8StringEncoding];
+ NSString *PKGPath = [[NSString alloc] initWithCString:argv[1] encoding:NSASCIIStringEncoding];
MPPortProcess *portProcess = [[MPPortProcess alloc] initWithPKGPath:PKGPath];
Modified: contrib/MacPorts_Framework/MPRegistry.m
===================================================================
--- 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)
@@ -100,6 +100,7 @@
NSArray *versions;
id item;
raw = [self installedAsArray:name withVersion:version];
+ NSLog(@"Raw = %@", raw);
result = [(NSMutableDictionary *)[NSMutableDictionary alloc] initWithCapacity:[raw count]];
rawEnumerator = [raw objectEnumerator];
while (item = [rawEnumerator nextObject]) {
@@ -121,8 +122,10 @@
NSString * result = [interpreter evaluateStringAsString:
[NSString stringWithFormat:@"return [registry::installed %@ %@]", name, version]
error:&anError];
+
if (result == nil && anError) {
//Recover from error here
+ NSLog(@"Moo");
return nil;
}
Modified: contrib/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj
===================================================================
--- 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)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
@@ -22,7 +22,6 @@
/* Begin PBXBuildFile section */
2160109C1094C66300EE9CD0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED12AA60E3E7E900026773D /* Cocoa.framework */; };
- 2160109F1094C6ED00EE9CD0 /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; };
216010A21094C6FD00EE9CD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ECD970D0E465C7800488335 /* Security.framework */; };
216010A31094C6FD00EE9CD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ECD970D0E465C7800488335 /* Security.framework */; };
216010C51094D34500EE9CD0 /* MPRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 48F811BE0CE4636A009630DE /* MPRegistry.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -60,11 +59,9 @@
216010E71094D34500EE9CD0 /* MPHelperNotificationsCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 6E8563B50E5DDF7000C1D73C /* MPHelperNotificationsCommon.c */; };
216010E81094D34500EE9CD0 /* MPNotifications+IPCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EE6DDCD0E6276AA00FB2115 /* MPNotifications+IPCAdditions.m */; };
216010EA1094D34500EE9CD0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED12AA60E3E7E900026773D /* Cocoa.framework */; };
- 216010EB1094D34500EE9CD0 /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; };
216010EC1094D34500EE9CD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ECD970D0E465C7800488335 /* Security.framework */; };
218DEE2610162091003B5A3B /* SimpleLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 218DED83101612F1003B5A3B /* SimpleLog.m */; };
21D95442100940FF00DEF58A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB6FC900E45DEA80057962C /* Foundation.framework */; };
- 21D954431009411400DEF58A /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; };
21D954471009412F00DEF58A /* MPPortProcess.m in Sources */ = {isa = PBXBuildFile; fileRef = 21D954461009412F00DEF58A /* MPPortProcess.m */; };
21D954721009475200DEF58A /* portProcessInit.tcl in Resources */ = {isa = PBXBuildFile; fileRef = 21D954711009475200DEF58A /* portProcessInit.tcl */; };
21D9548C1009522100DEF58A /* MPPortProcess in Resources */ = {isa = PBXBuildFile; fileRef = 21D9543E100940EE00DEF58A /* MPPortProcess */; };
@@ -113,7 +110,6 @@
6EC2609E0E42950C0013BC48 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EC2609D0E42950C0013BC48 /* CoreFoundation.framework */; };
6ECD98110E484E8400488335 /* MPHelperTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECD98100E484E8400488335 /* MPHelperTool.m */; };
6ECD99C60E48B91B00488335 /* MPHelperToolTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECD99C50E48B91B00488335 /* MPHelperToolTest.m */; };
- 6ED12AF10E3E9E210026773D /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; };
6EE6DDA40E626D4A00FB2115 /* MacPorts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* MacPorts.framework */; };
6EE6DDA70E626D5A00FB2115 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB6FC900E45DEA80057962C /* Foundation.framework */; };
6EE6DDAB0E626DC900FB2115 /* MPHelperToolIPCTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EE6DDAA0E626DC900FB2115 /* MPHelperToolIPCTester.m */; };
@@ -227,7 +223,6 @@
6E8563B70E5DDF7000C1D73C /* MPHelperNotificationsProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPHelperNotificationsProtocol.h; sourceTree = "<group>"; };
6E88D1CA0DF4B90B00684E9F /* MPMacPortsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMacPortsTest.h; sourceTree = "<group>"; };
6E88D1CB0DF4B90B00684E9F /* MPMacPortsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPMacPortsTest.m; sourceTree = "<group>"; };
- 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Tcl.framework; path = System/Library/Frameworks/Tcl.framework; sourceTree = SDKROOT; };
6EB6FC900E45DEA80057962C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
6EC260700E426FC80013BC48 /* BetterAuthorizationSampleLib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = BetterAuthorizationSampleLib.c; sourceTree = "<group>"; };
6EC260710E426FC80013BC48 /* BetterAuthorizationSampleLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BetterAuthorizationSampleLib.h; sourceTree = "<group>"; };
@@ -257,7 +252,6 @@
buildActionMask = 2147483647;
files = (
216010EA1094D34500EE9CD0 /* Cocoa.framework in Frameworks */,
- 216010EB1094D34500EE9CD0 /* Tcl.framework in Frameworks */,
216010EC1094D34500EE9CD0 /* Security.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -267,7 +261,6 @@
buildActionMask = 2147483647;
files = (
21D95442100940FF00DEF58A /* Foundation.framework in Frameworks */,
- 21D954431009411400DEF58A /* Tcl.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -291,7 +284,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 6ED12AF10E3E9E210026773D /* Tcl.framework in Frameworks */,
6EC2609E0E42950C0013BC48 /* CoreFoundation.framework in Frameworks */,
6EB6FC910E45DEA80057962C /* Foundation.framework in Frameworks */,
216010A31094C6FD00EE9CD0 /* Security.framework in Frameworks */,
@@ -312,7 +304,6 @@
buildActionMask = 2147483647;
files = (
2160109C1094C66300EE9CD0 /* Cocoa.framework in Frameworks */,
- 2160109F1094C6ED00EE9CD0 /* Tcl.framework in Frameworks */,
216010A21094C6FD00EE9CD0 /* Security.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -348,7 +339,6 @@
4822AAD40D7EB39200C4D4D7 /* Documentation */,
0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
034768DFFF38A50411DB9C8B /* Products */,
- 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */,
6ED12AA60E3E7E900026773D /* Cocoa.framework */,
6EC2609D0E42950C0013BC48 /* CoreFoundation.framework */,
6EB6FC900E45DEA80057962C /* Foundation.framework */,
@@ -610,7 +600,7 @@
489DD8EF0C94365F00595506 /* Resources */,
489DD8F00C94365F00595506 /* Sources */,
489DD8F10C94365F00595506 /* Frameworks */,
- 489DD8F20C94365F00595506 /* ShellScript */,
+ 489DD8F20C94365F00595506 /* Run Script */,
);
buildRules = (
);
@@ -620,7 +610,7 @@
name = Test;
productName = "Test Cases";
productReference = 489DD8F40C94365F00595506 /* Test.octest */;
- productType = "com.apple.product-type.bundle";
+ productType = "com.apple.product-type.bundle.ocunit-test";
};
6EC260860E426FF10013BC48 /* MPHelperInstallTool */ = {
isa = PBXNativeTarget;
@@ -702,9 +692,10 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = NO;
+ LastUpgradeCheck = 0510;
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "MacPorts.Framework" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -790,9 +781,9 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/usr/bin/env ruby";
- shellScript = "# This script just copies the framework to the build directory so that it can be found by Pallet\n# in any configuration.\nrequire 'fileutils'\n\nif File.directory? \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/MacPorts.framework\"\n FileUtils.rm_rf \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/MacPorts.framework\"\nend\n\nFileUtils.cp_r \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/#{ENV['CONFIGURATION']}/MacPorts.framework\", \"#{ENV['SRCROOT']}/../MacPorts_Framework/build\"\n";
+ shellScript = "# This script just copies the framework to the build directory so that it can be found by Pallet\n# in any configuration.\n#require 'fileutils'\n\n#if File.directory? \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/MacPorts.framework\"\n# FileUtils.rm_rf \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/MacPorts.framework\"\n#end\n\n#FileUtils.cp_r \"#{ENV['SRCROOT']}/../MacPorts_Framework/build/#{ENV['CONFIGURATION']}/MacPorts.framework\", \"#{ENV['SRCROOT']}/../MacPorts_Framework/build\"\n";
};
- 489DD8F20C94365F00595506 /* ShellScript */ = {
+ 489DD8F20C94365F00595506 /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
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";
@@ -800,11 +791,12 @@
);
inputPaths = (
);
+ name = "Run Script";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n\n#rm -rf notifications.dylib\n\n\n";
+ shellScript = "# Run the unit tests in this test bundle.\n# \"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n\n#rm -rf notifications.dylib\n\n\n";
};
DFE353640CFB8F0C003BACFC /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -967,8 +959,8 @@
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1.2;
@@ -976,6 +968,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -985,9 +978,15 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+ "/opt/local/libexec/macports/lib/**",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
PRODUCT_NAME = MacPorts;
SYMROOT = build;
WRAPPER_EXTENSION = framework;
@@ -998,10 +997,13 @@
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1.2;
FRAMEWORK_VERSION = A;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1011,9 +1013,15 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+ "/opt/local/libexec/macports/lib/**",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
PRODUCT_NAME = MacPorts;
WRAPPER_EXTENSION = framework;
ZERO_LINK = NO;
@@ -1023,15 +1031,14 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- 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;
+ CODE_SIGN_IDENTITY = "";
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- ONLY_ACTIVE_ARCH = NO;
+ ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Debug;
@@ -1039,13 +1046,14 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
- GCC_ENABLE_OBJC_GC = YES;
+ CODE_SIGN_IDENTITY = "";
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
@@ -1053,14 +1061,14 @@
216010B01094C7FC00EE9CD0 /* Release-Tiger */ = {
isa = XCBuildConfiguration;
buildSettings = {
- 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;
+ CODE_SIGN_IDENTITY = "";
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = "Release-Tiger";
@@ -1069,13 +1077,18 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS_STANDARD_32_64 = "";
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
+ GCC_VERSION = "";
INSTALL_PATH = /usr/local/bin;
PREBINDING = NO;
PRODUCT_NAME = MPHelperInstallTool;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = "Release-Tiger";
@@ -1084,13 +1097,23 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
+ GCC_VERSION = "";
INSTALL_PATH = /usr/local/bin;
+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
PREBINDING = NO;
PRODUCT_NAME = MPHelperTool;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = "Release-Tiger";
@@ -1098,22 +1121,32 @@
216010B31094C7FC00EE9CD0 /* Release-Tiger */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1.2;
FRAMEWORK_VERSION = A;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = MacPorts.Framework_Prefix.pch;
+ GCC_VERSION = "";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+ "/opt/local/libexec/macports/lib/**",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
PRODUCT_NAME = MacPorts;
WRAPPER_EXTENSION = framework;
ZERO_LINK = NO;
@@ -1123,7 +1156,8 @@
216010B41094C7FC00EE9CD0 /* Release-Tiger */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(NATIVE_ARCH)";
+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(value)",
@@ -1131,20 +1165,27 @@
);
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
+ GCC_VERSION = "";
INFOPLIST_FILE = "Test-Info.plist";
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
OTHER_LDFLAGS = (
"-framework",
Cocoa,
"-framework",
SenTestingKit,
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
);
PREBINDING = NO;
PRODUCT_NAME = Test;
+ SDKROOT = macosx;
WRAPPER_EXTENSION = octest;
ZERO_LINK = NO;
};
@@ -1153,9 +1194,12 @@
216010B51094C7FC00EE9CD0 /* Release-Tiger */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_VERSION = "";
PRODUCT_NAME = Docs;
ZERO_LINK = NO;
};
@@ -1165,25 +1209,30 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_ENABLE_OBJC_GC = required;
- GCC_MODEL_TUNING = G5;
+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_MODEL_TUNING = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ GCC_VERSION = "";
INSTALL_PATH = /usr/local/bin;
+ MACOSX_DEPLOYMENT_TARGET = "";
OTHER_LDFLAGS = (
"-framework",
Foundation,
"-framework",
AppKit,
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
);
PREBINDING = NO;
PRODUCT_NAME = MPHelperToolIPCTester;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = "Release-Tiger";
@@ -1192,18 +1241,25 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ GCC_VERSION = "";
INSTALL_PATH = /usr/local/bin;
+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
OTHER_LDFLAGS = (
"-framework",
Foundation,
"-framework",
AppKit,
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
);
PREBINDING = NO;
PRODUCT_NAME = MPPortProcess;
@@ -1214,8 +1270,9 @@
216010EF1094D34500EE9CD0 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1224,6 +1281,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1233,9 +1291,15 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+ "/opt/local/libexec/macports/lib/**",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
PRODUCT_NAME = MacPorts;
SYMROOT = build;
WRAPPER_EXTENSION = framework;
@@ -1246,13 +1310,15 @@
216010F01094D34500EE9CD0 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1262,9 +1328,15 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+ "/opt/local/libexec/macports/lib/**",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
PRODUCT_NAME = MacPorts;
WRAPPER_EXTENSION = framework;
ZERO_LINK = NO;
@@ -1274,25 +1346,34 @@
216010F11094D34500EE9CD0 /* Release-Tiger */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = MacPorts.Framework_Prefix.pch;
+ GCC_VERSION = "";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+ "/opt/local/libexec/macports/lib/**",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)\"";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
PRODUCT_NAME = MacPorts;
WRAPPER_EXTENSION = framework;
ZERO_LINK = NO;
@@ -1303,19 +1384,25 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
INSTALL_PATH = /usr/local/bin;
+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
OTHER_LDFLAGS = (
"-framework",
Foundation,
"-framework",
AppKit,
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
);
PREBINDING = NO;
PRODUCT_NAME = MPPortProcess;
@@ -1326,18 +1413,24 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
INSTALL_PATH = /usr/local/bin;
+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
OTHER_LDFLAGS = (
"-framework",
Foundation,
"-framework",
AppKit,
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
);
PREBINDING = NO;
PRODUCT_NAME = MPPortProcess;
@@ -1348,7 +1441,8 @@
489DD8F70C94366000595506 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(NATIVE_ARCH)";
+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(value)",
@@ -1357,6 +1451,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1364,15 +1459,21 @@
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
INFOPLIST_FILE = "Test-Info.plist";
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = /opt/local/libexec/macports/lib;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-framework",
Cocoa,
"-framework",
SenTestingKit,
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
);
PREBINDING = NO;
PRODUCT_NAME = Test;
+ SDKROOT = macosx;
WRAPPER_EXTENSION = octest;
ZERO_LINK = NO;
};
@@ -1381,7 +1482,8 @@
489DD8F80C94366000595506 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(NATIVE_ARCH)";
+ CODE_SIGN_IDENTITY = "";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(value)",
@@ -1389,20 +1491,27 @@
);
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
INFOPLIST_FILE = "Test-Info.plist";
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ "LIBRARY_SEARCH_PATHS[arch=*]" = /opt/local/libexec/macports/lib;
OTHER_LDFLAGS = (
"-framework",
Cocoa,
"-framework",
SenTestingKit,
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
);
PREBINDING = NO;
PRODUCT_NAME = Test;
+ SDKROOT = macosx;
WRAPPER_EXTENSION = octest;
ZERO_LINK = NO;
};
@@ -1412,14 +1521,18 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = NO;
+ ARCHS_STANDARD_32_64 = "";
+ CODE_SIGN_IDENTITY = "";
+ COPY_PHASE_STRIP = YES;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INSTALL_PATH = /usr/local/bin;
PREBINDING = NO;
PRODUCT_NAME = MPHelperInstallTool;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -1427,13 +1540,17 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS_STANDARD_32_64 = "ppc i386 ppc64 x86_64 x64";
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
INSTALL_PATH = /usr/local/bin;
PREBINDING = NO;
PRODUCT_NAME = MPHelperInstallTool;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
@@ -1442,14 +1559,23 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INSTALL_PATH = /usr/local/bin;
+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
PREBINDING = NO;
PRODUCT_NAME = MPHelperTool;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -1457,13 +1583,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
INSTALL_PATH = /usr/local/bin;
+ LIBRARY_SEARCH_PATHS = "/opt/local/libexec/macports/lib/**";
+ OTHER_LDFLAGS = (
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
+ );
PREBINDING = NO;
PRODUCT_NAME = MPHelperTool;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
@@ -1472,26 +1607,30 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_ENABLE_OBJC_GC = required;
- GCC_MODEL_TUNING = G5;
+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_MODEL_TUNING = "";
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
INSTALL_PATH = /usr/local/bin;
+ MACOSX_DEPLOYMENT_TARGET = "";
OTHER_LDFLAGS = (
"-framework",
Foundation,
"-framework",
AppKit,
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
);
PREBINDING = NO;
PRODUCT_NAME = MPHelperToolIPCTester;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -1499,25 +1638,29 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_ENABLE_OBJC_GC = required;
- GCC_MODEL_TUNING = G5;
+ GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_MODEL_TUNING = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
INSTALL_PATH = /usr/local/bin;
+ MACOSX_DEPLOYMENT_TARGET = "";
OTHER_LDFLAGS = (
"-framework",
Foundation,
"-framework",
AppKit,
+ "-I/opt/local/libexec/macports/include",
+ "-L/opt/local/libexec/macports/lib",
+ "-ltcl8.5",
);
PREBINDING = NO;
PRODUCT_NAME = MPHelperToolIPCTester;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
@@ -1525,8 +1668,10 @@
DFE353660CFB8F0C003BACFC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = Docs;
};
@@ -1535,9 +1680,11 @@
DFE353670CFB8F0C003BACFC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_ENABLE_OBJC_GC = unsupported;
PRODUCT_NAME = Docs;
ZERO_LINK = NO;
};
Copied: contrib/MacPorts_Framework/Makefile (from rev 143492, branches/gsoc15-pallet/MacPorts_Framework/Makefile)
===================================================================
--- contrib/MacPorts_Framework/Makefile (rev 0)
+++ contrib/MacPorts_Framework/Makefile 2015-12-13 20:43:34 UTC (rev 143493)
@@ -0,0 +1,22 @@
+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
+
+
+
Modified: contrib/MacPorts_Framework/init.tcl
===================================================================
--- 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)
@@ -1,21 +1,23 @@
package require macports
package require notifications
-proc ui_init {priority prefix channels message} {
+proc ui_init {priority prefix channels args} {
+ global display_message
+
switch $priority {
msg {
set nottype "MPMsgNotification"
}
debug {
set nottype "MPDebugNotification"
- puts "Recieved Debug init"
+ puts "Debug: $args"
}
warn {
set nottype "MPWarnNotification"
}
error {
set nottype "MPErrorNotification"
- puts "Recieved Error"
+ puts "Error: $args"
}
info {
set nottype "MPInfoNotification"
@@ -27,7 +29,7 @@
}
proc ::ui_$priority {message} [subst {
- notifications send $nottype "$channels($priority) $prefix" "\$message"
+ notifications send $nottype "$prefix" "\$message"
ui_message $priority $prefix "" "\$message"
}]
}
@@ -37,6 +39,10 @@
#Wrapping the following API routines to catch errors
#and log error Information in a similar fashion to code
#in macports.tcl.
+proc test {} {
+ puts "TEST"
+}
+
proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""}} {
if {[catch {registry_uninstall::uninstall $portname $version $revision $variants $optionslist} result]} {
@@ -105,10 +111,11 @@
}
}
-
# Initialize dport
# This must be done following parse of global options, as some options are
# evaluated by dportinit.
+global display_message
+set display_message 0
if {[catch {mportinit ui_options global_options global_variations} result]} {
global errorInfo
puts "$errorInfo"
Modified: contrib/MacPorts_Framework/interpInit.tcl
===================================================================
--- 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)
@@ -1,7 +1,6 @@
package require macports
package require simplelog
-
proc ui_init {priority prefix channels message} {
switch $priority {
msg {
@@ -13,6 +12,7 @@
}
warn {
set nottype "MPWarnNotification"
+
}
error {
set nottype "MPErrorNotification"
@@ -38,6 +38,9 @@
#and log error Information in a similar fashion to code
#in macports.tcl. Note optionslist is not being used for now
set mp_empty_list [list]
+proc test {} {
+ puts "TEST"
+}
proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} {
@@ -109,6 +112,7 @@
# Initialize dport
# This must be done following parse of global options, as some options are
# evaluated by dportinit.
+
if {[catch {mportinit ui_options global_options global_variations} result]} {
global errorInfo
puts "$errorInfo"
Modified: contrib/MacPorts_Framework/portProcessInit.tcl
===================================================================
--- 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)
@@ -29,7 +29,7 @@
proc ::ui_$priority {message} [subst {
simplelog "$nottype $channels($priority) $prefix" "\$message"
- ui_message $priority $prefix "" "\$message"
+ ui_message $priority $prefix"" "\$message"
}]
}
@@ -38,6 +38,10 @@
#and log error Information in a similar fashion to code
#in macports.tcl. Note optionslist is not being used for now
set mp_empty_list [list]
+proc test {} {
+ puts "TEST"
+}
+
proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} {
@@ -48,6 +52,7 @@
}
}
proc mportuninstall_composite {portname {v ""} {optionslist ""} } {
+ ui_msg "I am here, hear me moo"
if {[catch {registry_uninstall::uninstall_composite $portname $v [array get options]} result]} {
global errorInfo
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151213/e957cebd/attachment-0001.html>
More information about the macports-changes
mailing list