* Framework/PCProjectBuilder.m:

(-startBuild:), (-startClean:): Move _isBuilding and _isCleaning vars
before build: method call for correct determination in cleanupAfterMake
method.
(build:): Initialize build time vars before call to preBuildChecj method.
* Framework/PCProjectBuilderOptions.m: Do not notify when changing project
properties (build options).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@28216 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sergii Stoian 2009-04-14 23:24:14 +00:00
parent dde3badacc
commit 8b186c4ad7
3 changed files with 25 additions and 13 deletions

View file

@ -1,3 +1,14 @@
2009-04-15 Sergii Stoian <stoyan255@gmail.com>
* Framework/PCProjectBuilder.m:
(-startBuild:), (-startClean:): Move _isBuilding and _isCleaning vars
before build: method call for correct determination in cleanupAfterMake
method.
(build:): Initialize build time vars before call to preBuildChecj
method.
* Framework/PCProjectBuilderOptions.m: Do not notify when changing
project properties (build options).
2009-03-31 Riccardo Mottola <rmottola@users.sf.net> 2009-03-31 Riccardo Mottola <rmottola@users.sf.net>
* PCSplitView: removed and replaced with standard NSSplitView in all instances * PCSplitView: removed and replaced with standard NSSplitView in all instances

View file

@ -388,8 +388,8 @@
buildStatus = [NSString stringWithString:@"Building..."]; buildStatus = [NSString stringWithString:@"Building..."];
[buildStatusTarget setString:@"Build"]; [buildStatusTarget setString:@"Build"];
[cleanButton setEnabled:NO]; [cleanButton setEnabled:NO];
[self build:self];
_isBuilding = YES; _isBuilding = YES;
[self build:self];
} }
- (void)startClean:(id)sender - (void)startClean:(id)sender
@ -418,8 +418,8 @@
buildStatus = [NSString stringWithString:@"Cleaning..."]; buildStatus = [NSString stringWithString:@"Cleaning..."];
[buildStatusTarget setString:@"Clean"]; [buildStatusTarget setString:@"Clean"];
[buildButton setEnabled:NO]; [buildButton setEnabled:NO];
[self build:self];
_isCleaning = YES; _isCleaning = YES;
[self build:self];
} }
- (BOOL)stopMake:(id)sender - (BOOL)stopMake:(id)sender
@ -464,21 +464,21 @@
{ {
[buildButton setState:NSOffState]; [buildButton setState:NSOffState];
[cleanButton setEnabled:YES]; [cleanButton setEnabled:YES];
_isBuilding = NO;
} }
else if (_isCleaning) else if (_isCleaning)
{ {
[cleanButton setState:NSOffState]; [cleanButton setState:NSOffState];
[buildButton setEnabled:YES]; [buildButton setEnabled:YES];
_isCleaning = NO;
} }
[buildArgs removeAllObjects]; [buildArgs removeAllObjects];
[buildStatusTarget setString:@"Default"]; [buildStatusTarget setString:@"Default"];
// Initiated in [self build:]
[currentBuildPath release]; [currentBuildPath release];
[currentBuildFile release]; [currentBuildFile release];
_isBuilding = NO;
_isCleaning = NO;
} }
// --- Actions // --- Actions
@ -555,6 +555,12 @@
- (void)build:(id)sender - (void)build:(id)sender
{ {
// Make runtime vars
// Released in [self cleanupAfterMake]
currentBuildPath = [[NSMutableString alloc]
initWithString:[project projectPath]];
currentBuildFile = [[NSMutableString alloc] initWithString:@""];
// Checking build conditions // Checking build conditions
if ([self prebuildCheck] == NO) if ([self prebuildCheck] == NO)
{ {
@ -562,11 +568,6 @@
return; return;
} }
// Make runtime vars
currentBuildPath = [[NSMutableString alloc]
initWithString:[project projectPath]];
currentBuildFile = [[NSMutableString alloc] initWithString:@""];
// Prepearing to building // Prepearing to building
_isLogging = YES; _isLogging = YES;
stdOutPipe = [[NSPipe alloc] init]; stdOutPipe = [[NSPipe alloc] init];
@ -645,7 +646,7 @@
return; return;
} }
NSLog(@"task did terminate"); // NSLog(@"task did terminate");
[NOTIFICATION_CENTER removeObserver:self [NOTIFICATION_CENTER removeObserver:self
name:NSTaskDidTerminateNotification name:NSTaskDidTerminateNotification

View file

@ -143,7 +143,7 @@
[args removeObject:@""]; [args removeObject:@""];
[args removeObject:@" "]; [args removeObject:@" "];
[project setProjectDictObject:args forKey:PCBuilderArguments notify:YES]; [project setProjectDictObject:args forKey:PCBuilderArguments notify:NO];
[delegate targetDidSet:[targetPopup titleOfSelectedItem]]; [delegate targetDidSet:[targetPopup titleOfSelectedItem]];
} }
@ -162,7 +162,7 @@
if (sender == sharedLibsButton) if (sender == sharedLibsButton)
key = PCBuilderSharedLibs; key = PCBuilderSharedLibs;
[project setProjectDictObject:value forKey:key notify:YES]; [project setProjectDictObject:value forKey:key notify:NO];
} }
- (void)loadProjectProperties:(NSNotification *)aNotif - (void)loadProjectProperties:(NSNotification *)aNotif