Update AppBundler to current version

see https://github.com/TheInfiniteKind/appbundler

Author: gamma

src/com/oracle/appbundler/AppBundlerTask.java

@@ -29,6 +29,7 @@
 
 import org.apache.tools.ant.BuildException;
 
+
 /**
  * Represent a CFBundleDocument.
  */
@@ -47,7 +48,7 @@ private String capitalizeFirst(String string) {
         stringArray[0] = Character.toUpperCase(stringArray[0]);
         return new String(stringArray);
     }
-
+    
     public void setExtensions(String extensionsString) {
         extensions = getListFromCommaSeparatedString(extensionsString, "Extensions", true);
     }
@@ -64,16 +65,16 @@ public static List<String> getListFromCommaSeparatedString(String listAsString,
             final String attributeName) {
         return getListFromCommaSeparatedString(listAsString, attributeName, false);
     }
-
+            
     public static List<String> getListFromCommaSeparatedString(String listAsString,
             final String attributeName, final boolean lowercase) {
         if(listAsString == null) {
             throw new BuildException(attributeName + " can't be null");
         }
-
+        
         String[] splittedListAsString = listAsString.split(",");
         List<String> stringList = new ArrayList<String>();
-
+        
         for (String extension : splittedListAsString) {
             String cleanExtension = extension.trim();
             if (lowercase) {
@@ -83,13 +84,13 @@ public static List<String> getListFromCommaSeparatedString(String listAsString,
                 stringList.add(cleanExtension);
             }
         }
-
+        
         if (stringList.size() == 0) {
             throw new BuildException(attributeName + " list must not be empty");
         }
         return stringList;
     }
-
+    
     public void setIcon(String icon) {
       this.icon = icon;
     }
@@ -101,19 +102,19 @@ public void setName(String name) {
     public void setRole(String role) {
       this.role = capitalizeFirst(role);
     }
-
+    
     public void setHandlerRank(String handlerRank) {
       this.handlerRank = capitalizeFirst(handlerRank);
     } 
-
+      
     public void setIsPackage(String isPackageString) {
         if(isPackageString.trim().equalsIgnoreCase("true")) {
             this.isPackage = true;
         } else {
             this.isPackage = false;
         }
     }
-
+    
     public String getIcon() {
         return icon;
     }
@@ -129,33 +130,33 @@ public String getRole() {
     public String getHandlerRank() {
         return handlerRank;
     }
-
+    
     public List<String> getExtensions() {
         return extensions;
     }
-
+    
     public List<String> getContentTypes() {
         return contentTypes;
     }
-
+    
     public List<String> getExportableTypes() {
         return exportableTypes;
     }
-
+    
     public File getIconFile() {
         if (icon == null) { return null; }
 
         File ifile = new File (icon);
-
+        
         if (! ifile.exists ( ) || ifile.isDirectory ( )) { return null; }
 
         return ifile;
     }
-
+    
     public boolean hasIcon() {
         return icon != null;
     }
-
+    
     public boolean isPackage() {
         return isPackage;
     }
@@ -182,7 +183,7 @@ public String toString() {
                 s.append(exportableType).append(" ");
             }
         }
-
+        
         return s.toString();
     }
 }

src/com/oracle/appbundler/BundleDocument.java

@@ -26,5 +26,5 @@
 package com.oracle.appbundler;
 
 public class Environment extends Option {
-
+    
 }

src/com/oracle/appbundler/Environment.java

@@ -0,0 +1,140 @@
+/*
+ * Copyright 2019, ATTO Technology, Inc. All rights reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  ATTO Technology designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by ATTO Technology in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+package com.oracle.appbundler;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.ExecTask;
+
+/**
+ * Class representing a module that will be passed to jlink to build the bundled
+ * JVM.
+ */
+public class JLink {
+    private String runtime = null;
+    private ArrayList<String> jmods = new ArrayList<>();
+    private ArrayList<String> arguments = new ArrayList<>();
+    private ExecTask exec = new ExecTask();
+
+    public JLink() {
+        exec.init();
+    }
+
+    public String getRuntime() {
+        return runtime;
+    }
+
+    public void setRuntime(String runtime) {
+        this.runtime = runtime;
+    }
+
+    public void setTask(AppBundlerTask task) {
+        exec.bindToOwner(task);
+    }
+
+    /* Provide canonical path so that runtime can be specified via a
+     * version-agnostic path (relative link, e.g. `current-jre`) while
+     * still preserving the original runtime directory name, e.g.
+     * `jre1.8.0_45.jre`.
+     */
+    public File getDir() {
+        File dir = new File(runtime);
+        try {
+            return dir.getCanonicalFile();
+        } catch (IOException e) {
+            return dir;
+        }
+    }
+
+    public void addConfiguredJMod(JMod jmod) throws BuildException {
+        String name = jmod.getName();
+
+        if (name == null) {
+            throw new BuildException("Name is required.");
+        }
+
+        jmods.add(name);
+    }
+
+    public void addConfiguredArgument(Argument argument) throws BuildException {
+        String value = argument.getValue();
+
+        if (value == null) {
+            throw new BuildException("Value is required.");
+        }
+
+        arguments.add(value);
+    }
+
+    public void copyTo(File targetDir) throws IOException {
+        File runtimeHomeDirectory = getDir();
+        File runtimeContentsDirectory = runtimeHomeDirectory.getParentFile();
+        File runtimeDirectory = runtimeContentsDirectory.getParentFile();
+
+        // Create root plug-in directory
+        File pluginDirectory = new File(targetDir, runtimeDirectory.getName());
+        pluginDirectory.mkdir();
+
+        // Create Contents directory
+        File pluginContentsDirectory = new File(pluginDirectory, runtimeContentsDirectory.getName());
+        pluginContentsDirectory.mkdir();
+
+        // Copy MacOS directory
+        File runtimeMacOSDirectory = new File(runtimeContentsDirectory, "MacOS");
+        AppBundlerTask.copy(runtimeMacOSDirectory, new File(pluginContentsDirectory, runtimeMacOSDirectory.getName()));
+
+
+        // Copy Info.plist file
+        File runtimeInfoPlistFile = new File(runtimeContentsDirectory, "Info.plist");
+        AppBundlerTask.copy(runtimeInfoPlistFile, new File(pluginContentsDirectory, runtimeInfoPlistFile.getName()));
+
+        // Copy included contents of Home directory
+        File pluginHomeDirectory = new File(pluginContentsDirectory, runtimeHomeDirectory.getName());
+
+        exec.setExecutable(runtimeHomeDirectory.getAbsolutePath() + "/bin/jlink");
+        exec.setFailIfExecutionFails(true);
+        exec.setFailonerror(true);
+        for(String s : this.arguments) {
+            exec.createArg().setValue(s);
+        }
+
+        exec.createArg().setValue("--no-man-pages");
+        exec.createArg().setValue("--no-header-files");
+        exec.createArg().setValue("--strip-native-commands");    /* no bin directory */
+        exec.createArg().setValue("--add-modules");
+        exec.createArg().setValue(String.join(",", jmods));
+        exec.createArg().setValue("--output");
+        exec.createArg().setValue(pluginHomeDirectory.getAbsolutePath());
+
+        exec.execute();
+    }
+
+    @Override
+    public String toString() {
+        return runtime;
+    }
+}

src/com/oracle/appbundler/JLink.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2019, ATTO Technology, Inc. All rights reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  ATTO Technology designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by ATTO Technology in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+package com.oracle.appbundler;
+
+/**
+ * Class representing a module that will be passed to jlink to build the bundled
+ * JVM.
+ */
+public class JMod {
+    private String name = null;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

src/com/oracle/appbundler/JMod.java

@@ -33,22 +33,22 @@
  * application.<p>
  * Assuming your {@code CFBundleIdentifier} (settable via {@link AppBundlerTask#setIdentifier(String)})
  * is {@code com.oracle.appbundler}. Then you can override a named option by calling
- * <code>
+ * <pre>
  *     import java.util.prefs.Preferences;
  *     [...]
  *     Preferences jvmOptions = Preferences.userRoot().node("/com/oracle/appbundler/JVMOptions");
  *     jvmOptions.put("name", "value");
  *     jvmOptions.flush();
- * </code>
+ * </pre>
  * The corresponding entries will be stored in a file called
  * {@code ~/Library/Preferences/com.oracle.appbundler.plist}.
  * To manipulate the file without Java's {@link java.util.prefs.Preferences} from the command line,
  * you should use the tool
  * <a href="https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/defaults.1.html">defaults</a>.
  * For example, to add an entry via the command line, use:
- * <code>
+ * <pre>
  *     defaults write com.oracle.appbundler /com/oracle/appbundler/ -dict-add JVMOptions/ '{"name"="value";}'
- * </code>
+ * </pre>
  *
  * @author <a href="mailto:[email protected]">Hendrik Schreiber</a> (preference related code only)
  */

src/com/oracle/appbundler/Option.java

@@ -47,7 +47,7 @@ public class TypeDeclaration implements IconContainer {
     public TypeDeclaration() {
         this.conformsTo = Arrays.asList(new String[]{"public.data"});
     }
-
+    
     public boolean isImported() {
         return imported;
     }
@@ -92,16 +92,16 @@ public File getIconFile() {
         if (icon == null) { return null; }
 
         File ifile = new File (icon);
-
+        
         if (! ifile.exists ( ) || ifile.isDirectory ( )) { return null; }
 
         return ifile;
     }
-
+    
     public boolean hasIcon() {
         return icon != null;
     }
-
+    
     public List<String> getConformsTo() {
         return conformsTo;
     }