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

When opening a subproejct pass the bundle of the project, not the project file inside

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@30937 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2010-07-08 22:45:40 +00:00
parent c816587571
commit 760149038d
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,9 @@
2010-07-08 Riccardo Mottola
* Framework/PCProject.m
* Framework/PCProjectManager.m
When opening a subproject pass the bundle name, or it gets concerted.
2010-07-07 14:49-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Modules/Debuggers/ProjectCenter/PCDebuggerView.m:
@ -25,7 +31,7 @@
* Framework/PCProjectWindow.m
Removed floorf() in favour of nothing or truncation.
2010-06-15 Wolfgang Lux <wolfgang.lux@gmail.com>
* Framework/PCProject.m (-fileTypesForCategoryKey:): Add .dylib to

BIN
English.lproj/ProjectCenter.gorm/data.info
View file

Binary file not shown.

BIN
English.lproj/ProjectCenter.gorm/objects.gorm
View file

Binary file not shown.

6
Framework/PCProject.m
View file

@ -1,7 +1,7 @@
/*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2000-2004 Free Software Foundation
Copyright (C) 2000-2010 Free Software Foundation
Authors: Philippe C.D. Robert
Serg Stoyan
@ -1543,9 +1543,7 @@ NSString
spFile = [projectPath stringByAppendingPathComponent:name];
spFile = [spFile stringByAppendingPathExtension:@"subproj"];
spFile = [spFile stringByAppendingPathComponent: pname];
spFile = [spFile stringByAppendingPathComponent: @"PC.project"];
/* PCLogInfo(self, @"Not found! Load subproject: %@ at path: %@",
name, spFile);*/
sp = [projectManager openProjectAt:spFile makeActive:NO];
if (sp)
{

14
Framework/PCProjectManager.m
View file

@ -1,7 +1,7 @@
/*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2000-2004 Free Software Foundation
Copyright (C) 2000-2010 Free Software Foundation
Authors: Philippe C.D. Robert
Serg Stoyan
@ -575,7 +575,12 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange";
if (!isDir)
{
projectFile = [NSMutableDictionary dictionaryWithContentsOfFile: aPath];
projectFile = [NSMutableDictionary dictionaryWithContentsOfFile: aPath];
if(projectFile == nil)
return nil;
// For compatibility with 0.3.x projects
project = [self convertLegacyProject: projectFile atPath: aPath];
}
else
{
@ -583,12 +588,9 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange";
}
if(projectFile == nil)
{
return nil;
}
// For compatibility with 0.3.x projects
project = [self convertLegacyProject: projectFile atPath: aPath];
if (project)
{// Project was converted and created PC*Project with alloc&init
aPath = [[aPath stringByDeletingLastPathComponent]