From a7a0ca87c903d25a92712132ad585573a4556798 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 20 Apr 2013 18:42:55 +0000
Subject: [PATCH] Branch from 0.9.5 release. Implement new Main wrapper class
for utility.jar, to work around izpack ticket #162
http://jira.codehaus.org/browse/IZPACK-162 which prevents us from specifying
a main class as it fails on Windows installations when a full path including
a drive letter is specified (ticket #912)
---
installer/java/build.xml | 1 +
.../java/src/net/i2p/installer/Main.java | 36 +++++++++++++++++++
2 files changed, 37 insertions(+)
create mode 100644 installer/java/src/net/i2p/installer/Main.java
diff --git a/installer/java/build.xml b/installer/java/build.xml
index aba97d9385..be911236a5 100644
--- a/installer/java/build.xml
+++ b/installer/java/build.xml
@@ -49,6 +49,7 @@
<fileset dir="../../core/java/build/obj" includes="**/FileUtil.class"/>
<fileset dir="./build/obj" includes="**" />
<manifest>
+ <attribute name="Main-Class" value="net.i2p.installer.Main" />
<attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
diff --git a/installer/java/src/net/i2p/installer/Main.java b/installer/java/src/net/i2p/installer/Main.java
new file mode 100644
index 0000000000..7cdd7607c7
--- /dev/null
+++ b/installer/java/src/net/i2p/installer/Main.java
@@ -0,0 +1,36 @@
+package net.i2p.installer;
+
+/**
+ * <p>
+ * Execute one of the other classes in this package.
+ * Workaround for izpack bug #162 / our bug #912
+ * http://jira.codehaus.org/browse/IZPACK-162
+ * http://trac.i2p2.i2p/ticket/912
+ * </p>
+ * Usage: <code>copy|delete|exec|fixwinpaths args...</code><br>
+ *
+ * @since 0.9.6
+ */
+public class Main {
+
+ private static final String USAGE = "Usage: {copy|delete|exec|fixwinpaths} [args...]";
+
+ public static void main(String args[]) {
+ if (args.length == 0)
+ throw new IllegalArgumentException(USAGE);
+ String cmd = args[0];
+ String[] shift = new String[args.length - 1];
+ if (shift.length > 0)
+ System.arraycopy(args, 1, shift, 0, shift.length);
+ if (cmd.equals("copy"))
+ Copy.main(shift);
+ else if (cmd.equals("delete"))
+ Delete.main(shift);
+ else if (cmd.equals("exec"))
+ Exec.main(shift);
+ else if (cmd.equals("fixwinpaths"))
+ FixWinPaths.main(shift);
+ else
+ throw new IllegalArgumentException(USAGE);
+ }
+}
--
GitLab