AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Route logging properly in Maven.

Browse Source
This commit is contained in:
Michael Bayne
2014-01-22 12:15:57 -08:00
parent 2f94b15c15
commit fe9d8f4d5c
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maven-plugin/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerMojo.java
+2
View File
@@ -121,6 +121,8 @@ public class ComponentBundlerMojo extends AbstractMojo
ComponentBundler bundler = new ComponentBundler(mapFile, actionDef) { ComponentBundler bundler = new ComponentBundler(mapFile, actionDef) {
@Override protected boolean keepRawPngs () { return keepRawPngs; } @Override protected boolean keepRawPngs () { return keepRawPngs; }
@Override protected boolean uncompressed () { return false; } @Override protected boolean uncompressed () { return false; }
@Override protected void logInfo (String message) { getLog().info(message); }
@Override protected void logWarn (String message) { getLog().warn(message); }
}; };
if (bundleDirectories == null) { if (bundleDirectories == null) {
tools/src/main/java/com/threerings/cast/bundle/tools/ComponentBundler.java
+15 -19
View File
@@ -70,6 +70,13 @@ public abstract class ComponentBundler {
protected boolean keepRawPngs () { return false; } protected boolean keepRawPngs () { return false; }
protected boolean uncompressed () { return false; } protected boolean uncompressed () { return false; }
protected void logInfo (String message) {
System.out.println(message);
}
protected void logWarn (String message) {
System.err.println(message);
}
public void execute (String root, File target, List<Tuple<File,List<String>>> sourceDirs) { public void execute (String root, File target, List<Tuple<File,List<String>>> sourceDirs) {
// load the id broker // load the id broker
HashMapIDBroker broker = new HashMapIDBroker(); HashMapIDBroker broker = new HashMapIDBroker();
@@ -108,11 +115,11 @@ public abstract class ComponentBundler {
long newest = getNewestDate(sources); long newest = getNewestDate(sources);
if (skipIfTargetNewer() && newest < target.lastModified()) { if (skipIfTargetNewer() && newest < target.lastModified()) {
System.out.println(target.getPath() + " is up to date."); logInfo(target.getPath() + " is up to date.");
return; return;
} }
System.out.println("Generating " + target + "..."); logInfo("Generating " + target + "...");
try { try {
// make sure we can create our bundle file // make sure we can create our bundle file
@@ -133,9 +140,8 @@ public abstract class ComponentBundler {
// make sure we have an action tileset definition // make sure we have an action tileset definition
TileSet aset = actsets.get(info[2]); TileSet aset = actsets.get(info[2]);
if (aset == null) { if (aset == null) {
System.err.println( logWarn("No tileset definition for component action '" + info[2] +
"No tileset definition for component action '" + info[2] + "' [class=" + info[0] + ", name=" + info[1] + "].");
"' [class=" + info[0] + ", name=" + info[1] + "].");
continue; continue;
} }
aset.setImageProvider(_improv); aset.setImageProvider(_improv);
@@ -212,13 +218,8 @@ public abstract class ComponentBundler {
BufferedImage image = aset.getRawTileSetImage(); BufferedImage image = aset.getRawTileSetImage();
ImageIO.write(image, "png", fout); ImageIO.write(image, "png", fout);
} catch (Throwable t) { } catch (Throwable t) {
System.err.println( logWarn("Failure storing tileset in jar [class=" + info[0] + ", name=" + info[1] +
"Failure storing tileset in jar" + ", action=" + info[2] + ", srcimg=" + aset.getImagePath() + "].");
"[class=" + info[0] + ", name=" + info[1] +
", action=" + info[2] +
", srcimg=" + aset.getImagePath() + "].");
t.printStackTrace(System.err);
String errmsg = "Failure trimming tileset."; String errmsg = "Failure trimming tileset.";
throw new RuntimeException(errmsg, t); throw new RuntimeException(errmsg, t);
} }
@@ -230,13 +231,8 @@ public abstract class ComponentBundler {
tset = trim(aset, fout); tset = trim(aset, fout);
tset.setImagePath(ipath); tset.setImagePath(ipath);
} catch (Throwable t) { } catch (Throwable t) {
System.err.println( logWarn("Failure trimming tileset [class=" + info[0] + ", name=" + info[1] +
"Failure trimming tileset " + ", action=" + info[2] + ", srcimg=" + aset.getImagePath() + "].");
"[class=" + info[0] + ", name=" + info[1] +
", action=" + info[2] +
", srcimg=" + aset.getImagePath() + "].");
t.printStackTrace(System.err);
String errmsg = "Failure trimming tileset."; String errmsg = "Failure trimming tileset.";
throw new RuntimeException(errmsg, t); throw new RuntimeException(errmsg, t);
} }