Skip to content

Commit

Permalink
Move everything from jdk.jpackage to mobanisto.jpackage
Browse files Browse the repository at this point in the history
  • Loading branch information
sebkur committed Nov 17, 2022
1 parent 7e9aa0f commit 975940f
Show file tree
Hide file tree
Showing 141 changed files with 292 additions and 292 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.awt.image.BufferedImage;
import java.io.File;
Expand All @@ -43,17 +43,17 @@
import javax.imageio.ImageIO;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import jdk.jpackage.internal.Arguments.CLIOptions;
import static jdk.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON;
import static jdk.jpackage.internal.LinuxAppImageBuilder.ICON_PNG;
import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
import static jdk.jpackage.internal.StandardBundlerParam.ICON;
import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
import static jdk.jpackage.internal.StandardBundlerParam.SHORTCUT_HINT;
import mobanisto.jpackage.internal.Arguments.CLIOptions;
import static mobanisto.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON;
import static mobanisto.jpackage.internal.LinuxAppImageBuilder.ICON_PNG;
import static mobanisto.jpackage.internal.OverridableResource.createResource;
import static mobanisto.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
import static mobanisto.jpackage.internal.StandardBundlerParam.APP_NAME;
import static mobanisto.jpackage.internal.StandardBundlerParam.DESCRIPTION;
import static mobanisto.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
import static mobanisto.jpackage.internal.StandardBundlerParam.ICON;
import static mobanisto.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
import static mobanisto.jpackage.internal.StandardBundlerParam.SHORTCUT_HINT;

/**
* Helper to create files for desktop integration.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.IOException;
import java.nio.file.Files;
Expand Down Expand Up @@ -153,17 +153,17 @@ public interface PackageLookup {
//
// Typical ldd output:
//
// ldd: warning: you do not have execution permission for `/tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt_headless.so'
// ldd: warning: you do not have execution permission for `/tmp/mobanisto.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt_headless.so'
// linux-vdso.so.1 => (0x00007ffce6bfd000)
// libawt.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt.so (0x00007f4e00c75000)
// libawt.so => /tmp/mobanisto.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt.so (0x00007f4e00c75000)
// libjvm.so => not found
// libjava.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libjava.so (0x00007f4e00c41000)
// libjava.so => /tmp/mobanisto.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libjava.so (0x00007f4e00c41000)
// libm.so.6 => /lib64/libm.so.6 (0x00007f4e00834000)
// libdl.so.2 => /lib64/libdl.so.2 (0x00007f4e00630000)
// libc.so.6 => /lib64/libc.so.6 (0x00007f4e00262000)
// libjvm.so => not found
// libjvm.so => not found
// libverify.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libverify.so (0x00007f4e00c2e000)
// libverify.so => /tmp/mobanisto.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libverify.so (0x00007f4e00c2e000)
// /lib64/ld-linux-x86-64.so.2 (0x00007f4e00b36000)
// libjvm.so => not found
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

public class LinuxAppBundler extends AppImageBundler {
public LinuxAppBundler() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -32,9 +32,9 @@
import java.text.MessageFormat;
import java.util.List;
import java.util.Map;
import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.ICON;
import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
import static mobanisto.jpackage.internal.StandardBundlerParam.APP_NAME;
import static mobanisto.jpackage.internal.StandardBundlerParam.ICON;
import static mobanisto.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;

public class LinuxAppImageBuilder extends AbstractAppImageBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.IOException;
import java.nio.file.FileVisitResult;
Expand All @@ -46,14 +46,14 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.jpackage.internal.StandardBundlerParam.ABOUT_URL;
import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.jpackage.internal.StandardBundlerParam.RELEASE;
import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT;
import static mobanisto.jpackage.internal.OverridableResource.createResource;
import static mobanisto.jpackage.internal.StandardBundlerParam.ABOUT_URL;
import static mobanisto.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
import static mobanisto.jpackage.internal.StandardBundlerParam.VERSION;
import static mobanisto.jpackage.internal.StandardBundlerParam.RELEASE;
import static mobanisto.jpackage.internal.StandardBundlerParam.VENDOR;
import static mobanisto.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static mobanisto.jpackage.internal.StandardBundlerParam.COPYRIGHT;

public class LinuxDebBundler extends LinuxPackageBundler {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
import static jdk.jpackage.internal.OverridableResource.createResource;
import static mobanisto.jpackage.internal.OverridableResource.createResource;

/**
* Helper to install launchers as services using "systemd".
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.IOException;
import java.nio.file.InvalidPathException;
Expand All @@ -39,11 +39,11 @@
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Stream;
import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
import static mobanisto.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
import static mobanisto.jpackage.internal.StandardBundlerParam.VERSION;
import static mobanisto.jpackage.internal.StandardBundlerParam.VENDOR;
import static mobanisto.jpackage.internal.StandardBundlerParam.DESCRIPTION;
import static mobanisto.jpackage.internal.StandardBundlerParam.INSTALL_DIR;

abstract class LinuxPackageBundler extends AbstractBundler {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.IOException;
import java.nio.file.Path;
Expand All @@ -38,14 +38,14 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.jpackage.internal.StandardBundlerParam.RELEASE;
import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.jpackage.internal.StandardBundlerParam.ABOUT_URL;
import static mobanisto.jpackage.internal.StandardBundlerParam.APP_NAME;
import static mobanisto.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
import static mobanisto.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static mobanisto.jpackage.internal.StandardBundlerParam.VERSION;
import static mobanisto.jpackage.internal.StandardBundlerParam.RELEASE;
import static mobanisto.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
import static mobanisto.jpackage.internal.OverridableResource.createResource;
import static mobanisto.jpackage.internal.StandardBundlerParam.ABOUT_URL;

/**
* There are two command line options to configure license information for RPM
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.text.MessageFormat;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.math.BigInteger;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.IOException;
import java.text.MessageFormat;
import java.util.Map;
import java.util.Optional;
import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER;
import static jdk.jpackage.internal.StandardBundlerParam.APP_STORE;
import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS;
import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
import static mobanisto.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
import static mobanisto.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER;
import static mobanisto.jpackage.internal.StandardBundlerParam.APP_STORE;
import static mobanisto.jpackage.internal.StandardBundlerParam.MAIN_CLASS;
import static mobanisto.jpackage.internal.StandardBundlerParam.VERSION;
import static mobanisto.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;

public class MacAppBundler extends AppImageBundler {
public MacAppBundler() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -49,32 +49,32 @@
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
import static jdk.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX;
import static jdk.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY;
import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT;
import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE;
import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION;
import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS;
import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON;
import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
import static jdk.jpackage.internal.StandardBundlerParam.ICON;
import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS;
import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
import static jdk.jpackage.internal.StandardBundlerParam.APP_STORE;
import static jdk.jpackage.internal.StandardBundlerParam.getPredefinedAppImage;
import static jdk.jpackage.internal.StandardBundlerParam.hasPredefinedAppImage;
import static mobanisto.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX;
import static mobanisto.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY;
import static mobanisto.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
import static mobanisto.jpackage.internal.OverridableResource.createResource;
import static mobanisto.jpackage.internal.StandardBundlerParam.APP_NAME;
import static mobanisto.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
import static mobanisto.jpackage.internal.StandardBundlerParam.COPYRIGHT;
import static mobanisto.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE;
import static mobanisto.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION;
import static mobanisto.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS;
import static mobanisto.jpackage.internal.StandardBundlerParam.FA_ICON;
import static mobanisto.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
import static mobanisto.jpackage.internal.StandardBundlerParam.ICON;
import static mobanisto.jpackage.internal.StandardBundlerParam.MAIN_CLASS;
import static mobanisto.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
import static mobanisto.jpackage.internal.StandardBundlerParam.VERSION;
import static mobanisto.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
import static mobanisto.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
import static mobanisto.jpackage.internal.StandardBundlerParam.APP_STORE;
import static mobanisto.jpackage.internal.StandardBundlerParam.getPredefinedAppImage;
import static mobanisto.jpackage.internal.StandardBundlerParam.hasPredefinedAppImage;

public class MacAppImageBuilder extends AbstractAppImageBuilder {

private static final ResourceBundle I18N = ResourceBundle.getBundle(
"jdk.jpackage.internal.resources.MacResources");
"mobanisto.jpackage.internal.resources.MacResources");

private static final String TEMPLATE_BUNDLE_ICON = "JavaApp.icns";
private static final String OS_TYPE_CODE = "APPL";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand All @@ -38,12 +38,12 @@
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
import static mobanisto.jpackage.internal.StandardBundlerParam.APP_NAME;
import static mobanisto.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
import static mobanisto.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
import static mobanisto.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
import static mobanisto.jpackage.internal.StandardBundlerParam.VERSION;
import static mobanisto.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;

public abstract class MacBaseInstallerBundler extends AbstractBundler {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package jdk.jpackage.internal;
package mobanisto.jpackage.internal;

import java.io.BufferedReader;
import java.io.File;
Expand All @@ -38,21 +38,21 @@
import java.util.Map;
import java.util.Objects;
import java.util.ResourceBundle;
import static jdk.jpackage.internal.MacAppImageBuilder.ICON_ICNS;
import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
import static jdk.jpackage.internal.OverridableResource.createResource;
import static mobanisto.jpackage.internal.MacAppImageBuilder.ICON_ICNS;
import static mobanisto.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
import static mobanisto.jpackage.internal.OverridableResource.createResource;

import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE;
import static jdk.jpackage.internal.StandardBundlerParam.DMG_CONTENT;
import static mobanisto.jpackage.internal.StandardBundlerParam.APP_NAME;
import static mobanisto.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
import static mobanisto.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
import static mobanisto.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
import static mobanisto.jpackage.internal.StandardBundlerParam.VERBOSE;
import static mobanisto.jpackage.internal.StandardBundlerParam.DMG_CONTENT;

public class MacDmgBundler extends MacBaseInstallerBundler {

private static final ResourceBundle I18N = ResourceBundle.getBundle(
"jdk.jpackage.internal.resources.MacResources");
"mobanisto.jpackage.internal.resources.MacResources");

// Background image name in resources
static final String DEFAULT_BACKGROUND_IMAGE = "background_dmg.tiff";
Expand Down
Loading

0 comments on commit 975940f

Please sign in to comment.