diff --git a/src/java/com/threerings/getdown/launcher/GetdownApp.java b/src/java/com/threerings/getdown/launcher/GetdownApp.java index d33d19e..10b43a3 100644 --- a/src/java/com/threerings/getdown/launcher/GetdownApp.java +++ b/src/java/com/threerings/getdown/launcher/GetdownApp.java @@ -6,13 +6,13 @@ // // Redistribution and use in source and binary forms, with or without modification, are permitted // provided that the following conditions are met: -// +// // 1. Redistributions of source code must retain the above copyright notice, this list of // conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright notice, this list of // conditions and the following disclaimer in the documentation and/or other materials provided // with the distribution. -// +// // THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A // PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, @@ -36,6 +36,7 @@ import java.io.BufferedOutputStream; import java.io.PrintStream; import com.samskivert.swing.util.SwingUtil; +import com.samskivert.util.ArrayUtil; import com.samskivert.util.StringUtil; import static com.threerings.getdown.Log.log; @@ -54,7 +55,7 @@ public class GetdownApp if (StringUtil.isBlank(adarg)) { if (args.length < 1) { System.err.println( - "Usage: java -jar getdown.jar app_dir [app_id]"); + "Usage: java -jar getdown.jar app_dir [app_id] [jvm args]"); System.exit(-1); } adarg = args[aidx++]; @@ -66,6 +67,12 @@ public class GetdownApp appId = args[aidx++]; } + // pass along anything after that as jvm args + String[] jvmargs = null; + if (args.length > aidx) { + jvmargs = ArrayUtil.splice(args, 0, aidx); + } + // ensure a valid directory was supplied File appDir = new File(adarg); if (!appDir.exists() || !appDir.isDirectory()) { @@ -99,7 +106,7 @@ public class GetdownApp log.info("---------------------------------------------"); try { - Getdown app = new Getdown(appDir, appId) { + Getdown app = new Getdown(appDir, appId, null, jvmargs) { @Override protected Container createContainer () { // create our user interface, and display it