colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-13 22:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug with NSURL and spaces

Browse Source
This commit is contained in:
Antoine Mercadal
2011-07-01 17:29:12 +02:00
parent af0a479f88
commit b5bb9c8ec3
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/xcodecapp-cocoa/AppController.h
-1
View File
@@ -35,7 +35,6 @@
IBOutlet NSMenuItem *menuItemOpenXCode;
NSFileManager *fm;
NSMutableArray *modifiedSources;
NSMutableArray *modifiedXIBs;
NSMutableDictionary *pathModificationDates;
NSDate *appStartedTimestamp;
Tools/xcodecapp-cocoa/AppController.m
+6 -8
View File
@@ -50,7 +50,6 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
[GrowlApplicationBridge setGrowlDelegate:growlDelegateRef];
fm = [NSFileManager defaultManager];
modifiedSources = [NSMutableArray new];
modifiedXIBs = [NSMutableArray new];
ignoredFilePaths = [NSMutableArray new];
parserPath = [[NSBundle mainBundle] pathForResource:@"parser" ofType:@"j"];
@@ -202,7 +201,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
if ([self isXIBFile:fullPath])
{
NSLog(@"nib2cib %@", fullPath);
NSLog(@"running command nib2cib %@", fullPath);
//Create the nib2cib task
arguments = [NSArray arrayWithObjects: @"-c",
@@ -211,10 +210,9 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
}
else if ([self isObjJFile:fullPath])
{
[modifiedSources addObject:fullPath];
NSString *shadowPath = [[self shadowURLForSourceURL:[NSURL URLWithString:fullPath]] path];
NSLog(@"objj %@", shadowPath);
NSLog(@"Full path string is: %@", [fullPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]);
NSString *shadowPath = [[self shadowURLForSourceURL:[NSURL URLWithString:[fullPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]] path];
NSLog(@"running command objj %@", shadowPath);
//Create the objj task
arguments = [NSArray arrayWithObjects: @"-c",
[NSString stringWithFormat:@"(%@; objj '%@' '%@' '%@';) 2>&1", _profilePath, parserPath, fullPath, shadowPath],@"",nil];
@@ -357,13 +355,13 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
- (NSURL*)shadowURLForSourceURL:(NSURL*)aSourceURL
{
NSMutableString *flattenedPath = [NSMutableString stringWithString:[aSourceURL path]];
NSLog(@"Flattened path is : %@", flattenedPath);
[flattenedPath replaceOccurrencesOfString:@"/"
withString:@"_"
options:NSCaseInsensitiveSearch
range:NSMakeRange(0, [[aSourceURL path] length])];
NSString *basename = [NSString stringWithFormat:@"%@.h", [flattenedPath stringByDeletingPathExtension]];
NSString *basename = [NSString stringWithFormat:@"%@.h", [[flattenedPath stringByDeletingPathExtension] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
return [NSURL URLWithString:basename relativeToURL:XCodeSupportProjectSources];
}