From f3d6712cd2635fe4d19e4d4a3905739fd1bf16df Mon Sep 17 00:00:00 2001
From: Jamie Doornbos <jamie@threerings.net>
Date: Tue, 5 Apr 2011 23:33:29 +0000
Subject: [PATCH] Fixed some more eol issues. genservice and gendobj work for
 me now.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6605 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/presents/tools/GenDObjectTask.java   |  4 ++--
 .../java/com/threerings/presents/tools/GenTask.java | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/threerings/presents/tools/GenDObjectTask.java b/src/main/java/com/threerings/presents/tools/GenDObjectTask.java
index be026a300..26a7e11dd 100644
--- a/src/main/java/com/threerings/presents/tools/GenDObjectTask.java
+++ b/src/main/java/com/threerings/presents/tools/GenDObjectTask.java
@@ -154,8 +154,8 @@ public class GenDObjectTask extends GenTask
 
             // append the merged templates as appropriate to the string buffers
             if (ii > 0) {
-                fsection.append("\n");
-                msection.append("\n");
+                fsection.append(EOL);
+                msection.append(EOL);
             }
             fsection.append(mergeTemplate(NAME_TMPL, data));
             msection.append(mergeTemplate(BASE_TMPL + tname, data));
diff --git a/src/main/java/com/threerings/presents/tools/GenTask.java b/src/main/java/com/threerings/presents/tools/GenTask.java
index b55354586..5911b74c7 100644
--- a/src/main/java/com/threerings/presents/tools/GenTask.java
+++ b/src/main/java/com/threerings/presents/tools/GenTask.java
@@ -134,7 +134,7 @@ public abstract class GenTask extends Task
     {
         String output = mergeTemplate(templatePath, data);
         if (_header != null) {
-            output = _header + output;
+            output = convertEols(_header) + output;
         }
         writeFile(outputPath, output);
     }
@@ -166,7 +166,7 @@ public abstract class GenTask extends Task
     protected boolean wouldProduceSameFile (String generated, File existing)
         throws IOException
     {
-        Iterator<String> generatedLines = Splitter.on('\n').split(generated).iterator();
+        Iterator<String> generatedLines = Splitter.on(EOL).split(generated).iterator();
         for (String prev : Files.readLines(existing, UTF_8)) {
             if (!generatedLines.hasNext()) {
                 return false;
@@ -207,7 +207,7 @@ public abstract class GenTask extends Task
     {
         Reader reader =
             new InputStreamReader(getClass().getClassLoader().getResourceAsStream(template), UTF_8);
-        return Mustache.compiler().escapeHTML(false).compile(reader).execute(data);
+        return convertEols(Mustache.compiler().escapeHTML(false).compile(reader).execute(data));
     }
 
     protected Map<String, Object> createMap (Object... data)
@@ -253,6 +253,13 @@ public abstract class GenTask extends Task
         }
     }
 
+    protected static String convertEols (String str)
+    {
+        return str.replace("\n", EOL);
+    }
+
+    protected static String EOL = System.getProperty("line.separator");
+
     /** A list of filesets that contain java source to be processed. */
     protected List<FileSet> _filesets = Lists.newArrayList();