mirror of
https://github.com/gnustep/apps-projectcenter.git
synced 2025-02-19 01:51:09 +00:00
build logging now works, as well as some enhancements when using the internal
'editor' git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@7920 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Robert Slover
parent
4f8cf5f17c
commit
3336f4afdf
6 changed files with 153 additions and 54 deletions
|
|
@ -111,9 +111,11 @@
|
|||
[NSException raise:@"PCBundleLoaderPathException" format:@"No valid bundle path specified!"];
|
||||
return;
|
||||
}
|
||||
#ifdef DEBUG
|
||||
else {
|
||||
NSLog([NSString stringWithFormat:@"Loading bundles at %@",path]);
|
||||
}
|
||||
#endif DEBUG
|
||||
|
||||
dir = [[NSFileManager defaultManager] directoryContentsAtPath:path];
|
||||
enumerator = [dir objectEnumerator];
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
textView = [[PCEditorView alloc] initWithFrame:NSMakeRect(0,0,520,168)];
|
||||
[textView setMaxSize:NSMakeSize(1e7, 1e7)];
|
||||
[textView setRichText:NO];
|
||||
[textView setEditable:YES];
|
||||
[textView setEditable:NO];
|
||||
[textView setSelectable:YES];
|
||||
[textView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
|
||||
[textView setVerticallyResizable:YES];
|
||||
|
|
|
|||
|
|
@ -46,6 +46,9 @@
|
|||
|
||||
PCProject *currentProject;
|
||||
NSDictionary *currentOptions;
|
||||
|
||||
NSFileHandle *readHandle;
|
||||
NSFileHandle *errorReadHandle;
|
||||
}
|
||||
|
||||
+ (id)sharedBuilder;
|
||||
|
|
@ -57,12 +60,23 @@
|
|||
|
||||
- (void)build:(id)sender;
|
||||
|
||||
- (void)logData:(NSNotification *)aNotif;
|
||||
- (void)logStdOut:(NSNotification *)aNotif;
|
||||
- (void)logErrOut:(NSNotification *)aNotif;
|
||||
|
||||
- (void)buildDidTerminate:(NSNotification *)aNotif;
|
||||
|
||||
- (void)projectDidChange:(NSNotification *)aNotif;
|
||||
|
||||
@end
|
||||
|
||||
@interface PCProjectBuilder (BuildLogging)
|
||||
|
||||
- (void)logString:(NSString *)string error:(BOOL)yn;
|
||||
- (void)logString:(NSString *)string error:(BOOL)yn newLine:(BOOL)newLine;
|
||||
- (void)logData:(NSData *)data error:(BOOL)yn;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@
|
|||
#define IMAGE(X) [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:(X)]] autorelease]
|
||||
#endif
|
||||
|
||||
#ifndef NOTIFICATION_CENTER
|
||||
#define NOTIFICATION_CENTER [NSNotificationCenter defaultCenter]
|
||||
#endif
|
||||
|
||||
@interface PCProjectBuilder (CreateUI)
|
||||
|
||||
- (void)_initUI;
|
||||
|
|
@ -71,8 +75,11 @@
|
|||
[buildWindow setMinSize:NSMakeSize(512,320)];
|
||||
[buildWindow setFrameAutosaveName:@"Builder"];
|
||||
|
||||
logOutput = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,472,88)];
|
||||
logOutput = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,472,80)];
|
||||
[logOutput setMaxSize:NSMakeSize(1e7, 1e7)];
|
||||
[logOutput setRichText:NO];
|
||||
[logOutput setEditable:NO];
|
||||
[logOutput setSelectable:YES];
|
||||
[logOutput setVerticallyResizable:YES];
|
||||
[logOutput setHorizontallyResizable:NO];
|
||||
[logOutput setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
|
||||
|
|
@ -93,8 +100,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
errorOutput = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,472,88)];
|
||||
errorOutput = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,472,80)];
|
||||
[errorOutput setMaxSize:NSMakeSize(1e7, 1e7)];
|
||||
[errorOutput setRichText:NO];
|
||||
[errorOutput setEditable:NO];
|
||||
[errorOutput setSelectable:YES];
|
||||
[errorOutput setVerticallyResizable:YES];
|
||||
[errorOutput setHorizontallyResizable:NO];
|
||||
[errorOutput setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
|
||||
|
|
@ -260,14 +270,14 @@ static PCProjectBuilder *_builder;
|
|||
makePath = [[NSString stringWithString:@"/usr/bin/make"] retain];
|
||||
buildTasks = [[NSMutableDictionary dictionary] retain];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(projectDidChange:) name:ActiveProjectDidChangeNotification object:nil];
|
||||
[NOTIFICATION_CENTER addObserver:self selector:@selector(projectDidChange:) name:ActiveProjectDidChangeNotification object:nil];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
||||
[NOTIFICATION_CENTER removeObserver:self];
|
||||
|
||||
[buildWindow release];
|
||||
[makePath release];
|
||||
|
|
@ -294,12 +304,8 @@ static PCProjectBuilder *_builder;
|
|||
NSString *tg = nil;
|
||||
NSTask *makeTask;
|
||||
NSMutableArray *args;
|
||||
NSString *output = nil;
|
||||
NSPipe *logPipe;
|
||||
NSPipe *errorPipe;
|
||||
NSFileHandle *readHandle;
|
||||
NSFileHandle *errorReadHandle;
|
||||
NSData *inData = nil;
|
||||
NSDictionary *optionDict;
|
||||
NSString *status;
|
||||
NSString *target;
|
||||
|
|
@ -309,10 +315,10 @@ static PCProjectBuilder *_builder;
|
|||
}
|
||||
|
||||
logPipe = [NSPipe pipe];
|
||||
errorPipe = [NSPipe pipe];
|
||||
readHandle = [[logPipe fileHandleForReading] retain];
|
||||
|
||||
readHandle = [logPipe fileHandleForReading];
|
||||
errorReadHandle = [errorPipe fileHandleForReading];
|
||||
errorPipe = [NSPipe pipe];
|
||||
errorReadHandle = [[errorPipe fileHandleForReading] retain];
|
||||
|
||||
makeTask = [[NSTask alloc] init];
|
||||
|
||||
|
|
@ -353,58 +359,90 @@ static PCProjectBuilder *_builder;
|
|||
[buildStatusField setStringValue:status];
|
||||
[targetField setStringValue:target];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(logData:) name:NSFileHandleReadCompletionNotification object:nil];
|
||||
[NOTIFICATION_CENTER addObserver:self
|
||||
selector:@selector(logStdOut:)
|
||||
name:NSFileHandleDataAvailableNotification
|
||||
object:readHandle];
|
||||
|
||||
[makeTask setArguments:args];
|
||||
[NOTIFICATION_CENTER addObserver:self
|
||||
selector:@selector(logErrOut:)
|
||||
name:NSFileHandleDataAvailableNotification
|
||||
object:errorReadHandle];
|
||||
|
||||
[NOTIFICATION_CENTER addObserver: self
|
||||
selector: @selector(buildDidTerminate:)
|
||||
name: NSTaskDidTerminateNotification
|
||||
object: makeTask];
|
||||
|
||||
[makeTask setArguments:args];
|
||||
[makeTask setCurrentDirectoryPath:[currentProject projectPath]];
|
||||
[makeTask setLaunchPath:makePath];
|
||||
|
||||
[makeTask setStandardOutput:logPipe];
|
||||
[makeTask setStandardError:errorPipe];
|
||||
|
||||
[makeTask launch];
|
||||
|
||||
/*
|
||||
* This is just a quick hack for now...
|
||||
*/
|
||||
|
||||
|
||||
[logOutput setString:@""];
|
||||
[readHandle waitForDataInBackgroundAndNotify];
|
||||
|
||||
/*
|
||||
[logOutput scrollRangeToVisible:NSMakeRange([[logOutput textStorage] length], 0)];
|
||||
[errorOutput setString:@""];
|
||||
[errorOutput scrollRangeToVisible:NSMakeRange([[errorOutput textStorage] length], 0)];
|
||||
|
||||
[readHandle readInBackgroundAndNotify];
|
||||
*/
|
||||
[errorReadHandle waitForDataInBackgroundAndNotify];
|
||||
|
||||
while ((inData = [readHandle availableData]) && [inData length]) {
|
||||
output = [[NSString alloc] initWithData:inData encoding:NSASCIIStringEncoding];
|
||||
[logOutput setString:[NSString stringWithFormat:@"%@%@\n", [logOutput string], output]];
|
||||
[logOutput scrollRangeToVisible:NSMakeRange([[logOutput textStorage] length], 0)];
|
||||
[output release];
|
||||
}
|
||||
|
||||
[makeTask launch];
|
||||
[makeTask waitUntilExit];
|
||||
|
||||
[buildStatusField setStringValue:@"Waiting..."];
|
||||
[targetField setStringValue:@""];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSFileHandleReadCompletionNotification object:nil];
|
||||
[NOTIFICATION_CENTER removeObserver:self
|
||||
name:NSFileHandleDataAvailableNotification
|
||||
object:readHandle];
|
||||
|
||||
[NOTIFICATION_CENTER removeObserver:self
|
||||
name:NSFileHandleDataAvailableNotification
|
||||
object:errorReadHandle];
|
||||
|
||||
[NOTIFICATION_CENTER removeObserver:self
|
||||
name:NSTaskDidTerminateNotification
|
||||
object:makeTask];
|
||||
|
||||
[readHandle release];
|
||||
[errorReadHandle release];
|
||||
[makeTask autorelease];
|
||||
}
|
||||
|
||||
- (void)logData:(NSNotification *)aNotif
|
||||
- (void)logStdOut:(NSNotification *)aNotif
|
||||
{
|
||||
NSData *data = [[aNotif userInfo] objectForKey:NSFileHandleNotificationDataItem];
|
||||
NSString *output = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
|
||||
NSData *data;
|
||||
|
||||
[logOutput setString:[NSString stringWithFormat:@"%@%@\n", [logOutput string], output]];
|
||||
[logOutput scrollRangeToVisible:NSMakeRange([[logOutput textStorage] length], 0)];
|
||||
[output release];
|
||||
if ((data = [readHandle availableData])) {
|
||||
[self logData:data error:NO];
|
||||
}
|
||||
|
||||
[readHandle waitForDataInBackgroundAndNotifyForModes:nil];
|
||||
}
|
||||
|
||||
- (void)logErrOut:(NSNotification *)aNotif
|
||||
{
|
||||
NSData *data;
|
||||
|
||||
if ((data = [errorReadHandle availableData])) {
|
||||
[self logData:data error:YES];
|
||||
}
|
||||
|
||||
[errorReadHandle waitForDataInBackgroundAndNotifyForModes:nil];
|
||||
}
|
||||
|
||||
- (void)buildDidTerminate:(NSNotification *)aNotif
|
||||
{
|
||||
int status = [[aNotif object] terminationStatus];
|
||||
|
||||
if (status == 0) {
|
||||
[self logString:@"*** Build Succeeded!\n" error:NO newLine:YES];
|
||||
}
|
||||
else {
|
||||
[self logString:@"*** Build Failed!" error:YES newLine:YES];
|
||||
[[logOutput window] orderFront:self];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)projectDidChange:(NSNotification *)aNotif
|
||||
|
|
@ -422,3 +460,40 @@ static PCProjectBuilder *_builder;
|
|||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation PCProjectBuilder (BuildLogging)
|
||||
|
||||
- (void)logString:(NSString *)string error:(BOOL)yn
|
||||
{
|
||||
[self logString:string error:yn newLine:YES];
|
||||
}
|
||||
|
||||
- (void)logString:(NSString *)str error:(BOOL)yn newLine:(BOOL)newLine
|
||||
{
|
||||
NSTextView *out = (yn)?errorOutput:logOutput;
|
||||
|
||||
[out replaceCharactersInRange:NSMakeRange([[out string] length],0) withString:str];
|
||||
|
||||
if (newLine) {
|
||||
[out replaceCharactersInRange:NSMakeRange([[out string] length], 0) withString:@"\n"];
|
||||
}
|
||||
else {
|
||||
[out replaceCharactersInRange:NSMakeRange([[out string] length], 0) withString:@" "];
|
||||
}
|
||||
|
||||
[out scrollRangeToVisible:NSMakeRange([[out string] length], 0)];
|
||||
}
|
||||
|
||||
- (void)logData:(NSData *)data error:(BOOL)yn
|
||||
{
|
||||
NSString *s = [[NSString alloc] initWithData:data
|
||||
encoding:[NSString defaultCStringEncoding]];
|
||||
|
||||
[self logString:s error:yn newLine:YES];
|
||||
[s autorelease];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ extern NSString *PCProjectBuildDidStopNotification;
|
|||
@interface PCServer : NSObject <Server>
|
||||
{
|
||||
NSMutableArray *clients;
|
||||
NSMutableArray *openDocuments;
|
||||
NSMutableDictionary *openDocuments;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
{
|
||||
if ((self = [super init])) {
|
||||
clients = [[NSMutableArray alloc] init];
|
||||
openDocuments = [[NSMutableArray alloc] init];
|
||||
openDocuments = [[NSMutableDictionary alloc] init];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fileShouldBeOpened:) name:FileShouldOpenNotification object:nil];
|
||||
}
|
||||
|
|
@ -89,13 +89,18 @@
|
|||
|
||||
- (void)openFileInInternalEditor:(NSString *)file
|
||||
{
|
||||
NSWindow *editorWindow = [self editorForFile:file];
|
||||
|
||||
[editorWindow setDelegate:self];
|
||||
[editorWindow center];
|
||||
[editorWindow makeKeyAndOrderFront:self];
|
||||
|
||||
[openDocuments addObject:editorWindow];
|
||||
if ([openDocuments objectForKey:file]) {
|
||||
[[openDocuments objectForKey:file] makeKeyAndOrderFront:self];
|
||||
}
|
||||
else {
|
||||
NSWindow *editorWindow = [self editorForFile:file];
|
||||
|
||||
[editorWindow setDelegate:self];
|
||||
[editorWindow center];
|
||||
[editorWindow makeKeyAndOrderFront:self];
|
||||
|
||||
[openDocuments setObject:editorWindow forKey:file];
|
||||
}
|
||||
}
|
||||
|
||||
- (NSWindow *)editorForFile:(NSString *)aFile
|
||||
|
|
@ -105,17 +110,20 @@
|
|||
NSWindow *window = [[NSWindow alloc] initWithContentRect:rect
|
||||
styleMask:style
|
||||
backing:NSBackingStoreBuffered
|
||||
defer:NO];
|
||||
defer:YES];
|
||||
PCEditorView *textView;
|
||||
NSScrollView *scrollView;
|
||||
|
||||
NSString *text = [NSString stringWithContentsOfFile:aFile];
|
||||
|
||||
[window setMinSize:NSMakeSize(512,320)];
|
||||
[window setTitle:[aFile lastPathComponent]];
|
||||
[window setTitle:aFile];
|
||||
|
||||
textView = [[PCEditorView alloc] initWithFrame:NSMakeRect(0,0,498,306)];
|
||||
[textView setMaxSize:NSMakeSize(1e7, 1e7)];
|
||||
[textView setRichText:NO];
|
||||
[textView setEditable:NO];
|
||||
[textView setSelectable:YES];
|
||||
[textView setVerticallyResizable:YES];
|
||||
[textView setHorizontallyResizable:NO];
|
||||
[textView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
|
||||
|
|
@ -148,7 +156,7 @@
|
|||
{
|
||||
NSWindow *window = [aNotif object];
|
||||
|
||||
[openDocuments removeObject:window];
|
||||
[openDocuments removeObjectForKey:[window title]];
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue