[Gnustep-cvs] r38251 - in /apps/projectcenter/trunk: ChangeLog Framework/PCMakefileFactory.m
Author: rmottola Date: Tue Dec 16 17:06:06 2014 New Revision: 38251 URL: http://svn.gna.org/viewcvs/gnustep?rev=38251view=rev Log: Generate sections only if there are classes. Modified: apps/projectcenter/trunk/ChangeLog apps/projectcenter/trunk/Framework/PCMakefileFactory.m Modified: apps/projectcenter/trunk/ChangeLog URL: http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/ChangeLog?rev=38251r1=38250r2=38251view=diff == --- apps/projectcenter/trunk/ChangeLog (original) +++ apps/projectcenter/trunk/ChangeLog Tue Dec 16 17:06:06 2014 @@ -1,3 +1,8 @@ +2014-12-16 Riccardo Mottola r...@gnu.org + + * Framework/PCMakefileFactory.m + Generate sections only if there are classes. + 2014-12-15 Riccardo Mottola r...@gnu.org * Framework/PCMakefileFactory.m Modified: apps/projectcenter/trunk/Framework/PCMakefileFactory.m URL: http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/Framework/PCMakefileFactory.m?rev=38251r1=38250r2=38251view=diff == --- apps/projectcenter/trunk/Framework/PCMakefileFactory.m (original) +++ apps/projectcenter/trunk/Framework/PCMakefileFactory.m Tue Dec 16 17:06:06 2014 @@ -342,7 +342,7 @@ NSEnumerator *oenum; NSMutableArray *marray = nil; NSMutableArray *mmarray = nil; -NSString *file; + NSString *file; if (array == nil || [array count] == 0) { @@ -370,17 +370,19 @@ } } - [self appendString:COMMENT_CLASSES]; - [self appendString: -[NSString stringWithFormat: @%@_OBJC_FILES = \\\n,target]]; - - [self appendString: [marray componentsJoinedByString: @ \\\n]]; - - [self appendString:COMMENT_OCPPCLASSES]; - [self appendString: -[NSString stringWithFormat: @%@_OBJCC_FILES = \\\n,target]]; - - [self appendString: [mmarray componentsJoinedByString: @ \\\n]]; + if (marray) +{ + [self appendString:COMMENT_CLASSES]; + [self appendString: [NSString stringWithFormat: @%@_OBJC_FILES = \\\n,target]]; + [self appendString: [marray componentsJoinedByString: @ \\\n]]; +} + + if (mmarray) +{ + [self appendString:COMMENT_OCPPCLASSES]; + [self appendString: [NSString stringWithFormat: @%@_OBJCC_FILES = \\\n,target]]; + [self appendString: [mmarray componentsJoinedByString: @ \\\n]]; +} } - (void)appendOtherSources:(NSArray *)array ___ Gnustep-cvs mailing list Gnustep-cvs@gna.org https://mail.gna.org/listinfo/gnustep-cvs
[Gnustep-cvs] r38252 - in /apps/projectcenter/trunk: ChangeLog Framework/PCProject.m
Author: rmottola Date: Tue Dec 16 18:32:09 2014 New Revision: 38252 URL: http://svn.gna.org/viewcvs/gnustep?rev=38252view=rev Log: Initialize backup wrapper after wrapperPath since it depends on it Modified: apps/projectcenter/trunk/ChangeLog apps/projectcenter/trunk/Framework/PCProject.m Modified: apps/projectcenter/trunk/ChangeLog URL: http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/ChangeLog?rev=38252r1=38251r2=38252view=diff == --- apps/projectcenter/trunk/ChangeLog (original) +++ apps/projectcenter/trunk/ChangeLog Tue Dec 16 18:32:09 2014 @@ -1,3 +1,8 @@ +2014-12-16 Riccardo Mottola r...@gnu.org + + * Framework/PCProject.m + Initialize backup wrapper after wrapperPath since it depends on it! + 2014-12-16 Riccardo Mottola r...@gnu.org * Framework/PCMakefileFactory.m Modified: apps/projectcenter/trunk/Framework/PCProject.m URL: http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/Framework/PCProject.m?rev=38252r1=38251r2=38252view=diff == --- apps/projectcenter/trunk/Framework/PCProject.m (original) +++ apps/projectcenter/trunk/Framework/PCProject.m Tue Dec 16 18:32:09 2014 @@ -472,11 +472,11 @@ - (BOOL)save { NSFileManager *fm = [NSFileManager defaultManager]; - intspCount = [loadedSubprojects count]; + NSUInteger spCount = [loadedSubprojects count]; inti; - NSString *wrapperFile = [projectName stringByAppendingPathExtension: @pcproj]; + NSString *wrapperFile; NSString *file = @PC.project; - NSString *backup = [wrapperPath stringByAppendingPathExtension:@backup]; + NSString *backup; NSMutableDictionary *dict = [projectDict mutableCopy]; NSData *dictData = nil; @@ -484,10 +484,12 @@ [dict removeObjectForKey: PCWindows]; [dict removeObjectForKey: PCLastEditing]; - // initialize the wrapper... + // initialize the wrappers.. + wrapperFile = [projectName stringByAppendingPathExtension: @pcproj]; projectFileWrapper = [[NSFileWrapper alloc] initDirectoryWithFileWrappers: [NSMutableDictionary dictionaryWithCapacity: 3]]; wrapperPath = [projectPath stringByAppendingPathComponent: wrapperFile]; + backup = [wrapperPath stringByAppendingPathExtension:@backup]; // load subprojects... for (i = 0; i spCount; i++) ___ Gnustep-cvs mailing list Gnustep-cvs@gna.org https://mail.gna.org/listinfo/gnustep-cvs