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
This commit is contained in:
@@ -134,7 +134,7 @@ public class GenActionScriptStreamableTask extends GenTask
|
|||||||
|
|
||||||
String template = sclass.isEnum() ? "enum_as.tmpl" : "streamable_as.tmpl";
|
String template = sclass.isEnum() ? "enum_as.tmpl" : "streamable_as.tmpl";
|
||||||
String output = mergeTemplate("com/threerings/presents/tools/" + template,
|
String output = mergeTemplate("com/threerings/presents/tools/" + template,
|
||||||
"header", _header,
|
"header", existing == null ? _header : "",
|
||||||
"package", sclass.getPackage().getName(),
|
"package", sclass.getPackage().getName(),
|
||||||
"classname", ActionScriptUtils.toSimpleName(sclass),
|
"classname", ActionScriptUtils.toSimpleName(sclass),
|
||||||
"imports", imports.toList(),
|
"imports", imports.toList(),
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
// GENERATED PREAMBLE START
|
{{header}}// GENERATED PREAMBLE START
|
||||||
{{header}}
|
|
||||||
package {{package}} {
|
package {{package}} {
|
||||||
|
|
||||||
{{#imports}}
|
{{#imports}}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
// GENERATED PREAMBLE START
|
{{header}}// GENERATED PREAMBLE START
|
||||||
{{header}}
|
|
||||||
package {{package}} {
|
package {{package}} {
|
||||||
|
|
||||||
{{#imports}}
|
{{#imports}}
|
||||||
|
|||||||
Reference in New Issue
Block a user