Author: espectador
Date: Mon Mar 31 02:52:36 2014
New Revision: 37778
URL: http://svn.gna.org/viewcvs/gnustep?rev=37778&view=rev
Log:
Fix last change.
Modified:
apps/projectcenter/trunk/ChangeLog
apps/projectcenter/trunk/Framework/PCFileCreator.m
Modified: apps/projectcenter/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/ChangeLog?rev=37778&r1=37777&r2=37778&view=diff
==============================================================================
--- apps/projectcenter/trunk/ChangeLog (original)
+++ apps/projectcenter/trunk/ChangeLog Mon Mar 31 02:52:36 2014
@@ -1,3 +1,9 @@
+2014-03-30 German Arias <[email protected]>
+
+ * Framework/PCFileCreator.m: Fix last change to ensure all string in the
+ file is UTF-8, since GNU make can't handle UTF-16 (this change is for
+ Windows).
+
2014-03-27 German Arias <[email protected]>
* Framework/PCFileCreator.m: Be sure to use an UTF8 string for the user
Modified: apps/projectcenter/trunk/Framework/PCFileCreator.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/Framework/PCFileCreator.m?rev=37778&r1=37777&r2=37778&view=diff
==============================================================================
--- apps/projectcenter/trunk/Framework/PCFileCreator.m (original)
+++ apps/projectcenter/trunk/Framework/PCFileCreator.m Mon Mar 31 02:52:36 2014
@@ -278,7 +278,13 @@
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)
{
@@ -335,7 +341,16 @@
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];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
