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