[69878] branches/gsoc10-gui

[tzikis at macports.org]

Revision: 69878
          http://trac.macports.org/changeset/69878
Author:   tzikis at macports.org
Date:     2010-07-19 13:16:11 -0700 (Mon, 19 Jul 2010)
Log Message:
-----------
Added variant support to the framework. Corrected the list of variants that the GUI sends to the framework

Modified Paths:
--------------
    branches/gsoc10-gui/MacPorts_Framework/MPPort.m
    branches/gsoc10-gui/Pallet/MPActionsController.m

Modified: branches/gsoc10-gui/MacPorts_Framework/MPPort.m
===================================================================
--- branches/gsoc10-gui/MacPorts_Framework/MPPort.m	2010-07-19 20:01:26 UTC (rev 69877)
+++ branches/gsoc10-gui/MacPorts_Framework/MPPort.m	2010-07-19 20:16:11 UTC (rev 69878)
@@ -247,31 +247,39 @@
 	variants:(NSArray *)variants 
 	   error:(NSError **)execError{
 	
-	NSString *opts; 
-	NSString *vrnts;
+	NSMutableString *opts; 
+	NSMutableString *vrnts;
 	MPInterpreter *interpreter;
-	opts = [NSString stringWithString:@" "];
-	vrnts = [NSString stringWithString:@" "];
+	opts = [NSMutableString stringWithCapacity:50];
+	[opts setString:@"{ "];
+	vrnts = [NSMutableString stringWithCapacity:50];
+	[vrnts setString:@"{ "];
 	interpreter = [MPInterpreter sharedInterpreter];
 	
+	
 	if (options != NULL) {
-		opts = [NSString stringWithString:[options componentsJoinedByString:@" "]];
+		[opts appendString: [NSString stringWithString:[options componentsJoinedByString:@" "]]];
 	}
+	
+	[opts appendString: @" }"];
+
 	if (variants != NULL) {
-		vrnts = [NSString stringWithString:[variants componentsJoinedByString:@" "]];
+		[vrnts appendString: [NSString stringWithString:[variants componentsJoinedByString:@" "]]];
 	}
 	
-	NSLog(@"Variants String: %@", vrnts);
+	[vrnts appendString: @" }"];
+	
+	//NSLog(@"Variants String: %@", vrnts);
 	//Send Global Notifications and update MPNotifications variable
 	[self sendGlobalExecNotification:target withStatus:@"Started"];
 	//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", 

Modified: branches/gsoc10-gui/Pallet/MPActionsController.m
===================================================================
--- branches/gsoc10-gui/Pallet/MPActionsController.m	2010-07-19 20:01:26 UTC (rev 69877)
+++ branches/gsoc10-gui/Pallet/MPActionsController.m	2010-07-19 20:16:11 UTC (rev 69878)
@@ -36,7 +36,8 @@
 		//NSLog(@"%@",[[port valueForKey:@"variants"] objectAtIndex:i]);
 		if ([checkboxes[i] state] == NSOnState)
 		{
-			[variants addObject:[NSString stringWithFormat:@"+%@", [[port valueForKey:@"variants"] objectAtIndex:i]]];
+			[variants addObject: [[port valueForKey:@"variants"] objectAtIndex:i]];
+			[variants addObject: [NSString stringWithString:@"+"]];
 			[variantsString appendString:@"+"];
 			[variantsString appendString:[[port valueForKey:@"variants"] objectAtIndex:i]];			
 		}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100719/e9d7b951/attachment.html>