[28806] users/rhwood/Pallet
source_changes at macosforge.org
source_changes at macosforge.org
Sun Sep 9 04:22:22 PDT 2007
Revision: 28806
http://trac.macosforge.org/projects/macports/changeset/28806
Author: rhwood at macports.org
Date: 2007-09-09 04:22:21 -0700 (Sun, 09 Sep 2007)
Log Message:
-----------
Use MacPorts.Framework for our Tcl Interpreter
Comment out code for the MPAgentProtocol
Modified Paths:
--------------
users/rhwood/Pallet/MPTool/MPInterp.h
users/rhwood/Pallet/Pallet.xcodeproj/project.pbxproj
users/rhwood/Pallet/PortAuthority.h
users/rhwood/Pallet/PortAuthority.m
Modified: users/rhwood/Pallet/MPTool/MPInterp.h
===================================================================
--- users/rhwood/Pallet/MPTool/MPInterp.h 2007-09-09 11:00:48 UTC (rev 28805)
+++ users/rhwood/Pallet/MPTool/MPInterp.h 2007-09-09 11:22:21 UTC (rev 28806)
@@ -34,7 +34,7 @@
// package info
static NSString *MPPackageName = @"macports";
-static NSString *MPPackageVersion = @"1.0";
+//static NSString *MPPackageVersion = @"1.0";
static NSString *MPPackageInit = @"mportinit";
// commands
Modified: users/rhwood/Pallet/Pallet.xcodeproj/project.pbxproj
===================================================================
--- users/rhwood/Pallet/Pallet.xcodeproj/project.pbxproj 2007-09-09 11:00:48 UTC (rev 28805)
+++ users/rhwood/Pallet/Pallet.xcodeproj/project.pbxproj 2007-09-09 11:22:21 UTC (rev 28806)
@@ -23,6 +23,8 @@
487EB9490B453786001B0F72 /* AuthorizedExecutable.m in Sources */ = {isa = PBXBuildFile; fileRef = 487EB9480B453786001B0F72 /* AuthorizedExecutable.m */; };
48A284020C608C9800D1AC4B /* MPInterp.m in Sources */ = {isa = PBXBuildFile; fileRef = 48CD13180BBE6C24002B0D0E /* MPInterp.m */; };
48A284030C608C9800D1AC4B /* MPObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 48CD131A0BBE6C24002B0D0E /* MPObject.m */; };
+ 48AA3F9D0C93F85800C6AC60 /* MacPorts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48AA3F950C93F85800C6AC60 /* MacPorts.framework */; };
+ 48AA3F9E0C93F85800C6AC60 /* MacPorts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48AA3F950C93F85800C6AC60 /* MacPorts.framework */; };
48ACD7930B4284A400D34B4C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4854CE0F0B420D8C00950EE4 /* Security.framework */; };
48B63D820BCA40760028248A /* CFLib.c in Sources */ = {isa = PBXBuildFile; fileRef = 48B63D810BCA40760028248A /* CFLib.c */; };
48C570FC0C46287D002EC172 /* MPAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = 48CD13150BBE6C24002B0D0E /* MPAgent.m */; };
@@ -85,6 +87,7 @@
4875A9550B4839D700FDDC21 /* installed.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = installed.gif; sourceTree = "<group>"; };
487EB9470B453785001B0F72 /* AuthorizedExecutable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AuthorizedExecutable.h; sourceTree = "<group>"; };
487EB9480B453786001B0F72 /* AuthorizedExecutable.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AuthorizedExecutable.m; sourceTree = "<group>"; };
+ 48AA3F950C93F85800C6AC60 /* MacPorts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MacPorts.framework; path = /Library/Frameworks/MacPorts.framework; sourceTree = "<absolute>"; };
48ACD78B0B42846B00D34B4C /* Launcher */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Launcher; sourceTree = BUILT_PRODUCTS_DIR; };
48ACD7D10B42855600D34B4C /* Launcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Launcher.h; sourceTree = "<group>"; };
48ACD7D20B42855600D34B4C /* Launcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Launcher.m; sourceTree = "<group>"; };
@@ -127,6 +130,7 @@
buildActionMask = 2147483647;
files = (
48D5EF700BDE169B003EE169 /* Tcl.framework in Frameworks */,
+ 48AA3F9E0C93F85800C6AC60 /* MacPorts.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -146,6 +150,7 @@
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
481B84120BA254A4000D1385 /* Security.framework in Frameworks */,
48EE4F7D0B515B7D0066DCBA /* Tcl.framework in Frameworks */,
+ 48AA3F9D0C93F85800C6AC60 /* MacPorts.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -176,6 +181,7 @@
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
+ 48AA3F950C93F85800C6AC60 /* MacPorts.framework */,
48EE4F7C0B515B7D0066DCBA /* Tcl.framework */,
4854CE0F0B420D8C00950EE4 /* Security.framework */,
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
@@ -453,6 +459,13 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
+ );
+ FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../../../Shared/Developer/MacPorts/Repository/users/rhwood/MacPorts.Framework/build/Debug\"";
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -477,6 +490,13 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
+ );
+ FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../../../Shared/Developer/MacPorts/Repository/users/rhwood/MacPorts.Framework/build/Debug\"";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
@@ -546,6 +566,13 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
+ );
+ FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../../../Shared/Developer/MacPorts/Repository/users/rhwood/MacPorts.Framework/build/Debug\"";
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
@@ -564,6 +591,13 @@
ppc,
i386,
);
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
+ );
+ FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../../../Shared/Developer/MacPorts/Repository/users/rhwood/MacPorts.Framework/build/Debug\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G4;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Modified: users/rhwood/Pallet/PortAuthority.h
===================================================================
--- users/rhwood/Pallet/PortAuthority.h 2007-09-09 11:00:48 UTC (rev 28805)
+++ users/rhwood/Pallet/PortAuthority.h 2007-09-09 11:22:21 UTC (rev 28806)
@@ -25,14 +25,15 @@
*/
#import <Cocoa/Cocoa.h>
+#import <MacPorts/MacPorts.h>
#import "MPPortsController.h"
#import "MPPort.h"
#import "PAStatusTransformer.h"
#import "TaskWrapper.h"
#import "AuthorizedExecutable.h"
-#import "MPAgentProtocol.h"
-#import "MPInterp.h"
-#import "MPObject.h"
+//#import "MPAgentProtocol.h"
+//#import "MPInterp.h"
+//#import "MPObject.h"
@interface PortAuthority : NSObject <TaskWrapperController>
@@ -53,7 +54,7 @@
// the preference gets stored
NSConnection *connection;
- id <MPAgentProtocol> agent;
+// id <MPAgentProtocol> agent;
BOOL agentIsBusy;
NSMutableArray *portIndex;
@@ -74,7 +75,7 @@
NSMutableArray *operations;
NSDictionary *portIndexes;
- MPInterp *interpeter;
+ MPMacPorts *macPorts;
}
- (NSDictionary *)tPorts;
@@ -98,7 +99,7 @@
- (IBAction)macPortsSite:(id)sender;
- (IBAction)portAuthoritySite:(id)sender;
-- (id <MPAgentProtocol>)agent;
+//- (id <MPAgentProtocol>)agent;
- (void)connectionDidDie:(id)server;
- (void)getPortIndexes;
@@ -111,16 +112,16 @@
- (void)parsePortIndex:(NSString *)portIndex intoIndexObject:(id)indexObject;
#pragma mark MACPORTS INTERPETER
-
+/*
- (NSDictionary *)listPorts:(NSString *)query;
- (MPObject *)ui_puts:(NSArray *)array;
-
+*/
#pragma mark MACPORTS AGENT
-
+/*
- (oneway void)displayMessage:(in bycopy NSDictionary *)message forPortName:(in bycopy NSString *)portName;
- (void)executeTarget:(NSString *)target forPortName:(NSString *)portName;
- (BOOL)shouldPerformTarget:(in bycopy NSString *)target forPortName:(in bycopy NSString *)portName;
- (oneway void)willPerformTarget:(in bycopy NSString *)target forPortName:(in bycopy NSString *)portName;
- (oneway void)didPerformTarget:(in bycopy NSString *)target forPortName:(in bycopy NSString *)portName withResult:(in bycopy NSString *)result;
-
+*/
@end
Modified: users/rhwood/Pallet/PortAuthority.m
===================================================================
--- users/rhwood/Pallet/PortAuthority.m 2007-09-09 11:00:48 UTC (rev 28805)
+++ users/rhwood/Pallet/PortAuthority.m 2007-09-09 11:22:21 UTC (rev 28806)
@@ -45,18 +45,7 @@
- (void)awakeFromNib
{
// Get a MacPorts Interpeter
- interpeter = [[MPInterp alloc] init];
- if (![interpeter loadPackage:MPPackageName version:MPPackageVersion usingCommand:MPPackageInit]) {
- NSLog(@"Failed to load interpeter");
- exit(1);
- }
- if (![interpeter redirectCommand:MPUIPuts toObject:self]) {
- NSLog(@"Failed to redirect interpeter input");
- exit(1);
- }
- NSLog(@"Printing system_options");
- NSLog([[interpeter getVariable:[MPObject objectWithString:@"system_options"]] stringValue]);
- NSLog(@"system_options printed");
+ macPorts = [[MPMacPorts alloc] init];
// Load/set preferences/defaults
if (![[[NSUserDefaultsController sharedUserDefaultsController] values] valueForKey:@"portInstallationPath"]) {
[[[NSUserDefaultsController sharedUserDefaultsController] values] setValue:@"/opt/local" forKey:@"portInstallationPath"];
@@ -102,6 +91,7 @@
*/
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
+ /*
// configure and register the connection to the PalletHelper
connection = [NSConnection defaultConnection];
[connection setRootObject: self];
@@ -110,7 +100,7 @@
NSRunAlertPanel(@"Pallet", @"Could not register Pallet connection on this host.", nil, @"Quit", nil);
[NSApp terminate: self];
}
-
+ */
// sync or selfupdate as required
if ([[[[NSUserDefaultsController sharedUserDefaultsController] values] valueForKey:@"updateMacPortsOnStartup"] boolValue] == YES) {
[self updateMacPorts:nil];
@@ -610,7 +600,7 @@
}
#pragma mark MACPORTS INTERPETER
-
+/*
- (NSDictionary *)listPorts:(NSString *)query
{
Tcl_Obj **objv;
@@ -679,9 +669,9 @@
//[delegate displayMessage: message forPortName: [_currentOp objectForKey: @"portName"]];
return [MPObject objectWithString: MPYesResult];
}
-
+*/
#pragma mark MACPORTS AGENT
-
+/*
- (id <MPAgentProtocol>)agent {
if (agentIsBusy) {
return nil;
@@ -752,7 +742,7 @@
[NSApp setApplicationIconImage:[NSImage imageNamed:@"ApplicationIcon"]];
[status setStringValue:@""];
}
-
+*/
#pragma mark AUTHORIZED EXECUTABLE DELEGATES / TASK WRAPPER CONTROLLER
// This callback is implemented as part of conforming to the ProcessController protocol.
// It will be called whenever there is output from the TaskWrapper.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070909/e29e8608/attachment.html
More information about the macports-changes
mailing list