[49547] users/toby/objcports

toby at macports.org toby at macports.org
Sat Apr 11 21:51:04 PDT 2009


Revision: 49547
          http://trac.macports.org/changeset/49547
Author:   toby at macports.org
Date:     2009-04-11 21:51:03 -0700 (Sat, 11 Apr 2009)
Log Message:
-----------
init MPPort based on URL, like mportopen

Modified Paths:
--------------
    users/toby/objcports/MPPort.h
    users/toby/objcports/MPPort.m
    users/toby/objcports/port.m

Modified: users/toby/objcports/MPPort.h
===================================================================
--- users/toby/objcports/MPPort.h	2009-04-12 02:59:45 UTC (rev 49546)
+++ users/toby/objcports/MPPort.h	2009-04-12 04:51:03 UTC (rev 49547)
@@ -2,7 +2,7 @@
 
 @interface MPPort : NSObject
 {
-	NSString *_portfile;
+	NSURL *_url;
 	MPParser *_parser;
 
 	NSMutableDictionary *_variableInfo;
@@ -12,7 +12,8 @@
 	NSMutableDictionary *_variants;
 }
 
-- (id)initWithPortfile:(NSString *)port options:(NSDictionary *)options;
+- (id)initWithURL:(NSURL *)url options:(NSDictionary *)options;
+- (id)initWithPath:(NSString *)url options:(NSDictionary *)options;
 
 - (NSString *)portfile;
 

Modified: users/toby/objcports/MPPort.m
===================================================================
--- users/toby/objcports/MPPort.m	2009-04-12 02:59:45 UTC (rev 49546)
+++ users/toby/objcports/MPPort.m	2009-04-12 04:51:03 UTC (rev 49547)
@@ -10,10 +10,10 @@
 
 @implementation MPPort
 
-- (id)initWithPortfile:(NSString *)portfile options:(NSDictionary *)options
+- (id)initWithURL:(NSURL *)url options:(NSDictionary *)options
 {
 	self = [super init];
-	_portfile = [portfile retain];
+	_url = [url retain];
 
 	_platforms = [[NSMutableArray alloc] initWithCapacity:0];
 	_variants = [[NSMutableDictionary alloc] initWithCapacity:0];
@@ -53,10 +53,20 @@
 	return self;
 }
 
+- (id)initWithPath:(NSString *)path options:(NSDictionary *)options
+{
+	NSString *standardizedPath;
+	NSURL *url;
+
+	standardizedPath = [path stringByStandardizingPath];
+	url = [NSURL fileURLWithPath:standardizedPath isDirectory:YES];
+	return [self initWithURL:url options:options];
+}
+
 - (void)dealloc
 {
 	[_parser release];
-	[_portfile release];
+	[_url release];
 
 	[_variableInfo release];
 	[_variables release];
@@ -69,7 +79,7 @@
 
 - (NSString *)portfile
 {
-	return _portfile;
+	return [[_url path] stringByAppendingPathComponent:@"Portfile"];
 }
 
 - (NSArray *)targets

Modified: users/toby/objcports/port.m
===================================================================
--- users/toby/objcports/port.m	2009-04-12 02:59:45 UTC (rev 49546)
+++ users/toby/objcports/port.m	2009-04-12 04:51:03 UTC (rev 49547)
@@ -22,7 +22,7 @@
 #endif
 
 	while (--argc) {
-		MPPort *port = [[MPPort alloc] initWithPortfile:[NSString stringWithUTF8String:*++argv] options:nil];
+		MPPort *port = [[MPPort alloc] initWithPath:[NSString stringWithUTF8String:*++argv] options:nil];
 		NSLog(@"%@ @%@ (%@)", [port variable:@"name"], [port variable:@"version"], [port variable:@"categories"]);
 		NSLog(@"Variants:             %@", [[port definedVariants] componentsJoinedByString:@", "]);
 		NSLog(@"PlatformVariants:     %@", [[port definedPlatforms] componentsJoinedByString:@", "]);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090411/a64e2928/attachment-0001.html>


More information about the macports-changes mailing list