mirror of
https://github.com/gnustep/apps-projectcenter.git
synced 2025-03-17 08:01:24 +00:00
Remove two last commits.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@37780 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
8c3ae8ddba
commit
c92e82d1c2
2 changed files with 5 additions and 27 deletions
|
@ -1,3 +1,8 @@
|
|||
2014-04-02 German Arias <germanandre@gmx.es>
|
||||
|
||||
* Framework/PCFileCreator.m: Removed two last commits. There is
|
||||
something wrong with these.
|
||||
|
||||
2014-03-30 German Arias <germanandre@gmx.es>
|
||||
|
||||
* Framework/PCFileCreator.m: Fix last change to ensure all string in the
|
||||
|
|
|
@ -278,13 +278,7 @@ static NSDictionary *dict = nil;
|
|||
NSString *fn = [aFile stringByDeletingPathExtension];
|
||||
NSRange subRange;
|
||||
|
||||
#ifdef WIN32
|
||||
file = [[NSMutableString stringWithContentsOfFile: newFile
|
||||
encoding: NSUTF8StringEncoding
|
||||
error: NULL] retain];
|
||||
#else
|
||||
file = [[NSMutableString stringWithContentsOfFile:newFile] retain];
|
||||
#endif
|
||||
|
||||
while ((subRange = [file rangeOfString:@"$FULLFILENAME$"]).length)
|
||||
{
|
||||
|
@ -303,26 +297,12 @@ static NSDictionary *dict = nil;
|
|||
|
||||
while ((subRange = [file rangeOfString:@"$USERNAME$"]).length)
|
||||
{
|
||||
#ifdef WIN32
|
||||
// Be sure to use an UTF8 string.
|
||||
[file replaceCharactersInRange: subRange
|
||||
withString: [NSString stringWithCString:
|
||||
[NSUserName() UTF8String]]];
|
||||
#else
|
||||
[file replaceCharactersInRange:subRange withString:NSUserName()];
|
||||
#endif
|
||||
}
|
||||
|
||||
while ((subRange = [file rangeOfString:@"$FULLUSERNAME$"]).length)
|
||||
{
|
||||
#ifdef WIN32
|
||||
// Be sure to use an UTF8 string.
|
||||
[file replaceCharactersInRange: subRange
|
||||
withString: [NSString stringWithCString:
|
||||
[NSFullUserName() UTF8String]]];
|
||||
#else
|
||||
[file replaceCharactersInRange:subRange withString:NSFullUserName()];
|
||||
#endif
|
||||
}
|
||||
|
||||
while ((subRange = [file rangeOfString:@"$PROJECTNAME$"]).length)
|
||||
|
@ -341,14 +321,7 @@ static NSDictionary *dict = nil;
|
|||
withString:[[NSNumber numberWithInt:year] stringValue]];
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
[file writeToFile: newFile
|
||||
atomically: YES
|
||||
encoding: NSUTF8StringEncoding
|
||||
error: NULL];
|
||||
#else
|
||||
[file writeToFile:newFile atomically:YES];
|
||||
#endif
|
||||
|
||||
|
||||
[file release];
|
||||
|
|
Loading…
Reference in a new issue