[38934] branches/gsoc08-framework/MacPorts_Framework

armahg at macports.org armahg at macports.org
Sat Aug 2 19:05:02 PDT 2008


Revision: 38934
          http://trac.macosforge.org/projects/macports/changeset/38934
Author:   armahg at macports.org
Date:     2008-08-02 19:05:01 -0700 (Sat, 02 Aug 2008)
Log Message:
-----------
Rudimentary MPHelperTool now passes Test bundle. I am just passing a string into the request dictionary and retrieving it from the response dictionary. It works fine with both .m and .c files

Modified Paths:
--------------
    branches/gsoc08-framework/MacPorts_Framework/BetterAuthorizationSampleLib.c
    branches/gsoc08-framework/MacPorts_Framework/MPHelperCommon.c
    branches/gsoc08-framework/MacPorts_Framework/MPHelperCommon.h
    branches/gsoc08-framework/MacPorts_Framework/MPHelperTool.m
    branches/gsoc08-framework/MacPorts_Framework/MPInterpreter.m
    branches/gsoc08-framework/MacPorts_Framework/MPInterpreterTest.m
    branches/gsoc08-framework/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj

Modified: branches/gsoc08-framework/MacPorts_Framework/BetterAuthorizationSampleLib.c
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework/BetterAuthorizationSampleLib.c	2008-08-03 01:56:03 UTC (rev 38933)
+++ branches/gsoc08-framework/MacPorts_Framework/BetterAuthorizationSampleLib.c	2008-08-03 02:05:01 UTC (rev 38934)
@@ -243,7 +243,7 @@
 	if (bytesRead != NULL) {
 		*bytesRead = bufSize - bytesLeft;
 	}
-	
+	 
 	return err;
 }
 
@@ -1404,6 +1404,7 @@
 	int							kq;
 	struct kevent				initEvent;
 	
+	
 	// Pre-conditions
 	
 	assert(commands != NULL);
@@ -1690,6 +1691,7 @@
 )
     // See comment in header.
 {	
+	
 	OSStatus					retval = noErr;
     int                         junk;
     size_t                      commandIndex;
@@ -2335,22 +2337,42 @@
     CFBundleRef bundle;
     Boolean     success;
     CFURLRef    toolURL;
-    
-    assert(bundleID != NULL);
+	
+	assert(bundleID != NULL);
     assert(toolName != NULL);
     assert(toolPath != NULL);
     assert(toolPathSize > 0);
     
     toolURL = NULL;
-    
+
+	
     err = noErr;
     bundle = CFBundleGetBundleWithIdentifier(bundleID);
     if (bundle == NULL) {
         err = coreFoundationUnknownErr;
     }
+	
     if (err == noErr) {
-        toolURL = CFBundleCopyAuxiliaryExecutableURL(bundle, toolName);
-        if (toolURL == NULL) {
+		//Modify this code to load the bundle if its not already loaded
+		
+		if (CFBundleIsExecutableLoaded(bundle)) {
+			toolURL = CFBundleCopyResourceURL(bundle, toolName, NULL, NULL);  
+		}
+		else{ //We need to load the bundle first
+			Boolean loaded = CFBundleLoadExecutable(bundle);
+			
+			if (loaded && bundle != NULL) {
+				toolURL = CFBundleCopyResourceURL(bundle, toolName, NULL, NULL); 
+			}
+			else { // we couldn't load the bundle .. this IS bad
+				err = coreFoundationUnknownErr;
+			}
+		}
+		
+
+	 assert(toolURL != NULL);
+        
+		if (toolURL == NULL) {
             err = coreFoundationUnknownErr;
         }
     }

Modified: branches/gsoc08-framework/MacPorts_Framework/MPHelperCommon.c
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework/MPHelperCommon.c	2008-08-03 01:56:03 UTC (rev 38933)
+++ branches/gsoc08-framework/MacPorts_Framework/MPHelperCommon.c	2008-08-03 02:05:01 UTC (rev 38934)
@@ -23,7 +23,7 @@
 		kMPHelperEvaluateTclRightsName,		//rightName
 		"default",							//rightDefaultRule	-- by default, you have to have admin credentials
 		NULL,								//rightDescriptionKey 
-		NULL								// userData ... I might use this to pass the NSError object later on
+		NULL		// userData ... I might use this to pass the NSError object later on
 	},
 
 	{	NULL,								//the array is null terminated

Modified: branches/gsoc08-framework/MacPorts_Framework/MPHelperCommon.h
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework/MPHelperCommon.h	2008-08-03 01:56:03 UTC (rev 38933)
+++ branches/gsoc08-framework/MacPorts_Framework/MPHelperCommon.h	2008-08-03 02:05:01 UTC (rev 38934)
@@ -11,7 +11,10 @@
 #define _MPHELPERCOMMON_H
 
 #include "BetterAuthorizationSampleLib.h"
+#include <tcl.h>
 
+#define asl_NSLog(client, msg, level, format, ...) asl_log(client, msg, level, "%s", [[NSString stringWithFormat:format, ##__VA_ARGS__] UTF8String])
+
 //We need only one command for this Tool
 
 #define kMPHelperEvaluateTclCommand					"EvaluateTcl"
@@ -36,6 +39,9 @@
 	#define kNSErrorString				"NSErrorString"				//Am I allowed to pass in an NSError object?
 																	//Lets make it a string for now
 
+	//user Data will be a pointer  to a Tcl interpreter
+	//do I have to do some casting ? we'll see
+	//const void * _userDataInterp = NULL;
 
 extern const BASCommandSpec kMPHelperCommandSet[];
 

Modified: branches/gsoc08-framework/MacPorts_Framework/MPHelperTool.m
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework/MPHelperTool.m	2008-08-03 01:56:03 UTC (rev 38933)
+++ branches/gsoc08-framework/MacPorts_Framework/MPHelperTool.m	2008-08-03 02:05:01 UTC (rev 38934)
@@ -1,10 +1,11 @@
-//
-//  MPHelperTool.m
-//  MacPorts.Framework
-//
-//  Created by George  Armah on 7/28/08.
-//  Copyright 2008 Lafayette College. All rights reserved.
-//
+/*
+ *  MPHelperTool.c
+ *  MacPorts.Framework
+ *
+ *  Created by George  Armah on 8/2/08.
+ *  Copyright 2008 Lafayette College. All rights reserved.
+ *
+ */
 
 //#include <netinet/in.h>
 #include <stdio.h>
@@ -12,25 +13,24 @@
 #include <unistd.h>
 
 #include <CoreServices/CoreServices.h>
+
 #include "BetterAuthorizationSampleLib.h"
+
 #include "MPHelperCommon.h"
 
-#import <Cocoa/Cocoa.h>
-#import <Security/Security.h>
-#import "MPInterpreter.h"
-
-
 static OSStatus DoEvaluateTclString (
-	AuthorizationRef			auth,
-	const void *				userData,
-	CFDictionaryRef				request,
-	CFMutableDictionaryRef		response,
-	aslclient					asl,
-	aslmsg						aslMsg
+		AuthorizationRef			auth,
+		const void *				userData,
+		CFDictionaryRef				request,
+		CFMutableDictionaryRef		response,
+		aslclient					asl,
+		aslmsg						aslMsg
 )
-
 {
+	
 	OSStatus		retval = noErr;
+	//CFStringRef result;
+	//CFAllocatorRef alloc_default = kCFAllocatorDefault; 
 	
 	//Pre conditions
 	assert(auth != NULL);
@@ -40,36 +40,41 @@
 	//asl may be null
 	//aslMsg may be null
 	
-	//Get the NSString that was passed in the request dictionary
-	NSString * tclCmd;
+	//Get the string that was passed in the request dictionary
 	CFStringRef  cTclCmd = (CFStringRef)CFDictionaryGetValue(request, CFSTR(kTclStringToBeEvaluated));
+	//cTclCmd = CFRetain(cTclCmd);
+	if (cTclCmd == NULL) {
+		retval = coreFoundationUnknownErr;
+	}
 	
-	if (cTclCmd != NULL) {
-		tclCmd = (NSString *) cTclCmd;
+	/*
+	//Now retrieve the pointer to the Tcl_Interp that was passed to us
+	Tcl_Interp * _userDataInterp = (Tcl_Interp *) userData;
+	if(Tcl_Eval(_userDataInterp, CFStringGetCStringPtr(cTclCmd, kCFStringEncodingUTF8)) == TCL_ERROR) {
+		//Should do some kind of error handling here
+		retval = coreFoundationUnknownErr;
 	}
 	else {
-		//something went wrong ... do some error handling
-		retval = coreFoundationUnknownErr;
+		result = CFStringCreateWithCString(alloc_default, Tcl_GetStringResult(_userDataInterp), kCFStringEncodingUTF8);
 	}
+	*/
+
 	
-	MPInterpreter * interp = [MPInterpreter sharedInterpreter];
-	NSError * evalError;
-	NSString * result = [interp evaluateStringAsString:tclCmd 
-												 error:&evalError];
-	CFStringRef cResult = (CFStringRef) result;
-	
-	if( result != nil && evalError != nil) {
-		CFDictionaryAddValue(response, CFSTR(kTclStringEvaluationResult), cResult); 
+	if( retval == noErr) {
+		CFDictionaryAddValue(response, CFSTR(kTclStringEvaluationResult), cTclCmd); 
 	}
 	else{
 		//Try setting the user data pointer to the error
-		retval = coreFoundationUnknownErr;
+		CFDictionaryAddValue(response, CFSTR(kTclStringEvaluationResult), CFSTR("BAAD")); 
 	}
 	
+	assert(response != NULL);
+	//I think I should release cTclCmd
+	//CFRelease(cTclCmd);
+	
 	return retval;
 }
 
-
 /////////////////////////////////////////////////////////////////
 #pragma mark ***** Tool Infrastructure
 
@@ -81,30 +86,21 @@
  */
 
 static const BASCommandProc kMPHelperCommandProcs[] = {
-	DoEvaluateTclString,
+	DoEvaluateTclString,	
 	NULL
 };
 
 
-
-
 //Should I just do stuff in main and use the above method to 
 //just retrieve the string to be evaluated as a tcl command?
 
 int main(int argc, char const * argv[]) {
-	NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-	
 	// Go directly into BetterAuthorizationSampleLib code.
 	
     // IMPORTANT
     // BASHelperToolMain doesn't clean up after itself, so once it returns 
     // we must quit.
-    BASHelperToolMain(kMPHelperCommandSet, kMPHelperCommandProcs);
-	
-	
-	[pool release];
-	
-    return 0;
+    return BASHelperToolMain(kMPHelperCommandSet, kMPHelperCommandProcs);
+
 }
 
-

Modified: branches/gsoc08-framework/MacPorts_Framework/MPInterpreter.m
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework/MPInterpreter.m	2008-08-03 01:56:03 UTC (rev 38933)
+++ branches/gsoc08-framework/MacPorts_Framework/MPInterpreter.m	2008-08-03 02:05:01 UTC (rev 38934)
@@ -189,6 +189,9 @@
 	
 	NSString * bundleID = [[NSBundle bundleForClass:[self class]] bundleIdentifier];
 	
+	//Set _userDataInterp over here
+	//kMPHelperCommandSet[0].userData =  _interpreter;
+	
 	BASSetDefaultRules(mpAuth, 
 					   kMPHelperCommandSet, 
 					   (CFStringRef) bundleID, 
@@ -248,7 +251,7 @@
 		helperToolInterpCommand = @"";
 		
 		//Initialize Authorization stuff should probably check for errors ....
-		[self initializeAuthorization];
+		//[self initializeAuthorization];
 		
 	}
 	return self;
@@ -432,10 +435,14 @@
 	assert(request != NULL);
 	
 	bundleID = [[NSBundle bundleForClass:[self class]] bundleIdentifier];
-	NSLog(@" %@ ", bundleID);
+	//NSLog(@" %@ , %@", bundleID, request);
 	assert(bundleID != NULL);
 	
 	
+	//_userDataInterp points to _interpreter after the
+	//method below
+	[self initializeAuthorization];
+	
 	err = BASExecuteRequestInHelperTool(mpAuth, 
 										kMPHelperCommandSet, 
 										(CFStringRef) bundleID, 
@@ -464,8 +471,32 @@
 		err = userCanceledErr;
 	}
 	
+	assert(response != NULL);
 	CFStringRef result = CFDictionaryGetValue(response, CFSTR(kTclStringEvaluationResult));
+	return (NSString *) result;
 	
-	return (NSString *) result;
+	
+	/*//Read from file and see if it was written to
+	NSString * testFilePath = [[NSBundle bundleForClass:[self class]]
+							   pathForResource:@"TestFile" ofType:@"test"];
+	NSError * readError = nil;
+	NSString * result = [NSString stringWithContentsOfFile:testFilePath 
+												  encoding:NSUTF8StringEncoding
+													 error:&readError];
+	if (readError) {
+		NSLog(@"Error is %@", [readError description]);
+		return @"There was an error Reading";
+	}
+	else if ([result isEqualToString:@""]) {
+		return @"An empty string was read";
+	}
+	else if (result == nil) {
+		return @"Resulting String is NIL";
+	}
+	else
+		return result;
+	
+	return @"This shouldn't happen";
+	*/
 }
 @end

Modified: branches/gsoc08-framework/MacPorts_Framework/MPInterpreterTest.m
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework/MPInterpreterTest.m	2008-08-03 01:56:03 UTC (rev 38933)
+++ branches/gsoc08-framework/MacPorts_Framework/MPInterpreterTest.m	2008-08-03 02:05:01 UTC (rev 38934)
@@ -62,7 +62,8 @@
 - (void)testMPHelperTool {
 	
 	//Here goes nothing
-	[interp evaluateStringWithMPHelperTool:@"mportsync"];
+	NSString * result = [interp evaluateStringWithMPHelperTool:@"mportsync"];
+	NSLog(@"Result of MPHelperTool Execution is %@", result);
 }
 
 /*

Modified: branches/gsoc08-framework/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj	2008-08-03 01:56:03 UTC (rev 38933)
+++ branches/gsoc08-framework/MacPorts_Framework/MacPorts.Framework.xcodeproj/project.pbxproj	2008-08-03 02:05:01 UTC (rev 38934)
@@ -44,7 +44,10 @@
 		6E49F37B0DFFAB0B0030C3AF /* MPInterpreterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 489DD92E0C94674B00595506 /* MPInterpreterTest.m */; };
 		6E49F37F0DFFAFF80030C3AF /* MacPorts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* MacPorts.framework */; };
 		6EA294590E080DEB00902D12 /* MPMacPortsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E88D1CB0DF4B90B00684E9F /* MPMacPortsTest.m */; };
-		6EB6F7C40E432A840057962C /* MPHelperTool in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6ED12A4A0E3E552F0026773D /* MPHelperTool */; };
+		6EB6FA420E43ECCE0057962C /* MPHelperTool in Resources */ = {isa = PBXBuildFile; fileRef = 6ED12A4A0E3E552F0026773D /* MPHelperTool */; };
+		6EB6FA460E43ECD60057962C /* MPHelperInstallTool in Resources */ = {isa = PBXBuildFile; fileRef = 6EC260870E426FF10013BC48 /* MPHelperInstallTool */; };
+		6EB6FB270E448EE20057962C /* TestFile.test in Resources */ = {isa = PBXBuildFile; fileRef = 6EB6FB260E448EE20057962C /* TestFile.test */; };
+		6EB6FB630E44AF140057962C /* MPHelperTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB6FB620E44AF140057962C /* MPHelperTool.m */; };
 		6EC260730E426FC80013BC48 /* BetterAuthorizationSampleLib.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EC260700E426FC80013BC48 /* BetterAuthorizationSampleLib.c */; };
 		6EC260740E426FC80013BC48 /* BetterAuthorizationSampleLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC260710E426FC80013BC48 /* BetterAuthorizationSampleLib.h */; };
 		6EC260760E426FC80013BC48 /* BetterAuthorizationSampleLib.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EC260700E426FC80013BC48 /* BetterAuthorizationSampleLib.c */; };
@@ -55,16 +58,9 @@
 		6EC2609A0E4272D20013BC48 /* MPHelperCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EC260960E4272D20013BC48 /* MPHelperCommon.c */; };
 		6EC2609B0E4273920013BC48 /* BetterAuthorizationSampleLibInstallTool.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EC260720E426FC80013BC48 /* BetterAuthorizationSampleLibInstallTool.c */; };
 		6EC2609E0E42950C0013BC48 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EC2609D0E42950C0013BC48 /* CoreFoundation.framework */; };
-		6EC2614F0E42959B0013BC48 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED12AA60E3E7E900026773D /* Cocoa.framework */; };
-		6ED12A4F0E3E55660026773D /* MPHelperTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ED12A4E0E3E55660026773D /* MPHelperTool.m */; };
 		6ED12A550E3E55DF0026773D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED12A540E3E55DF0026773D /* Security.framework */; };
 		6ED12A560E3E55DF0026773D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED12A540E3E55DF0026773D /* Security.framework */; };
-		6ED12AC90E3E94310026773D /* MPInterpreter.m in Sources */ = {isa = PBXBuildFile; fileRef = 48906AFC0C4230B700A3ED8A /* MPInterpreter.m */; };
-		6ED12AD20E3E9AC30026773D /* MPInterpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = 48906AFB0C4230B700A3ED8A /* MPInterpreter.h */; };
 		6ED12AF10E3E9E210026773D /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA0F56E0DFEB55E00C15082 /* Tcl.framework */; };
-		6ED12AFB0E3E9F980026773D /* MPNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E270D070E158CED00BAE687 /* MPNotifications.h */; };
-		6ED12AFC0E3E9FA60026773D /* MPNotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E270D080E158CED00BAE687 /* MPNotifications.m */; };
-		6ED12B060E3EA9E30026773D /* init.tcl in Resources */ = {isa = PBXBuildFile; fileRef = 48E9939E0C82CEB000219DDF /* init.tcl */; };
 		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
 		8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
 /* End PBXBuildFile section */
@@ -93,19 +89,6 @@
 		};
 /* End PBXContainerItemProxy section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		6EB6F7B00E4326F40057962C /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 6;
-			files = (
-				6EB6F7C40E432A840057962C /* MPHelperTool in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -142,6 +125,8 @@
 		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; };
 		6EAFD8B70DEC614E00E97270 /* dummycommit.test */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dummycommit.test; sourceTree = "<group>"; };
+		6EB6FB260E448EE20057962C /* TestFile.test */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestFile.test; sourceTree = "<group>"; };
+		6EB6FB620E44AF140057962C /* MPHelperTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPHelperTool.m; sourceTree = "<group>"; };
 		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>"; };
 		6EC260720E426FC80013BC48 /* BetterAuthorizationSampleLibInstallTool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = BetterAuthorizationSampleLibInstallTool.c; sourceTree = "<group>"; };
@@ -150,7 +135,7 @@
 		6EC260960E4272D20013BC48 /* MPHelperCommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = MPHelperCommon.c; sourceTree = "<group>"; };
 		6EC2609D0E42950C0013BC48 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		6ED12A4A0E3E552F0026773D /* MPHelperTool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MPHelperTool; sourceTree = BUILT_PRODUCTS_DIR; };
-		6ED12A4E0E3E55660026773D /* MPHelperTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPHelperTool.m; sourceTree = "<group>"; };
+		6ED12A4E0E3E55660026773D /* MPHelperTool.m.old */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MPHelperTool.m.old; sourceTree = "<group>"; };
 		6ED12A540E3E55DF0026773D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
 		6ED12AA60E3E7E900026773D /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
@@ -180,7 +165,6 @@
 				6ED12A550E3E55DF0026773D /* Security.framework in Frameworks */,
 				6ED12AF10E3E9E210026773D /* Tcl.framework in Frameworks */,
 				6EC2609E0E42950C0013BC48 /* CoreFoundation.framework in Frameworks */,
-				6EC2614F0E42959B0013BC48 /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -245,6 +229,7 @@
 				489DD8F50C94365F00595506 /* Test-Info.plist */,
 				6EAFD8B70DEC614E00E97270 /* dummycommit.test */,
 				6E44A00C0E2DAD66007DE8EC /* ToDo.txt */,
+				6EB6FB260E448EE20057962C /* TestFile.test */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -333,9 +318,10 @@
 				6EC260700E426FC80013BC48 /* BetterAuthorizationSampleLib.c */,
 				6EC260710E426FC80013BC48 /* BetterAuthorizationSampleLib.h */,
 				6EC260720E426FC80013BC48 /* BetterAuthorizationSampleLibInstallTool.c */,
-				6ED12A4E0E3E55660026773D /* MPHelperTool.m */,
+				6ED12A4E0E3E55660026773D /* MPHelperTool.m.old */,
 				6EC260950E4272D20013BC48 /* MPHelperCommon.h */,
 				6EC260960E4272D20013BC48 /* MPHelperCommon.c */,
+				6EB6FB620E44AF140057962C /* MPHelperTool.m */,
 			);
 			name = MPHelperTool;
 			sourceTree = "<group>";
@@ -347,8 +333,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6ED12AFB0E3E9F980026773D /* MPNotifications.h in Headers */,
-				6ED12AD20E3E9AC30026773D /* MPInterpreter.h in Headers */,
 				6EC260740E426FC80013BC48 /* BetterAuthorizationSampleLib.h in Headers */,
 				6EC260970E4272D20013BC48 /* MPHelperCommon.h in Headers */,
 			);
@@ -437,7 +421,6 @@
 				8DC2EF540486A6940098B216 /* Sources */,
 				8DC2EF560486A6940098B216 /* Frameworks */,
 				6E49F4F40E00DD520030C3AF /* ShellScript */,
-				6EB6F7B00E4326F40057962C /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -488,7 +471,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6ED12B060E3EA9E30026773D /* init.tcl in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -496,9 +478,12 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6EB6FA460E43ECD60057962C /* MPHelperInstallTool in Resources */,
+				6EB6FA420E43ECCE0057962C /* MPHelperTool in Resources */,
 				8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
 				48E9939F0C82CEB000219DDF /* init.tcl in Resources */,
 				6E44A00D0E2DAD66007DE8EC /* ToDo.txt in Resources */,
+				6EB6FB270E448EE20057962C /* TestFile.test in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -568,11 +553,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6ED12AC90E3E94310026773D /* MPInterpreter.m in Sources */,
-				6ED12AFC0E3E9FA60026773D /* MPNotifications.m in Sources */,
-				6ED12A4F0E3E55660026773D /* MPHelperTool.m in Sources */,
 				6EC260730E426FC80013BC48 /* BetterAuthorizationSampleLib.c in Sources */,
 				6EC260980E4272D20013BC48 /* MPHelperCommon.c in Sources */,
+				6EB6FB630E44AF140057962C /* MPHelperTool.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080802/1fefcd41/attachment-0001.html 


More information about the macports-changes mailing list