Simplify runtime specification by pointing runtime fileset at Contents/Home instead of runtime root; may also help facilitate cross-platform support since Windows runtimes don't have a Contents/Home folder.

git-svn-id: https://svn.java.net/svn/appbundler~svn@17 07572b26-92e5-4d45-f66a-c18421440a21

Author: gk_brown

appbundler/doc/appbundler.html

@@ -95,34 +95,34 @@ <h3>Parameters</h3>
   </tr>
   <tr>
     <td valign="top">mainclassname</td>
-    <td valign="top">The name of the bundled application's main class.
-    Corresponds to the <code>JVMMainClassName</code> key in the <tt>Info.plist</tt>
-    file.</td>
+    <td valign="top">The name of the bundled application's main class.</td>
     <td align="center" valign="top">Yes</td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 <h4>runtime</h4>
 <p>A <a href="http://ant.apache.org/manual/Types/fileset.html">fileset</a> representing the Java
-runtime to embed in the application. Corresponds to the <code>JVMRuntime</code> key in the
-<tt>Info.plist</tt> file.</p>
+runtime environment to embed in the application.</p>
 
-<p>This element is optional. If specified, the runtime will be copied to the
-<tt>Contents/PlugIns/</tt> folder of the generated bundle. If omitted, the target system must
-have a shared JRE installed in <tt>/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/</tt>
-in order to run the application.</p>
+<p>This element is optional. If specified, the base directory of the fileset must point to the
+root directory of a valid Java runtime environment. The contents of the runtime will be copied to
+the <tt>Contents/PlugIns/</tt> folder of the generated application bundle. By default, the
+following content will be excluded from the bundled runtime:</p>
 
-<p>By default, the following runtime content will be excluded from the generated bundle:<p>
 <ul>
-<li><tt>Contents/Home/bin/</tt></li>
-<li><tt>Contents/Home/jre/bin/</tt></li>
-<li><tt>Contents/Home/man/</tt></li>
-<li><tt>Contents/Home/src.zip</tt></li>
+<li><tt>bin/</tt></li>
+<li><tt>jre/bin/</tt></li>
+<li><tt>man/</tt></li>
+<li><tt>src.zip</tt></li>
 </ul>
 
 <p>Additional content can be excluded using nested <code>&lt;excludes/&gt;</code> elements.</p>
 
+<p>If this element is omitted, a Java runtime environment will not be copied into the generated
+bundle, and target systems must have a shared JRE installed in
+<tt>/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/</tt> in order to run the application.</p>
+
 <h4>classpath</h4>
 <p>A <a href="http://ant.apache.org/manual/Types/fileset.html">fileset</a> representing the class
 path of the bundled application. Corresponds to the <tt>java.class.path</tt> system property.
@@ -166,8 +166,8 @@ <h4>argument</h4>
 <h3>Examples</h3>
 <p>Generate a launcher for the "Swing Set" demo, bundling the JRE defined by the <tt>JAVA_HOME</tt>
 environment variable with the resulting executable. In addition to the default excludes, the
-contents of the <tt>Contents/Home/db/</tt> and <tt>Contents/Home/lib/</tt> folders will also be
-excluded from the bundled runtime:</p>
+contents of the <tt>db/</tt> and <tt>lib/</tt> folders will also be excluded from the bundled
+runtime:</p>
 <pre>
 &lt;-- Import environment variables --&gt;
 &lt;property environment="env"/&gt;
@@ -183,9 +183,9 @@ <h3>Examples</h3>
         identifier="com.oracle.javax.swing.SwingSet2"
         shortversion="1.0"
         mainclassname="SwingSet2"&gt;
-        &lt;runtime dir="${env.JAVA_HOME}/../.."/&gt;
-            &lt;exclude name="Contents/Home/db/"/&gt;
-            &lt;exclude name="Contents/Home/lib/"/&gt;
+        &lt;runtime dir="${env.JAVA_HOME}"/&gt;
+            &lt;exclude name="db/"/&gt;
+            &lt;exclude name="lib/"/&gt;
         &lt;/runtime&gt;
         &lt;classpath file="/Library/Java/Demos/JFC/SwingSet2/SwingSet2.jar"/&gt;
         &lt;option value="-Dapple.laf.useScreenMenuBar=true"/&gt;

appbundler/src/com/oracle/appbundler/AppBundlerTask.java

@@ -129,12 +129,10 @@ public void addConfiguredRuntime(FileSet runtime) throws BuildException {
         this.runtime = runtime;
 
         runtime.appendExcludes(new String[] {
-            "Contents/MacOS/",
-            "Contents/Info.plist",
-            "Contents/Home/bin/",
-            "Contents/Home/jre/bin/",
-            "Contents/Home/man/",
-            "Contents/Home/src.zip"
+            "bin/",
+            "jre/bin/",
+            "man/",
+            "src.zip"
         });
     }
 
@@ -281,13 +279,15 @@ public void execute() throws BuildException {
 
     private void copyRuntime(File plugInsDirectory) throws IOException {
         if (runtime != null) {
-            // Create root directory
-            File runtimeDirectory = runtime.getDir();
+            File runtimeHomeDirectory = runtime.getDir();
+            File runtimeContentsDirectory = runtimeHomeDirectory.getParentFile();
+            File runtimeDirectory = runtimeContentsDirectory.getParentFile();
+
+            // Create root plug-in directory
             File pluginDirectory = new File(plugInsDirectory, runtimeDirectory.getName());
             pluginDirectory.mkdir();
 
             // Create Contents directory
-            File runtimeContentsDirectory = new File(runtimeDirectory, "Contents");
             File pluginContentsDirectory = new File(pluginDirectory, runtimeContentsDirectory.getName());
             pluginContentsDirectory.mkdir();
 
@@ -300,13 +300,15 @@ private void copyRuntime(File plugInsDirectory) throws IOException {
             copy(runtimeInfoPlistFile, new File(pluginContentsDirectory, runtimeInfoPlistFile.getName()));
 
             // Copy included contents of Home directory
+            File pluginHomeDirectory = new File(pluginContentsDirectory, runtimeHomeDirectory.getName());
+
             DirectoryScanner directoryScanner = runtime.getDirectoryScanner(getProject());
             String[] includedFiles = directoryScanner.getIncludedFiles();
 
             for (int i = 0; i < includedFiles.length; i++) {
                 String includedFile = includedFiles[i];
-                File source = new File(runtimeDirectory, includedFile);
-                File destination = new File(pluginDirectory, includedFile);
+                File source = new File(runtimeHomeDirectory, includedFile);
+                File destination = new File(pluginHomeDirectory, includedFile);
                 copy(source, destination);
             }
         }
@@ -390,7 +392,7 @@ private void writeInfoPlist(File file) throws IOException {
 
             // Write runtime
             if (runtime != null) {
-                writeProperty(xout, "JVMRuntime", runtime.getDir().getName());
+                writeProperty(xout, "JVMRuntime", runtime.getDir().getParentFile().getParentFile().getName());
             }
 
             // Write main class name

build.xml

@@ -124,7 +124,7 @@ questions.
             identifier="com.oracle.appbundler.Test"
             shortversion="1.0"
             mainclassname="Test">
-            <runtime dir="${env.JAVA_HOME}/../.."/>
+            <runtime dir="${env.JAVA_HOME}"/>
             <classpath dir="${ant.project.name}/${folder.classes}" includes="Test.class"/>
             <option value="-Xms32M"/>
             <option value="-Xmx256M"/>
@@ -142,9 +142,9 @@ questions.
             identifier="com.oracle.javax.swing.SwingSet2"
             shortversion="1.0"
             mainclassname="SwingSet2">
-            <runtime dir="${env.JAVA_HOME}/../..">
-                <exclude name="Contents/Home/db/"/>
-                <exclude name="Contents/Home/lib/"/>
+            <runtime dir="${env.JAVA_HOME}">
+                <exclude name="db/"/>
+                <exclude name="lib/"/>
             </runtime>
             <classpath file="/Library/Java/Demos/JFC/SwingSet2/SwingSet2.jar"/>
             <option value="-Dapple.laf.useScreenMenuBar=true"/>