src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
author herrick
Wed, 16 Oct 2019 09:57:23 -0400
branchJDK-8200758-branch
changeset 58647 2c43b89b1679
parent 58538 12c965587689
child 58670 6fb9e12d5595
permissions -rw-r--r--
8231862: Decouple DesktopIntegration and LinuxPackageBundler classes Submitted-by: asemenyuk Reviewed-by: aherrick, almatvee
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     1
/*
57106
ea870b9ce89a 8216492: Update copyright of all new jpackage fils to 2019
kcr
parents: 57096
diff changeset
     2
 * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     4
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    10
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    15
 * accompanied this code).
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    16
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    20
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    23
 * questions.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    24
 */
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    25
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    26
package jdk.jpackage.internal;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    27
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    28
import java.io.File;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    29
import java.io.FileInputStream;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    30
import java.io.IOException;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    31
import java.io.InputStream;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    32
import java.io.Writer;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    33
import java.math.BigInteger;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    34
import java.nio.file.Files;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    35
import java.nio.file.Path;
57096
d06bec27f8c9 8215903: modify behavior of retaining temporary output dir
herrick
parents: 57091
diff changeset
    36
import java.nio.file.StandardCopyOption;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    37
import java.nio.file.attribute.PosixFilePermission;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    38
import java.text.MessageFormat;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    39
import java.util.ArrayList;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    40
import java.util.Arrays;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    41
import java.util.EnumSet;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    42
import java.util.HashMap;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    43
import java.util.List;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    44
import java.util.Map;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    45
import java.util.Objects;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    46
import java.util.Optional;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    47
import java.util.ResourceBundle;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    48
import java.util.Set;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    49
import java.util.concurrent.atomic.AtomicReference;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    50
import java.util.function.Consumer;
58415
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
    51
import javax.xml.parsers.DocumentBuilder;
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
    52
import javax.xml.parsers.DocumentBuilderFactory;
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
    53
import javax.xml.xpath.XPath;
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
    54
import javax.xml.xpath.XPathConstants;
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
    55
import javax.xml.xpath.XPathFactory;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    56
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    57
import static jdk.jpackage.internal.StandardBundlerParam.*;
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    58
import static jdk.jpackage.internal.MacBaseInstallerBundler.*;
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    59
import static jdk.jpackage.internal.MacAppBundler.*;
58647
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
    60
import static jdk.jpackage.internal.OverridableResource.createResource;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    61
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    62
public class MacAppImageBuilder extends AbstractAppImageBuilder {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    63
57059
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
    64
    private static final ResourceBundle I18N = ResourceBundle.getBundle(
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
    65
            "jdk.jpackage.internal.resources.MacResources");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    66
57064
a7fdadf67a92 8214899: rename papplauncher and it's library and move src to appropriate places
herrick
parents: 57059
diff changeset
    67
    private static final String LIBRARY_NAME = "libapplauncher.dylib";
57908
9a005146bc1c 8230191: Replace javacup logo with duke everywhere in jpackage
herrick
parents: 57789
diff changeset
    68
    private static final String TEMPLATE_BUNDLE_ICON = "java.icns";
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    69
    private static final String OS_TYPE_CODE = "APPL";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    70
    private static final String TEMPLATE_INFO_PLIST_LITE =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    71
            "Info-lite.plist.template";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    72
    private static final String TEMPLATE_RUNTIME_INFO_PLIST =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    73
            "Runtime-Info.plist.template";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    74
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    75
    private final Path root;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    76
    private final Path contentsDir;
58455
0d95b41d0895 8231706: change "Java" dir to "app" dir in jpackage app image
herrick
parents: 58415
diff changeset
    77
    private final Path appDir;
57077
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
    78
    private final Path javaModsDir;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    79
    private final Path resourcesDir;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    80
    private final Path macOSDir;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    81
    private final Path runtimeDir;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    82
    private final Path runtimeRoot;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    83
    private final Path mdir;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    84
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    85
    private static List<String> keyChains;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    86
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    87
    public static final BundlerParamInfo<Boolean>
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    88
            MAC_CONFIGURE_LAUNCHER_IN_PLIST = new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    89
                    "mac.configure-launcher-in-plist",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    90
                    Boolean.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    91
                    params -> Boolean.FALSE,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    92
                    (s, p) -> Boolean.valueOf(s));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    93
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
    94
    public static final EnumeratedBundlerParam<String> MAC_CATEGORY =
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
    95
            new EnumeratedBundlerParam<>(
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
    96
                    Arguments.CLIOptions.MAC_APP_STORE_CATEGORY.getId(),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    97
                    String.class,
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
    98
                    params -> "Unknown",
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
    99
                    (s, p) -> s,
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   100
                    MacAppBundler.getMacCategories(),
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   101
                    false //strict - for MacStoreBundler this should be strict
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   102
            );
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   103
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   104
    public static final BundlerParamInfo<String> MAC_CF_BUNDLE_NAME =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   105
            new StandardBundlerParam<>(
57401
8a257decfe24 8223318: jpackage --mac-bundle-name option doesn't work
ssadetsky
parents: 57397
diff changeset
   106
                    Arguments.CLIOptions.MAC_BUNDLE_NAME.getId(),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   107
                    String.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   108
                    params -> null,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   109
                    (s, p) -> s);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   110
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   111
    public static final BundlerParamInfo<String> MAC_CF_BUNDLE_IDENTIFIER =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   112
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   113
                    Arguments.CLIOptions.MAC_BUNDLE_IDENTIFIER.getId(),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   114
                    String.class,
58415
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   115
                    params -> {
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   116
                        // Get identifier from app image if user provided
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   117
                        // app image and did not provide the identifier via CLI.
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   118
                        String identifier = extractBundleIdentifier(params);
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   119
                        if (identifier != null) {
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   120
                            return identifier;
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   121
                        }
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   122
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   123
                        return IDENTIFIER.fetchFrom(params);
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   124
                    },
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   125
                    (s, p) -> s);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   126
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   127
    public static final BundlerParamInfo<String> MAC_CF_BUNDLE_VERSION =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   128
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   129
                    "mac.CFBundleVersion",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   130
                    String.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   131
                    p -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   132
                        String s = VERSION.fetchFrom(p);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   133
                        if (validCFBundleVersion(s)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   134
                            return s;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   135
                        } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   136
                            return "100";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   137
                        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   138
                    },
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   139
                    (s, p) -> s);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   140
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   141
    public static final BundlerParamInfo<File> ICON_ICNS =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   142
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   143
            "icon.icns",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   144
            File.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   145
            params -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   146
                File f = ICON.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   147
                if (f != null && !f.getName().toLowerCase().endsWith(".icns")) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   148
                    Log.error(MessageFormat.format(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   149
                            I18N.getString("message.icon-not-icns"), f));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   150
                    return null;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   151
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   152
                return f;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   153
            },
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   154
            (s, p) -> new File(s));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   155
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   156
    public static final StandardBundlerParam<Boolean> SIGN_BUNDLE  =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   157
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   158
            Arguments.CLIOptions.MAC_SIGN.getId(),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   159
            Boolean.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   160
            params -> false,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   161
            // valueOf(null) is false, we actually do want null in some cases
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   162
            (s, p) -> (s == null || "null".equalsIgnoreCase(s)) ?
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   163
                    null : Boolean.valueOf(s)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   164
        );
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   165
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   166
    public MacAppImageBuilder(Map<String, Object> params, Path imageOutDir)
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   167
            throws IOException {
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   168
        super(params, imageOutDir.resolve(APP_NAME.fetchFrom(params)
57333
77109ab87402 8219683: Modify App Image layout on Mac
herrick
parents: 57323
diff changeset
   169
                + ".app/Contents/runtime/Contents/Home"));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   170
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   171
        Objects.requireNonNull(imageOutDir);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   172
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   173
        this.root = imageOutDir.resolve(APP_NAME.fetchFrom(params) + ".app");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   174
        this.contentsDir = root.resolve("Contents");
58455
0d95b41d0895 8231706: change "Java" dir to "app" dir in jpackage app image
herrick
parents: 58415
diff changeset
   175
        this.appDir = contentsDir.resolve("app");
0d95b41d0895 8231706: change "Java" dir to "app" dir in jpackage app image
herrick
parents: 58415
diff changeset
   176
        this.javaModsDir = appDir.resolve("mods");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   177
        this.resourcesDir = contentsDir.resolve("Resources");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   178
        this.macOSDir = contentsDir.resolve("MacOS");
57333
77109ab87402 8219683: Modify App Image layout on Mac
herrick
parents: 57323
diff changeset
   179
        this.runtimeDir = contentsDir.resolve("runtime");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   180
        this.runtimeRoot = runtimeDir.resolve("Contents/Home");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   181
        this.mdir = runtimeRoot.resolve("lib");
58455
0d95b41d0895 8231706: change "Java" dir to "app" dir in jpackage app image
herrick
parents: 58415
diff changeset
   182
        Files.createDirectories(appDir);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   183
        Files.createDirectories(resourcesDir);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   184
        Files.createDirectories(macOSDir);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   185
        Files.createDirectories(runtimeDir);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   186
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   187
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   188
    private void writeEntry(InputStream in, Path dstFile) throws IOException {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   189
        Files.createDirectories(dstFile.getParent());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   190
        Files.copy(in, dstFile);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   191
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   192
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   193
    public static boolean validCFBundleVersion(String v) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   194
        // CFBundleVersion (String - iOS, OS X) specifies the build version
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   195
        // number of the bundle, which identifies an iteration (released or
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   196
        // unreleased) of the bundle. The build version number should be a
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   197
        // string comprised of three non-negative, period-separated integers
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   198
        // with the first integer being greater than zero. The string should
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   199
        // only contain numeric (0-9) and period (.) characters. Leading zeros
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   200
        // are truncated from each integer and will be ignored (that is,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   201
        // 1.02.3 is equivalent to 1.2.3). This key is not localizable.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   202
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   203
        if (v == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   204
            return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   205
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   206
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   207
        String p[] = v.split("\\.");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   208
        if (p.length > 3 || p.length < 1) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   209
            Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   210
                    "message.version-string-too-many-components"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   211
            return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   212
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   213
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   214
        try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   215
            BigInteger n = new BigInteger(p[0]);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   216
            if (BigInteger.ONE.compareTo(n) > 0) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   217
                Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   218
                        "message.version-string-first-number-not-zero"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   219
                return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   220
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   221
            if (p.length > 1) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   222
                n = new BigInteger(p[1]);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   223
                if (BigInteger.ZERO.compareTo(n) > 0) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   224
                    Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   225
                            "message.version-string-no-negative-numbers"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   226
                    return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   227
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   228
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   229
            if (p.length > 2) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   230
                n = new BigInteger(p[2]);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   231
                if (BigInteger.ZERO.compareTo(n) > 0) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   232
                    Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   233
                            "message.version-string-no-negative-numbers"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   234
                    return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   235
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   236
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   237
        } catch (NumberFormatException ne) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   238
            Log.verbose(I18N.getString("message.version-string-numbers-only"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   239
            Log.verbose(ne);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   240
            return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   241
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   242
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   243
        return true;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   244
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   245
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   246
    @Override
57077
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
   247
    public Path getAppDir() {
58455
0d95b41d0895 8231706: change "Java" dir to "app" dir in jpackage app image
herrick
parents: 58415
diff changeset
   248
        return appDir;
57077
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
   249
    }
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
   250
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
   251
    @Override
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
   252
    public Path getAppModsDir() {
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
   253
        return javaModsDir;
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
   254
    }
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
   255
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
   256
    @Override
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   257
    public void prepareApplicationFiles(Map<String, ? super Object> params)
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   258
            throws IOException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   259
        Map<String, ? super Object> originalParams = new HashMap<>(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   260
        // Generate PkgInfo
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   261
        File pkgInfoFile = new File(contentsDir.toFile(), "PkgInfo");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   262
        pkgInfoFile.createNewFile();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   263
        writePkgInfo(pkgInfoFile);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   264
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   265
        Path executable = macOSDir.resolve(getLauncherName(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   266
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   267
        // create the main app launcher
57064
a7fdadf67a92 8214899: rename papplauncher and it's library and move src to appropriate places
herrick
parents: 57059
diff changeset
   268
        try (InputStream is_launcher =
a7fdadf67a92 8214899: rename papplauncher and it's library and move src to appropriate places
herrick
parents: 57059
diff changeset
   269
                getResourceAsStream("jpackageapplauncher");
a7fdadf67a92 8214899: rename papplauncher and it's library and move src to appropriate places
herrick
parents: 57059
diff changeset
   270
            InputStream is_lib = getResourceAsStream(LIBRARY_NAME)) {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   271
            // Copy executable and library to MacOS folder
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   272
            writeEntry(is_launcher, executable);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   273
            writeEntry(is_lib, macOSDir.resolve(LIBRARY_NAME));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   274
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   275
        executable.toFile().setExecutable(true, false);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   276
        // generate main app launcher config file
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   277
        File cfg = new File(root.toFile(), getLauncherCfgName(params));
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   278
        writeCfgFile(params, cfg);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   279
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   280
        // create additional app launcher(s) and config file(s)
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   281
        List<Map<String, ? super Object>> entryPoints =
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   282
                StandardBundlerParam.ADD_LAUNCHERS.fetchFrom(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   283
        for (Map<String, ? super Object> entryPoint : entryPoints) {
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57333
diff changeset
   284
            Map<String, ? super Object> tmp =
57259
a84c657c713d 8171959: add-launcher is not working when normal jar is used for first launcher and module is used for second launcher
herrick
parents: 57256
diff changeset
   285
                    AddLauncherArguments.merge(originalParams, entryPoint);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   286
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   287
            // add executable for add launcher
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   288
            Path addExecutable = macOSDir.resolve(getLauncherName(tmp));
57064
a7fdadf67a92 8214899: rename papplauncher and it's library and move src to appropriate places
herrick
parents: 57059
diff changeset
   289
            try (InputStream is = getResourceAsStream("jpackageapplauncher");) {
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   290
                writeEntry(is, addExecutable);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   291
            }
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   292
            addExecutable.toFile().setExecutable(true, false);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   293
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   294
            // add config file for add launcher
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   295
            cfg = new File(root.toFile(), getLauncherCfgName(tmp));
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   296
            writeCfgFile(tmp, cfg);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   297
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   298
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   299
        // Copy class path entries to Java folder
58455
0d95b41d0895 8231706: change "Java" dir to "app" dir in jpackage app image
herrick
parents: 58415
diff changeset
   300
        copyClassPathEntries(appDir, params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   301
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   302
        /*********** Take care of "config" files *******/
57096
d06bec27f8c9 8215903: modify behavior of retaining temporary output dir
herrick
parents: 57091
diff changeset
   303
58647
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   304
        createResource(TEMPLATE_BUNDLE_ICON, params)
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   305
                .setCategory("icon")
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   306
                .setExternal(ICON_ICNS.fetchFrom(params))
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   307
                .saveToFile(resourcesDir.resolve(APP_NAME.fetchFrom(params)
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   308
                        + ".icns"));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   309
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   310
        // copy file association icons
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   311
        for (Map<String, ?
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   312
                super Object> fa : FILE_ASSOCIATIONS.fetchFrom(params)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   313
            File f = FA_ICON.fetchFrom(fa);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   314
            if (f != null && f.exists()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   315
                try (InputStream in2 = new FileInputStream(f)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   316
                    Files.copy(in2, resourcesDir.resolve(f.getName()));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   317
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   318
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   319
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   320
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   321
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   322
        copyRuntimeFiles(params);
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   323
        sign(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   324
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   325
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   326
    @Override
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   327
    public void prepareJreFiles(Map<String, ? super Object> params)
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   328
            throws IOException {
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   329
        copyRuntimeFiles(params);
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   330
        sign(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   331
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   332
57687
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   333
    @Override
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   334
    File getRuntimeImageDir(File runtimeImageTop) {
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   335
        File home = new File(runtimeImageTop, "Contents/Home");
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   336
        return (home.exists() ? home : runtimeImageTop);
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   337
    }
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   338
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   339
    private void copyRuntimeFiles(Map<String, ? super Object> params)
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   340
            throws IOException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   341
        // Generate Info.plist
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   342
        writeInfoPlist(contentsDir.resolve("Info.plist").toFile(), params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   343
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   344
        // generate java runtime info.plist
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   345
        writeRuntimeInfoPlist(
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   346
                runtimeDir.resolve("Contents/Info.plist").toFile(), params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   347
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   348
        // copy library
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   349
        Path runtimeMacOSDir = Files.createDirectories(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   350
                runtimeDir.resolve("Contents/MacOS"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   351
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   352
        // JDK 9, 10, and 11 have extra '/jli/' subdir
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   353
        Path jli = runtimeRoot.resolve("lib/libjli.dylib");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   354
        if (!Files.exists(jli)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   355
            jli = runtimeRoot.resolve("lib/jli/libjli.dylib");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   356
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   357
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   358
        Files.copy(jli, runtimeMacOSDir.resolve("libjli.dylib"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   359
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   360
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   361
    private void sign(Map<String, ? super Object> params) throws IOException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   362
        if (Optional.ofNullable(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   363
                SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.TRUE)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   364
            try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   365
                addNewKeychain(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   366
            } catch (InterruptedException e) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   367
                Log.error(e.getMessage());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   368
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   369
            String signingIdentity =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   370
                    DEVELOPER_ID_APP_SIGNING_KEY.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   371
            if (signingIdentity != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   372
                signAppBundle(params, root, signingIdentity,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   373
                        BUNDLE_ID_SIGNING_PREFIX.fetchFrom(params), null, null);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   374
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   375
            restoreKeychainList(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   376
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   377
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   378
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   379
    private String getLauncherName(Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   380
        if (APP_NAME.fetchFrom(params) != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   381
            return APP_NAME.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   382
        } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   383
            return MAIN_CLASS.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   384
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   385
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   386
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57392
diff changeset
   387
    public static String getLauncherCfgName(
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57392
diff changeset
   388
            Map<String, ? super Object> params) {
58455
0d95b41d0895 8231706: change "Java" dir to "app" dir in jpackage app image
herrick
parents: 58415
diff changeset
   389
        return "Contents/app/" + APP_NAME.fetchFrom(params) + ".cfg";
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   390
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   391
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   392
    private void copyClassPathEntries(Path javaDirectory,
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   393
            Map<String, ? super Object> params) throws IOException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   394
        List<RelativeFileSet> resourcesList =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   395
                APP_RESOURCES_LIST.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   396
        if (resourcesList == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   397
            throw new RuntimeException(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   398
                    I18N.getString("message.null-classpath"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   399
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   400
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   401
        for (RelativeFileSet classPath : resourcesList) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   402
            File srcdir = classPath.getBaseDirectory();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   403
            for (String fname : classPath.getIncludedFiles()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   404
                copyEntry(javaDirectory, srcdir, fname);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   405
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   406
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   407
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   408
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   409
    private String getBundleName(Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   410
        if (MAC_CF_BUNDLE_NAME.fetchFrom(params) != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   411
            String bn = MAC_CF_BUNDLE_NAME.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   412
            if (bn.length() > 16) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   413
                Log.error(MessageFormat.format(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   414
                        "message.bundle-name-too-long-warning"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   415
                        MAC_CF_BUNDLE_NAME.getID(), bn));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   416
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   417
            return MAC_CF_BUNDLE_NAME.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   418
        } else if (APP_NAME.fetchFrom(params) != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   419
            return APP_NAME.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   420
        } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   421
            String nm = MAIN_CLASS.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   422
            if (nm.length() > 16) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   423
                nm = nm.substring(0, 16);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   424
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   425
            return nm;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   426
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   427
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   428
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   429
    private void writeRuntimeInfoPlist(File file,
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   430
            Map<String, ? super Object> params) throws IOException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   431
        Map<String, String> data = new HashMap<>();
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   432
        String identifier = StandardBundlerParam.isRuntimeInstaller(params) ?
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   433
                MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params) :
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   434
                "com.oracle.java." + MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   435
        data.put("CF_BUNDLE_IDENTIFIER", identifier);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57150
diff changeset
   436
        String name = StandardBundlerParam.isRuntimeInstaller(params) ?
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   437
                getBundleName(params): "Java Runtime Image";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   438
        data.put("CF_BUNDLE_NAME", name);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   439
        data.put("CF_BUNDLE_VERSION", VERSION.fetchFrom(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   440
        data.put("CF_BUNDLE_SHORT_VERSION_STRING", VERSION.fetchFrom(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   441
58647
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   442
        createResource(TEMPLATE_RUNTIME_INFO_PLIST, params)
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   443
                .setPublicName("Runtime-Info.plist")
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   444
                .setCategory(I18N.getString("resource.runtime-info-plist"))
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   445
                .setSubstitutionData(data)
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   446
                .saveToFile(file);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   447
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   448
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   449
    private void writeInfoPlist(File file, Map<String, ? super Object> params)
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57776
diff changeset
   450
            throws IOException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   451
        Log.verbose(MessageFormat.format(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   452
                "message.preparing-info-plist"), file.getAbsolutePath()));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   453
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   454
        //prepare config for exe
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   455
        //Note: do not need CFBundleDisplayName if we don't support localization
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   456
        Map<String, String> data = new HashMap<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   457
        data.put("DEPLOY_ICON_FILE", APP_NAME.fetchFrom(params) + ".icns");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   458
        data.put("DEPLOY_BUNDLE_IDENTIFIER",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   459
                MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   460
        data.put("DEPLOY_BUNDLE_NAME",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   461
                getBundleName(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   462
        data.put("DEPLOY_BUNDLE_COPYRIGHT",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   463
                COPYRIGHT.fetchFrom(params) != null ?
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   464
                COPYRIGHT.fetchFrom(params) : "Unknown");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   465
        data.put("DEPLOY_LAUNCHER_NAME", getLauncherName(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   466
        data.put("DEPLOY_BUNDLE_SHORT_VERSION",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   467
                VERSION.fetchFrom(params) != null ?
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   468
                VERSION.fetchFrom(params) : "1.0.0");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   469
        data.put("DEPLOY_BUNDLE_CFBUNDLE_VERSION",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   470
                MAC_CF_BUNDLE_VERSION.fetchFrom(params) != null ?
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   471
                MAC_CF_BUNDLE_VERSION.fetchFrom(params) : "100");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   472
        data.put("DEPLOY_BUNDLE_CATEGORY", MAC_CATEGORY.fetchFrom(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   473
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   474
        boolean hasMainJar = MAIN_JAR.fetchFrom(params) != null;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   475
        boolean hasMainModule =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   476
                StandardBundlerParam.MODULE.fetchFrom(params) != null;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   477
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   478
        if (hasMainJar) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   479
            data.put("DEPLOY_MAIN_JAR_NAME", MAIN_JAR.fetchFrom(params).
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   480
                    getIncludedFiles().iterator().next());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   481
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   482
        else if (hasMainModule) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   483
            data.put("DEPLOY_MODULE_NAME",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   484
                    StandardBundlerParam.MODULE.fetchFrom(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   485
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   486
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   487
        StringBuilder sb = new StringBuilder();
57316
2891b3ae222d 8221641: Follow up code clean up for JDK-8221582
herrick
parents: 57259
diff changeset
   488
        List<String> jvmOptions = JAVA_OPTIONS.fetchFrom(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   489
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   490
        String newline = ""; //So we don't add extra line after last append
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   491
        for (String o : jvmOptions) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   492
            sb.append(newline).append(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   493
                    "    <string>").append(o).append("</string>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   494
            newline = "\n";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   495
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   496
57316
2891b3ae222d 8221641: Follow up code clean up for JDK-8221582
herrick
parents: 57259
diff changeset
   497
        data.put("DEPLOY_JAVA_OPTIONS", sb.toString());
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   498
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   499
        sb = new StringBuilder();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   500
        List<String> args = ARGUMENTS.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   501
        newline = "";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   502
        // So we don't add unneccessary extra line after last append
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   503
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   504
        for (String o : args) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   505
            sb.append(newline).append("    <string>").append(o).append(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   506
                    "</string>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   507
            newline = "\n";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   508
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   509
        data.put("DEPLOY_ARGUMENTS", sb.toString());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   510
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   511
        newline = "";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   512
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   513
        data.put("DEPLOY_LAUNCHER_CLASS", MAIN_CLASS.fetchFrom(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   514
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   515
        data.put("DEPLOY_APP_CLASSPATH",
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   516
                  getCfgClassPath(CLASSPATH.fetchFrom(params)));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   517
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   518
        StringBuilder bundleDocumentTypes = new StringBuilder();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   519
        StringBuilder exportedTypes = new StringBuilder();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   520
        for (Map<String, ? super Object>
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   521
                fileAssociation : FILE_ASSOCIATIONS.fetchFrom(params)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   522
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   523
            List<String> extensions = FA_EXTENSIONS.fetchFrom(fileAssociation);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   524
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   525
            if (extensions == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   526
                Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   527
                        "message.creating-association-with-null-extension"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   528
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   529
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   530
            List<String> mimeTypes = FA_CONTENT_TYPE.fetchFrom(fileAssociation);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   531
            String itemContentType = MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   532
                    + "." + ((extensions == null || extensions.isEmpty())
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   533
                    ? "mime" : extensions.get(0));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   534
            String description = FA_DESCRIPTION.fetchFrom(fileAssociation);
57397
89549ecec1c7 8223212: Code cleanup found during jpackage review
herrick
parents: 57396
diff changeset
   535
            File icon = FA_ICON.fetchFrom(fileAssociation);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   536
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   537
            bundleDocumentTypes.append("    <dict>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   538
                    .append("      <key>LSItemContentTypes</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   539
                    .append("      <array>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   540
                    .append("        <string>")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   541
                    .append(itemContentType)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   542
                    .append("</string>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   543
                    .append("      </array>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   544
                    .append("\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   545
                    .append("      <key>CFBundleTypeName</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   546
                    .append("      <string>")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   547
                    .append(description)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   548
                    .append("</string>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   549
                    .append("\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   550
                    .append("      <key>LSHandlerRank</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   551
                    .append("      <string>Owner</string>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   552
                            // TODO make a bundler arg
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   553
                    .append("\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   554
                    .append("      <key>CFBundleTypeRole</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   555
                    .append("      <string>Editor</string>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   556
                            // TODO make a bundler arg
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   557
                    .append("\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   558
                    .append("      <key>LSIsAppleDefaultForType</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   559
                    .append("      <true/>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   560
                            // TODO make a bundler arg
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   561
                    .append("\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   562
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   563
            if (icon != null && icon.exists()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   564
                bundleDocumentTypes
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   565
                        .append("      <key>CFBundleTypeIconFile</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   566
                        .append("      <string>")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   567
                        .append(icon.getName())
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   568
                        .append("</string>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   569
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   570
            bundleDocumentTypes.append("    </dict>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   571
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   572
            exportedTypes.append("    <dict>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   573
                    .append("      <key>UTTypeIdentifier</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   574
                    .append("      <string>")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   575
                    .append(itemContentType)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   576
                    .append("</string>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   577
                    .append("\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   578
                    .append("      <key>UTTypeDescription</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   579
                    .append("      <string>")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   580
                    .append(description)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   581
                    .append("</string>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   582
                    .append("      <key>UTTypeConformsTo</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   583
                    .append("      <array>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   584
                    .append("          <string>public.data</string>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   585
                            //TODO expose this?
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   586
                    .append("      </array>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   587
                    .append("\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   588
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   589
            if (icon != null && icon.exists()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   590
                exportedTypes.append("      <key>UTTypeIconFile</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   591
                        .append("      <string>")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   592
                        .append(icon.getName())
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   593
                        .append("</string>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   594
                        .append("\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   595
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   596
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   597
            exportedTypes.append("\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   598
                    .append("      <key>UTTypeTagSpecification</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   599
                    .append("      <dict>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   600
                            // TODO expose via param? .append(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   601
                            // "        <key>com.apple.ostype</key>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   602
                            // TODO expose via param? .append(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   603
                            // "        <string>ABCD</string>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   604
                    .append("\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   605
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   606
            if (extensions != null && !extensions.isEmpty()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   607
                exportedTypes.append(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   608
                        "        <key>public.filename-extension</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   609
                        .append("        <array>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   610
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   611
                for (String ext : extensions) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   612
                    exportedTypes.append("          <string>")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   613
                            .append(ext)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   614
                            .append("</string>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   615
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   616
                exportedTypes.append("        </array>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   617
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   618
            if (mimeTypes != null && !mimeTypes.isEmpty()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   619
                exportedTypes.append("        <key>public.mime-type</key>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   620
                        .append("        <array>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   621
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   622
                for (String mime : mimeTypes) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   623
                    exportedTypes.append("          <string>")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   624
                            .append(mime)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   625
                            .append("</string>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   626
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   627
                exportedTypes.append("        </array>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   628
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   629
            exportedTypes.append("      </dict>\n")
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   630
                    .append("    </dict>\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   631
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   632
        String associationData;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   633
        if (bundleDocumentTypes.length() > 0) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   634
            associationData =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   635
                    "\n  <key>CFBundleDocumentTypes</key>\n  <array>\n"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   636
                    + bundleDocumentTypes.toString()
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   637
                    + "  </array>\n\n"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   638
                    + "  <key>UTExportedTypeDeclarations</key>\n  <array>\n"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   639
                    + exportedTypes.toString()
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   640
                    + "  </array>\n";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   641
        } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   642
            associationData = "";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   643
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   644
        data.put("DEPLOY_FILE_ASSOCIATIONS", associationData);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   645
58647
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   646
        createResource(TEMPLATE_INFO_PLIST_LITE, params)
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   647
                .setCategory(I18N.getString("resource.app-info-plist"))
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   648
                .setSubstitutionData(data)
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   649
                .setPublicName("Info.plist")
2c43b89b1679 8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents: 58538
diff changeset
   650
                .saveToFile(file);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   651
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   652
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   653
    private void writePkgInfo(File file) throws IOException {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   654
        //hardcoded as it does not seem we need to change it ever
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   655
        String signature = "????";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   656
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57348
diff changeset
   657
        try (Writer out = Files.newBufferedWriter(file.toPath())) {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   658
            out.write(OS_TYPE_CODE + signature);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   659
            out.flush();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   660
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   661
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   662
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   663
    public static void addNewKeychain(Map<String, ? super Object> params)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   664
                                    throws IOException, InterruptedException {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   665
        if (Platform.getMajorVersion() < 10 ||
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   666
                (Platform.getMajorVersion() == 10 &&
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   667
                Platform.getMinorVersion() < 12)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   668
            // we need this for OS X 10.12+
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   669
            return;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   670
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   671
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   672
        String keyChain = SIGNING_KEYCHAIN.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   673
        if (keyChain == null || keyChain.isEmpty()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   674
            return;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   675
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   676
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   677
        // get current keychain list
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   678
        String keyChainPath = new File (keyChain).getAbsolutePath().toString();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   679
        List<String> keychainList = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   680
        int ret = IOUtils.getProcessOutput(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   681
                keychainList, "security", "list-keychains");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   682
        if (ret != 0) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   683
            Log.error(I18N.getString("message.keychain.error"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   684
            return;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   685
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   686
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   687
        boolean contains = keychainList.stream().anyMatch(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   688
                    str -> str.trim().equals("\""+keyChainPath.trim()+"\""));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   689
        if (contains) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   690
            // keychain is already added in the search list
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   691
            return;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   692
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   693
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   694
        keyChains = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   695
        // remove "
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   696
        keychainList.forEach((String s) -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   697
            String path = s.trim();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   698
            if (path.startsWith("\"") && path.endsWith("\"")) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   699
                path = path.substring(1, path.length()-1);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   700
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   701
            keyChains.add(path);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   702
        });
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   703
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   704
        List<String> args = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   705
        args.add("security");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   706
        args.add("list-keychains");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   707
        args.add("-s");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   708
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   709
        args.addAll(keyChains);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   710
        args.add(keyChain);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   711
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   712
        ProcessBuilder  pb = new ProcessBuilder(args);
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   713
        IOUtils.exec(pb);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   714
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   715
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   716
    public static void restoreKeychainList(Map<String, ? super Object> params)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   717
            throws IOException{
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   718
        if (Platform.getMajorVersion() < 10 ||
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   719
                (Platform.getMajorVersion() == 10 &&
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   720
                Platform.getMinorVersion() < 12)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   721
            // we need this for OS X 10.12+
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   722
            return;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   723
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   724
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   725
        if (keyChains == null || keyChains.isEmpty()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   726
            return;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   727
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   728
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   729
        List<String> args = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   730
        args.add("security");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   731
        args.add("list-keychains");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   732
        args.add("-s");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   733
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   734
        args.addAll(keyChains);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   735
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   736
        ProcessBuilder  pb = new ProcessBuilder(args);
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   737
        IOUtils.exec(pb);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   738
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   739
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   740
    public static void signAppBundle(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   741
            Map<String, ? super Object> params, Path appLocation,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   742
            String signingIdentity, String identifierPrefix,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   743
            String entitlementsFile, String inheritedEntitlements)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   744
            throws IOException {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   745
        AtomicReference<IOException> toThrow = new AtomicReference<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   746
        String appExecutable = "/Contents/MacOS/" + APP_NAME.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   747
        String keyChain = SIGNING_KEYCHAIN.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   748
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   749
        // sign all dylibs and jars
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   750
        Files.walk(appLocation).peek(path -> { // fix permissions
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   751
                    try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   752
                        Set<PosixFilePermission> pfp =
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   753
                                Files.getPosixFilePermissions(path);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   754
                        if (!pfp.contains(PosixFilePermission.OWNER_WRITE)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   755
                            pfp = EnumSet.copyOf(pfp);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   756
                            pfp.add(PosixFilePermission.OWNER_WRITE);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   757
                            Files.setPosixFilePermissions(path, pfp);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   758
                        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   759
                    } catch (IOException e) {
57776
783db59cd8d3 8224594: Simplify jpackage Logging
herrick
parents: 57687
diff changeset
   760
                        Log.verbose(e);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   761
                    }
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   762
                }).filter(p -> Files.isRegularFile(p)
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   763
                          && !(p.toString().contains("/Contents/MacOS/libjli.dylib")
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   764
                          || p.toString().endsWith(appExecutable)
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   765
                          || p.toString().contains("/Contents/runtime")
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   766
                          || p.toString().contains("/Contents/Frameworks"))).forEach(p -> {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   767
                    //noinspection ThrowableResultOfMethodCallIgnored
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   768
                    if (toThrow.get() != null) return;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   769
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   770
                    // If p is a symlink then skip the signing process.
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   771
                    if (Files.isSymbolicLink(p)) {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   772
                        if (VERBOSE.fetchFrom(params)) {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   773
                            Log.verbose(MessageFormat.format(I18N.getString(
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   774
                                    "message.ignoring.symlink"), p.toString()));
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   775
                        }
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   776
                    } else {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   777
                        if (p.toString().endsWith(LIBRARY_NAME)) {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   778
                            if (isFileSigned(p)) {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   779
                                return;
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   780
                            }
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   781
                        }
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   782
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   783
                        List<String> args = new ArrayList<>();
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   784
                        args.addAll(Arrays.asList("codesign",
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   785
                                "-s", signingIdentity, // sign with this key
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   786
                                "--prefix", identifierPrefix,
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   787
                                // use the identifier as a prefix
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   788
                                "-vvvv"));
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   789
                        if (entitlementsFile != null &&
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   790
                                (p.toString().endsWith(".jar")
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   791
                                || p.toString().endsWith(".dylib"))) {
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   792
                            args.add("--entitlements");
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   793
                            args.add(entitlementsFile); // entitlements
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   794
                        } else if (inheritedEntitlements != null &&
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   795
                                Files.isExecutable(p)) {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   796
                            args.add("--entitlements");
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   797
                            args.add(inheritedEntitlements);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   798
                            // inherited entitlements for executable processes
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   799
                        }
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   800
                        if (keyChain != null && !keyChain.isEmpty()) {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   801
                            args.add("--keychain");
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   802
                            args.add(keyChain);
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   803
                        }
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   804
                        args.add(p.toString());
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   805
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   806
                        try {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   807
                            Set<PosixFilePermission> oldPermissions =
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   808
                                    Files.getPosixFilePermissions(p);
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   809
                            File f = p.toFile();
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   810
                            f.setWritable(true, true);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   811
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   812
                            ProcessBuilder pb = new ProcessBuilder(args);
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   813
                            IOUtils.exec(pb);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   814
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   815
                            Files.setPosixFilePermissions(p, oldPermissions);
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   816
                        } catch (IOException ioe) {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   817
                            toThrow.set(ioe);
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   818
                        }
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   819
                    }
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   820
                });
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   821
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   822
        IOException ioe = toThrow.get();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   823
        if (ioe != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   824
            throw ioe;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   825
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   826
57333
77109ab87402 8219683: Modify App Image layout on Mac
herrick
parents: 57323
diff changeset
   827
        // sign all runtime and frameworks
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   828
        Consumer<? super Path> signIdentifiedByPList = path -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   829
            //noinspection ThrowableResultOfMethodCallIgnored
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   830
            if (toThrow.get() != null) return;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   831
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   832
            try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   833
                List<String> args = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   834
                args.addAll(Arrays.asList("codesign",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   835
                        "-s", signingIdentity, // sign with this key
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   836
                        "--prefix", identifierPrefix,
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   837
                        // use the identifier as a prefix
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   838
                        "-vvvv"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   839
                if (keyChain != null && !keyChain.isEmpty()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   840
                    args.add("--keychain");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   841
                    args.add(keyChain);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   842
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   843
                args.add(path.toString());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   844
                ProcessBuilder pb = new ProcessBuilder(args);
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   845
                IOUtils.exec(pb);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   846
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   847
                args = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   848
                args.addAll(Arrays.asList("codesign",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   849
                        "-s", signingIdentity, // sign with this key
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   850
                        "--prefix", identifierPrefix,
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   851
                        // use the identifier as a prefix
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   852
                        "-vvvv"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   853
                if (keyChain != null && !keyChain.isEmpty()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   854
                    args.add("--keychain");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   855
                    args.add(keyChain);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   856
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   857
                args.add(path.toString()
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   858
                        + "/Contents/_CodeSignature/CodeResources");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   859
                pb = new ProcessBuilder(args);
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   860
                IOUtils.exec(pb);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   861
            } catch (IOException e) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   862
                toThrow.set(e);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   863
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   864
        };
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   865
57333
77109ab87402 8219683: Modify App Image layout on Mac
herrick
parents: 57323
diff changeset
   866
        Path javaPath = appLocation.resolve("Contents/runtime");
77109ab87402 8219683: Modify App Image layout on Mac
herrick
parents: 57323
diff changeset
   867
        if (Files.isDirectory(javaPath)) {
57402
cd7287fc6f85 8223038: JPackage code signing fails on Mac.
ssadetsky
parents: 57401
diff changeset
   868
            signIdentifiedByPList.accept(javaPath);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   869
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   870
            ioe = toThrow.get();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   871
            if (ioe != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   872
                throw ioe;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   873
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   874
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   875
        Path frameworkPath = appLocation.resolve("Contents/Frameworks");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   876
        if (Files.isDirectory(frameworkPath)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   877
            Files.list(frameworkPath)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   878
                    .forEach(signIdentifiedByPList);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   879
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   880
            ioe = toThrow.get();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   881
            if (ioe != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   882
                throw ioe;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   883
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   884
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   885
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   886
        // sign the app itself
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   887
        List<String> args = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   888
        args.addAll(Arrays.asList("codesign",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   889
                "-s", signingIdentity, // sign with this key
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   890
                "-vvvv")); // super verbose output
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   891
        if (entitlementsFile != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   892
            args.add("--entitlements");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   893
            args.add(entitlementsFile); // entitlements
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   894
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   895
        if (keyChain != null && !keyChain.isEmpty()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   896
            args.add("--keychain");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   897
            args.add(keyChain);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   898
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   899
        args.add(appLocation.toString());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   900
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   901
        ProcessBuilder pb =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   902
                new ProcessBuilder(args.toArray(new String[args.size()]));
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   903
        IOUtils.exec(pb);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   904
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   905
58172
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   906
    private static boolean isFileSigned(Path file) {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   907
        ProcessBuilder pb =
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   908
                new ProcessBuilder("codesign", "--verify", file.toString());
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   909
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   910
        try {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   911
            IOUtils.exec(pb);
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   912
        } catch (IOException ex) {
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   913
            return false;
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   914
        }
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   915
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   916
        return true;
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   917
    }
bf06a1d3aef6 8230629: jpackage signing on macOS does not work as expected
herrick
parents: 57908
diff changeset
   918
58415
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   919
    private static String extractBundleIdentifier(Map<String, Object> params) {
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   920
        if (PREDEFINED_APP_IMAGE.fetchFrom(params) == null) {
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   921
            return null;
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   922
        }
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   923
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   924
        try {
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   925
            File infoPList = new File(PREDEFINED_APP_IMAGE.fetchFrom(params) +
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   926
                                      File.separator + "Contents" +
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   927
                                      File.separator + "Info.plist");
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   928
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   929
            DocumentBuilderFactory dbf
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   930
                    = DocumentBuilderFactory.newDefaultInstance();
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   931
            dbf.setFeature("http://apache.org/xml/features/" +
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   932
                           "nonvalidating/load-external-dtd", false);
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   933
            DocumentBuilder b = dbf.newDocumentBuilder();
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   934
            org.w3c.dom.Document doc = b.parse(new FileInputStream(
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   935
                    infoPList.getAbsolutePath()));
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   936
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   937
            XPath xPath = XPathFactory.newInstance().newXPath();
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   938
            // Query for the value of <string> element preceding <key>
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   939
            // element with value equal to CFBundleIdentifier
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   940
            String v = (String) xPath.evaluate(
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   941
                    "//string[preceding-sibling::key = \"CFBundleIdentifier\"][1]",
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   942
                    doc, XPathConstants.STRING);
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   943
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   944
            if (v != null && !v.isEmpty()) {
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   945
                return v;
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   946
            }
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   947
        } catch (Exception ex) {
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   948
            Log.verbose(ex);
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   949
        }
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   950
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   951
        return null;
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   952
    }
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58302
diff changeset
   953
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   954
}