Fix the streamable task to coordinate properly between source headers and preambles.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6654 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 05:34:13 +00:00
parent d2cdd54595
commit e9099dc415
3 changed files with 3 additions and 5 deletions
@@ -134,7 +134,7 @@ public class GenActionScriptStreamableTask extends GenTask

        String template = sclass.isEnum() ? "enum_as.tmpl" : "streamable_as.tmpl";
        String output = mergeTemplate("com/threerings/presents/tools/" + template,
-            "header", _header,
+            "header", existing == null ? _header : "",
            "package", sclass.getPackage().getName(),
            "classname", ActionScriptUtils.toSimpleName(sclass),
            "imports", imports.toList(),
@@ -1,5 +1,4 @@
-// GENERATED PREAMBLE START
-{{header}}
+{{header}}// GENERATED PREAMBLE START
 package {{package}} {

 {{#imports}}
@@ -1,5 +1,4 @@
-// GENERATED PREAMBLE START
-{{header}}
+{{header}}// GENERATED PREAMBLE START
 package {{package}} {

 {{#imports}}