gnustep/apps-projectcenter
0
0
Fork 0
mirror of https://github.com/gnustep/apps-projectcenter.git synced 2025-03-14 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge branch 'dock_fix'"

Browse source 
This commit is a hack, for an unclean environment. It is especially bad
to copy an environment and then remove just a single environment
variable.

This reverts commit 82d4d12f82, reversing
changes made to 0bce146347.
This commit is contained in:
Riccardo Mottola 2021-08-16 15:45:53 +02:00
parent 82d4d12f82
commit 538016b372
2 changed files with 6 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ChangeLog
View file

@ -1,30 +1,19 @@
2021-08-11 Gregory John Casamento <greg.casamento@gmail.com>
* Framework/PCProjectBuilder.m: Fix issue where environment var
was causing build to fail. Explicitly set environment for NSTask
for build to prevent this problem.
2021-08-10 Gregory John Casamento <greg.casamento@gmail.com>
* Framework/PCEditorManager.m: Add method -gotoFile:atLine:
* Framework/PCProjectEditor.m: Add method openEditorForFilePath:
windowed:
* Framework/PCProjectEditor.m: Add method openEditorForFilePath:windowed:
* Framework/PCProjectManager.m: Add method openFileAtPath:windowed:
* Headers/ProjectCenter/PCEditorManager.h
* Headers/ProjectCenter/PCProjectEditor.h
* Headers/ProjectCenter/PCProjectManager.h: Declarations for above
methods.
* Headers/ProjectCenter/PCProjectManager.h: Declarations for above methods.
* Modules/Debuggers/ProjectCenter/GDBWrapper.h
* Modules/Debuggers/ProjectCenter/GDBWrapper.m: Add code to pull
"thread-selected" dictionary when the debugger stops by using
break/pause
or by using up or down. Code to syncronize editor with where the
debugger
"thread-selected" dictionary when the debugger stops by using break/pause
or by using up or down. Code to syncronize editor with where the debugger
has stopped.
* Modules/Debuggers/ProjectCenter/PCDebugger.h
* Modules/Debuggers/ProjectCenter/PCDebugger.m: updateEditor method.
This method makes use of the gotoFile:atLine: method to get the
file and show it
* Modules/Debuggers/ProjectCenter/PCDebugger.m: updateEditor method. This
method makes use of the gotoFile:atLine: method to get the file and show it
in the code editor and go to the line where it has stopped.
* Modules/Editors/ProjectCenter/PCEditor.m: Update internal editor
* Modules/Editors/ProjectCenter/PCEditorView.m: minor bugfixes.

12
Framework/PCProjectBuilder.m
View file

@ -596,25 +596,13 @@
name:NSTaskDidTerminateNotification
object:nil];
NSMutableDictionary *env = [[NSMutableDictionary alloc] init];
// optionally copy in existing environment first:
// (we could also copy values for a limited set of specific keys, if we wanted.)
[env addEntriesFromDictionary:[[NSProcessInfo processInfo] environment]];
// then add/remove anything else we might want:
[env removeObjectForKey:@"GNUSTEP_USER_ROOT"];
makeTask = [[NSTask alloc] init];
// now set the task up to use this newly-built environment:
[makeTask setEnvironment:env];
[makeTask setArguments:buildArgs];
[makeTask setCurrentDirectoryPath:[project projectPath]];
[makeTask setLaunchPath:buildTool];
[makeTask setStandardOutput:stdOutPipe];
[makeTask setStandardError:stdErrorPipe];
NSLog(@"buildArgs = %@, buildTool = %@, projectPath = %@", buildArgs, buildTool, [project projectPath]);
[self logBuildString:
[NSString stringWithFormat:@"=== %@ started ===", buildStatusTarget]
newLine:YES];