src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
author herrick
Mon, 14 Oct 2019 14:36:45 -0400
branchJDK-8200758-branch
changeset 58584 910b14f4fe3a
parent 58582 558a0842c5aa
child 58647 2c43b89b1679
permissions -rw-r--r--
8232042: [macos] Installation fails if application name contains spaces Submitted-by: almatvee Reviewed-by: aherrick, asemenyuk
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) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     4
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    10
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    15
 * accompanied this code).
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    16
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    20
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    23
 * questions.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    24
 */
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    25
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    26
package jdk.jpackage.internal;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    27
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    28
import java.io.File;
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
    29
import java.io.FileOutputStream;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    30
import java.io.IOException;
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
    31
import java.io.OutputStreamWriter;
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
    32
import java.io.PrintWriter;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    33
import java.io.Writer;
58584
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
    34
import java.net.URI;
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
    35
import java.net.URISyntaxException;
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
    36
import java.nio.file.Files;
57331
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
    37
import java.nio.file.Path;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    38
import java.text.MessageFormat;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    39
import java.util.ArrayList;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    40
import java.util.HashMap;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    41
import java.util.List;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    42
import java.util.Map;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    43
import java.util.Optional;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    44
import java.util.ResourceBundle;
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
    45
import javax.xml.stream.XMLOutputFactory;
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
    46
import javax.xml.stream.XMLStreamException;
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
    47
import javax.xml.stream.XMLStreamWriter;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    48
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    49
import static jdk.jpackage.internal.StandardBundlerParam.*;
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    50
import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    51
import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER;
58415
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58114
diff changeset
    52
import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    53
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    54
public class MacPkgBundler extends MacBaseInstallerBundler {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    55
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    56
    private static final ResourceBundle I18N = ResourceBundle.getBundle(
57059
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
    57
            "jdk.jpackage.internal.resources.MacResources");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    58
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
    59
    private static final String DEFAULT_BACKGROUND_IMAGE = "background_pkg.png";
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    60
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    61
    private static final String TEMPLATE_PREINSTALL_SCRIPT =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    62
            "preinstall.template";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    63
    private static final String TEMPLATE_POSTINSTALL_SCRIPT =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    64
            "postinstall.template";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    65
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    66
    private static final BundlerParamInfo<File> PACKAGES_ROOT =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    67
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    68
            "mac.pkg.packagesRoot",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    69
            File.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    70
            params -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    71
                File packagesRoot =
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57217
diff changeset
    72
                        new File(TEMP_ROOT.fetchFrom(params), "packages");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    73
                packagesRoot.mkdirs();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    74
                return packagesRoot;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    75
            },
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    76
            (s, p) -> new File(s));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    77
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    78
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    79
    protected final BundlerParamInfo<File> SCRIPTS_DIR =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    80
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    81
            "mac.pkg.scriptsDir",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    82
            File.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    83
            params -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    84
                File scriptsDir =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    85
                        new File(CONFIG_ROOT.fetchFrom(params), "scripts");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    86
                scriptsDir.mkdirs();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    87
                return scriptsDir;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    88
            },
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    89
            (s, p) -> new File(s));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    90
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    91
    public static final
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    92
            BundlerParamInfo<String> DEVELOPER_ID_INSTALLER_SIGNING_KEY =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    93
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    94
            "mac.signing-key-developer-id-installer",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    95
            String.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    96
            params -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    97
                    String result = MacBaseInstallerBundler.findKey(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    98
                            "Developer ID Installer: "
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    99
                            + SIGNING_KEY_USER.fetchFrom(params),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   100
                            SIGNING_KEYCHAIN.fetchFrom(params),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   101
                            VERBOSE.fetchFrom(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   102
                    if (result != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   103
                        MacCertificate certificate = new MacCertificate(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   104
                                result, VERBOSE.fetchFrom(params));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   105
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   106
                        if (!certificate.isValid()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   107
                            Log.error(MessageFormat.format(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   108
                                    I18N.getString("error.certificate.expired"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   109
                                    result));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   110
                        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   111
                    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   112
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   113
                    return result;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   114
                },
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   115
            (s, p) -> s);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   116
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   117
    public static final BundlerParamInfo<String> MAC_INSTALL_DIR =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   118
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   119
            "mac-install-dir",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   120
            String.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   121
             params -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   122
                 String dir = INSTALL_DIR.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   123
                 return (dir != null) ? dir : "/Applications";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   124
             },
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   125
            (s, p) -> s
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   126
    );
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   127
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   128
    public static final BundlerParamInfo<String> INSTALLER_SUFFIX =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   129
            new StandardBundlerParam<> (
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   130
            "mac.pkg.installerName.suffix",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   131
            String.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   132
            params -> "",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   133
            (s, p) -> s);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   134
57140
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   135
    public File bundle(Map<String, ? super Object> params,
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   136
            File outdir) throws PackagerException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   137
        Log.verbose(MessageFormat.format(I18N.getString("message.building-pkg"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   138
                APP_NAME.fetchFrom(params)));
57407
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57397
diff changeset
   139
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57397
diff changeset
   140
        IOUtils.writableOutputDir(outdir.toPath());
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   141
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   142
        try {
57554
cb6733b3ed62 JDK-8227312: Remove pkg bundle from DMG image.
herrick
parents: 57529
diff changeset
   143
            File appImageDir = prepareAppBundle(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   144
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   145
            if (appImageDir != null && prepareConfigFiles(params)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   146
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   147
                File configScript = getConfig_Script(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   148
                if (configScript.exists()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   149
                    Log.verbose(MessageFormat.format(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   150
                            "message.running-script"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   151
                            configScript.getAbsolutePath()));
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   152
                    IOUtils.run("bash", configScript);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   153
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   154
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   155
                return createPKG(params, outdir, appImageDir);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   156
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   157
            return null;
58584
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   158
        } catch (IOException|URISyntaxException ex) {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   159
            Log.verbose(ex);
57140
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   160
            throw new PackagerException(ex);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   161
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   162
    }
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
    private File getPackages_AppPackage(Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   165
        return new File(PACKAGES_ROOT.fetchFrom(params),
57119
b3dda8d77d8a 8217331: Problems when space in application name
herrick
parents: 57106
diff changeset
   166
                APP_NAME.fetchFrom(params) + "-app.pkg");
57038
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
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   169
    private File getConfig_DistributionXMLFile(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   170
            Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   171
        return new File(CONFIG_ROOT.fetchFrom(params), "distribution.dist");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   172
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   173
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   174
    private File getConfig_BackgroundImage(Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   175
        return new File(CONFIG_ROOT.fetchFrom(params),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   176
                APP_NAME.fetchFrom(params) + "-background.png");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   177
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   178
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   179
    private File getConfig_BackgroundImageDarkAqua(Map<String, ? super Object> params) {
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   180
        return new File(CONFIG_ROOT.fetchFrom(params),
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   181
                APP_NAME.fetchFrom(params) + "-background-darkAqua.png");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   182
    }
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   183
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   184
    private File getScripts_PreinstallFile(Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   185
        return new File(SCRIPTS_DIR.fetchFrom(params), "preinstall");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   186
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   187
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   188
    private File getScripts_PostinstallFile(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   189
            Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   190
        return new File(SCRIPTS_DIR.fetchFrom(params), "postinstall");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   191
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   192
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   193
    private String getAppIdentifier(Map<String, ? super Object> params) {
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   194
        return MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   195
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   196
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   197
    private void preparePackageScripts(Map<String, ? super Object> params)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   198
            throws IOException {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   199
        Log.verbose(I18N.getString("message.preparing-scripts"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   200
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   201
        Map<String, String> data = new HashMap<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   202
58581
657e25d9e4e4 8231858:[macos] App does not run if installed with pkg
herrick
parents: 58415
diff changeset
   203
        Path appLocation = Path.of(MAC_INSTALL_DIR.fetchFrom(params),
657e25d9e4e4 8231858:[macos] App does not run if installed with pkg
herrick
parents: 58415
diff changeset
   204
                         APP_NAME.fetchFrom(params) + ".app", "Contents", "app");
657e25d9e4e4 8231858:[macos] App does not run if installed with pkg
herrick
parents: 58415
diff changeset
   205
57290
47c2aca6c306 8215241: Permissions are not set correctly on sub-folders in /Applications
ssadetsky
parents: 57256
diff changeset
   206
        data.put("INSTALL_LOCATION", MAC_INSTALL_DIR.fetchFrom(params));
58581
657e25d9e4e4 8231858:[macos] App does not run if installed with pkg
herrick
parents: 58415
diff changeset
   207
        data.put("APP_LOCATION", appLocation.toString());
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   208
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   209
        try (Writer w = Files.newBufferedWriter(
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   210
                getScripts_PreinstallFile(params).toPath())) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   211
            String content = preprocessTextResource(
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   212
                    getScripts_PreinstallFile(params).getName(),
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   213
                    I18N.getString("resource.pkg-preinstall-script"),
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   214
                    TEMPLATE_PREINSTALL_SCRIPT,
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   215
                    data,
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   216
                    VERBOSE.fetchFrom(params),
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   217
                    RESOURCE_DIR.fetchFrom(params));
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   218
            w.write(content);
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   219
        }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   220
        getScripts_PreinstallFile(params).setExecutable(true, false);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   221
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   222
        try (Writer w = Files.newBufferedWriter(
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   223
                getScripts_PostinstallFile(params).toPath())) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   224
            String content = preprocessTextResource(
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   225
                    getScripts_PostinstallFile(params).getName(),
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   226
                    I18N.getString("resource.pkg-postinstall-script"),
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   227
                    TEMPLATE_POSTINSTALL_SCRIPT,
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   228
                    data,
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   229
                    VERBOSE.fetchFrom(params),
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   230
                    RESOURCE_DIR.fetchFrom(params));
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   231
            w.write(content);
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   232
        }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   233
        getScripts_PostinstallFile(params).setExecutable(true, false);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   234
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   235
58584
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   236
    private String URLEncoding(String pkgName) throws URISyntaxException {
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   237
        URI uri = new URI(null, null, pkgName, null);
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   238
        return uri.toASCIIString();
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   239
    }
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   240
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   241
    private void prepareDistributionXMLFile(Map<String, ? super Object> params)
58584
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   242
            throws IOException, URISyntaxException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   243
        File f = getConfig_DistributionXMLFile(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   244
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   245
        Log.verbose(MessageFormat.format(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   246
                "message.preparing-distribution-dist"), f.getAbsolutePath()));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   247
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   248
        XMLOutputFactory xmlFactory = XMLOutputFactory.newInstance();
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   249
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   250
        try (Writer w = new OutputStreamWriter(new FileOutputStream(f), "UTF-8")) {
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   251
            XMLStreamWriter xml = xmlFactory.createXMLStreamWriter(w);
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   252
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   253
            xml.writeStartDocument("UTF-8", "1.0");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   254
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   255
            xml.writeStartElement("installer-gui-script");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   256
            xml.writeAttribute("minSpecVersion", "1");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   257
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   258
            xml.writeStartElement("title");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   259
            xml.writeCharacters(APP_NAME.fetchFrom(params));
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   260
            xml.writeEndElement();
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   261
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   262
            xml.writeStartElement("background");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   263
            xml.writeAttribute("file", getConfig_BackgroundImage(params).getName());
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   264
            xml.writeAttribute("mime-type", "image/png");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   265
            xml.writeAttribute("alignment", "bottomleft");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   266
            xml.writeAttribute("scaling", "none");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   267
            xml.writeEndElement();
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   268
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   269
            xml.writeStartElement("background-darkAqua");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   270
            xml.writeAttribute("file", getConfig_BackgroundImageDarkAqua(params).getName());
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   271
            xml.writeAttribute("mime-type", "image/png");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   272
            xml.writeAttribute("alignment", "bottomleft");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   273
            xml.writeAttribute("scaling", "none");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   274
            xml.writeEndElement();
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   275
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   276
            String licFileStr = LICENSE_FILE.fetchFrom(params);
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   277
            if (licFileStr != null) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   278
                File licFile = new File(licFileStr);
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   279
                xml.writeStartElement("license");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   280
                xml.writeAttribute("file", licFile.getAbsolutePath());
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   281
                xml.writeAttribute("mime-type", "text/rtf");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   282
                xml.writeEndElement();
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   283
            }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   284
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   285
            /*
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   286
             * Note that the content of the distribution file
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   287
             * below is generated by productbuild --synthesize
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   288
             */
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   289
            String appId = getAppIdentifier(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   290
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   291
            xml.writeStartElement("pkg-ref");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   292
            xml.writeAttribute("id", appId);
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   293
            xml.writeEndElement(); // </pkg-ref>
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   294
            xml.writeStartElement("options");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   295
            xml.writeAttribute("customize", "never");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   296
            xml.writeAttribute("require-scripts", "false");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   297
            xml.writeEndElement(); // </options>
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   298
            xml.writeStartElement("choices-outline");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   299
            xml.writeStartElement("line");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   300
            xml.writeAttribute("choice", "default");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   301
            xml.writeStartElement("line");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   302
            xml.writeAttribute("choice", appId);
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   303
            xml.writeEndElement(); // </line>
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   304
            xml.writeEndElement(); // </line>
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   305
            xml.writeEndElement(); // </choices-outline>
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   306
            xml.writeStartElement("choice");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   307
            xml.writeAttribute("id", "default");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   308
            xml.writeEndElement(); // </choice>
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   309
            xml.writeStartElement("choice");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   310
            xml.writeAttribute("id", appId);
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   311
            xml.writeAttribute("visible", "false");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   312
            xml.writeStartElement("pkg-ref");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   313
            xml.writeAttribute("id", appId);
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   314
            xml.writeEndElement(); // </pkg-ref>
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   315
            xml.writeEndElement(); // </choice>
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   316
            xml.writeStartElement("pkg-ref");
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   317
            xml.writeAttribute("id", appId);
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   318
            xml.writeAttribute("version", VERSION.fetchFrom(params));
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   319
            xml.writeAttribute("onConclusion", "none");
58584
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   320
            xml.writeCharacters(URLEncoding(
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   321
                    getPackages_AppPackage(params).getName()));
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   322
            xml.writeEndElement(); // </pkg-ref>
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   323
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   324
            xml.writeEndElement(); // </installer-gui-script>
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   325
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   326
            xml.writeEndDocument();
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   327
            xml.flush();
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   328
            xml.close();
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   329
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   330
        } catch (XMLStreamException ex) {
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   331
            Log.verbose(ex);
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   332
            throw new IOException(ex);
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   333
        }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   334
    }
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
    private boolean prepareConfigFiles(Map<String, ? super Object> params)
58584
910b14f4fe3a 8232042: [macos] Installation fails if application name contains spaces
herrick
parents: 58582
diff changeset
   337
            throws IOException, URISyntaxException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   338
        File imageTarget = getConfig_BackgroundImage(params);
57091
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57080
diff changeset
   339
        fetchResource(imageTarget.getName(),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   340
                I18N.getString("resource.pkg-background-image"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   341
                DEFAULT_BACKGROUND_IMAGE,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   342
                imageTarget,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   343
                VERBOSE.fetchFrom(params),
57091
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57080
diff changeset
   344
                RESOURCE_DIR.fetchFrom(params));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   345
58582
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   346
        imageTarget = getConfig_BackgroundImageDarkAqua(params);
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   347
        fetchResource(imageTarget.getName(),
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   348
                I18N.getString("resource.pkg-background-image"),
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   349
                DEFAULT_BACKGROUND_IMAGE,
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   350
                imageTarget,
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   351
                VERBOSE.fetchFrom(params),
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   352
                RESOURCE_DIR.fetchFrom(params));
558a0842c5aa 8231856: pkg installer dialog contains background image which does not look correc
herrick
parents: 58581
diff changeset
   353
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   354
        prepareDistributionXMLFile(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   355
57091
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57080
diff changeset
   356
        fetchResource(getConfig_Script(params).getName(),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   357
                I18N.getString("resource.post-install-script"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   358
                (String) null,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   359
                getConfig_Script(params),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   360
                VERBOSE.fetchFrom(params),
57091
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57080
diff changeset
   361
                RESOURCE_DIR.fetchFrom(params));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   362
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   363
        return true;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   364
    }
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
    // name of post-image script
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   367
    private File getConfig_Script(Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   368
        return new File(CONFIG_ROOT.fetchFrom(params),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   369
                APP_NAME.fetchFrom(params) + "-post-image.sh");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   370
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   371
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   372
    private void patchCPLFile(File cpl) throws IOException {
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   373
        String cplData = Files.readString(cpl.toPath());
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   374
        String[] lines = cplData.split("\n");
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   375
        try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57331
diff changeset
   376
                cpl.toPath()))) {
57529
e3b156ad362f 8224627: Creating installer with --runtime-image on OS X fails
herrick
parents: 57438
diff changeset
   377
            int skip = 0;
e3b156ad362f 8224627: Creating installer with --runtime-image on OS X fails
herrick
parents: 57438
diff changeset
   378
            // Used to skip Java.runtime bundle, since
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   379
            // pkgbuild with --root will find two bundles app and Java runtime.
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   380
            // We cannot generate component proprty list when using
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   381
            // --component argument.
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   382
            for (int i = 0; i < lines.length; i++) {
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   383
                if (lines[i].trim().equals("<key>BundleIsRelocatable</key>")) {
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   384
                    out.println(lines[i]);
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   385
                    out.println("<false/>");
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   386
                    i++;
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   387
                } else if (lines[i].trim().equals("<key>ChildBundles</key>")) {
57529
e3b156ad362f 8224627: Creating installer with --runtime-image on OS X fails
herrick
parents: 57438
diff changeset
   388
                    ++skip;
e3b156ad362f 8224627: Creating installer with --runtime-image on OS X fails
herrick
parents: 57438
diff changeset
   389
                } else if ((skip > 0) && lines[i].trim().equals("</array>")) {
e3b156ad362f 8224627: Creating installer with --runtime-image on OS X fails
herrick
parents: 57438
diff changeset
   390
                    --skip;
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   391
                } else {
57529
e3b156ad362f 8224627: Creating installer with --runtime-image on OS X fails
herrick
parents: 57438
diff changeset
   392
                    if (skip == 0) {
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   393
                        out.println(lines[i]);
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   394
                    }
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   395
                }
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   396
            }
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   397
        }
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   398
    }
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   399
57331
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   400
    // pkgbuild includes all components from "--root" and subfolders,
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   401
    // so if we have app image in folder which contains other images, then they
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   402
    // will be included as well. It does have "--filter" option which use regex
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   403
    // to exclude files/folder, but it will overwrite default one which excludes
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   404
    // based on doc "any .svn or CVS directories, and any .DS_Store files".
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   405
    // So easy aproach will be to copy user provided app-image into temp folder
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   406
    // if root path contains other files.
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   407
    private String getRoot(Map<String, ? super Object> params,
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   408
            File appLocation) throws IOException {
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   409
        String root = appLocation.getParent() == null ?
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   410
                "." : appLocation.getParent();
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   411
        File rootDir = new File(root);
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   412
        File[] list = rootDir.listFiles();
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   413
        if (list != null) { // Should not happend
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   414
            // We should only have app image and/or .DS_Store
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   415
            if (list.length == 1) {
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   416
                return root;
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   417
            } else if (list.length == 2) {
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   418
                // Check case with app image and .DS_Store
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   419
                if (list[0].toString().toLowerCase().endsWith(".ds_store") ||
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   420
                    list[1].toString().toLowerCase().endsWith(".ds_store")) {
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   421
                    return root; // Only app image and .DS_Store
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   422
                }
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   423
            }
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   424
        }
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   425
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   426
        // Copy to new root
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   427
        Path newRoot = Files.createTempDirectory(
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   428
                TEMP_ROOT.fetchFrom(params).toPath(),
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   429
                "root-");
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   430
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   431
        IOUtils.copyRecursive(appLocation.toPath(),
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   432
                newRoot.resolve(appLocation.getName()));
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   433
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   434
        return newRoot.toString();
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   435
    }
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   436
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   437
    private File createPKG(Map<String, ? super Object> params,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   438
            File outdir, File appLocation) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   439
        // generic find attempt
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   440
        try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   441
            File appPKG = getPackages_AppPackage(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   442
57331
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   443
            String root = getRoot(params, appLocation);
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   444
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   445
            // Generate default CPL file
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   446
            File cpl = new File(CONFIG_ROOT.fetchFrom(params).getAbsolutePath()
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   447
                    + File.separator + "cpl.plist");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   448
            ProcessBuilder pb = new ProcessBuilder("pkgbuild",
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   449
                    "--root",
57331
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   450
                    root,
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   451
                    "--install-location",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   452
                    MAC_INSTALL_DIR.fetchFrom(params),
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   453
                    "--analyze",
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   454
                    cpl.getAbsolutePath());
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   455
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   456
            IOUtils.exec(pb);
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   457
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   458
            patchCPLFile(cpl);
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   459
57290
47c2aca6c306 8215241: Permissions are not set correctly on sub-folders in /Applications
ssadetsky
parents: 57256
diff changeset
   460
            preparePackageScripts(params);
47c2aca6c306 8215241: Permissions are not set correctly on sub-folders in /Applications
ssadetsky
parents: 57256
diff changeset
   461
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   462
            // build application package
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   463
            pb = new ProcessBuilder("pkgbuild",
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   464
                    "--root",
57331
221a589c52ee 8222676: create-installer with --app-image fails on mac
herrick
parents: 57290
diff changeset
   465
                    root,
57217
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   466
                    "--install-location",
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   467
                    MAC_INSTALL_DIR.fetchFrom(params),
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   468
                    "--component-plist",
b1291b2cedc9 8219144: Cannot find installed application on Mac
herrick
parents: 57150
diff changeset
   469
                    cpl.getAbsolutePath(),
57290
47c2aca6c306 8215241: Permissions are not set correctly on sub-folders in /Applications
ssadetsky
parents: 57256
diff changeset
   470
                    "--scripts",
47c2aca6c306 8215241: Permissions are not set correctly on sub-folders in /Applications
ssadetsky
parents: 57256
diff changeset
   471
                    SCRIPTS_DIR.fetchFrom(params).getAbsolutePath(),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   472
                    appPKG.getAbsolutePath());
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   473
            IOUtils.exec(pb);
57038
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
            // build final package
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   476
            File finalPKG = new File(outdir, INSTALLER_NAME.fetchFrom(params)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   477
                    + INSTALLER_SUFFIX.fetchFrom(params)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   478
                    + ".pkg");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   479
            outdir.mkdirs();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   480
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   481
            List<String> commandLine = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   482
            commandLine.add("productbuild");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   483
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   484
            commandLine.add("--resources");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   485
            commandLine.add(CONFIG_ROOT.fetchFrom(params).getAbsolutePath());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   486
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   487
            // maybe sign
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   488
            if (Optional.ofNullable(MacAppImageBuilder.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   489
                    SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.TRUE)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   490
                if (Platform.getMajorVersion() > 10 ||
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   491
                    (Platform.getMajorVersion() == 10 &&
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   492
                    Platform.getMinorVersion() >= 12)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   493
                    // we need this for OS X 10.12+
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   494
                    Log.verbose(I18N.getString("message.signing.pkg"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   495
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   496
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   497
                String signingIdentity =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   498
                        DEVELOPER_ID_INSTALLER_SIGNING_KEY.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   499
                if (signingIdentity != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   500
                    commandLine.add("--sign");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   501
                    commandLine.add(signingIdentity);
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
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   504
                String keychainName = SIGNING_KEYCHAIN.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   505
                if (keychainName != null && !keychainName.isEmpty()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   506
                    commandLine.add("--keychain");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   507
                    commandLine.add(keychainName);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   508
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   509
            }
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
            commandLine.add("--distribution");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   512
            commandLine.add(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   513
                    getConfig_DistributionXMLFile(params).getAbsolutePath());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   514
            commandLine.add("--package-path");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   515
            commandLine.add(PACKAGES_ROOT.fetchFrom(params).getAbsolutePath());
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
            commandLine.add(finalPKG.getAbsolutePath());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   518
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   519
            pb = new ProcessBuilder(commandLine);
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   520
            IOUtils.exec(pb);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   521
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   522
            return finalPKG;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   523
        } catch (Exception ignored) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   524
            Log.verbose(ignored);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   525
            return null;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   526
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   527
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   528
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   529
    //////////////////////////////////////////////////////////////////////////
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   530
    // Implement Bundler
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
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   533
    @Override
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   534
    public String getName() {
57059
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
   535
        return I18N.getString("pkg.bundler.name");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   536
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   537
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   538
    @Override
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   539
    public String getID() {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   540
        return "pkg";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   541
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   542
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   543
    @Override
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   544
    public boolean validate(Map<String, ? super Object> params)
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57407
diff changeset
   545
            throws ConfigException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   546
        try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   547
            if (params == null) throw new ConfigException(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   548
                    I18N.getString("error.parameters-null"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   549
                    I18N.getString("error.parameters-null.advice"));
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
            // run basic validation to ensure requirements are met
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   552
            // we are not interested in return code, only possible exception
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   553
            validateAppImageAndBundeler(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   554
58415
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58114
diff changeset
   555
            if (MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params) == null) {
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58114
diff changeset
   556
                throw new ConfigException(
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58114
diff changeset
   557
                        I18N.getString("message.app-image-requires-identifier"),
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58114
diff changeset
   558
                        I18N.getString(
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58114
diff changeset
   559
                            "message.app-image-requires-identifier.advice"));
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58114
diff changeset
   560
            }
73f8e557549a 8231281: Eliminate the --identifier option
herrick
parents: 58114
diff changeset
   561
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   562
            // reject explicitly set sign to true and no valid signature key
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   563
            if (Optional.ofNullable(MacAppImageBuilder.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   564
                    SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.FALSE)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   565
                String signingIdentity =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   566
                        DEVELOPER_ID_INSTALLER_SIGNING_KEY.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   567
                if (signingIdentity == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   568
                    throw new ConfigException(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   569
                            I18N.getString("error.explicit-sign-no-cert"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   570
                            I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   571
                            "error.explicit-sign-no-cert.advice"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   572
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   573
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   574
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   575
            // hdiutil is always available so there's no need
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   576
            // to test for availability.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   577
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   578
            return true;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   579
        } catch (RuntimeException re) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   580
            if (re.getCause() instanceof ConfigException) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   581
                throw (ConfigException) re.getCause();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   582
            } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   583
                throw new ConfigException(re);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   584
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   585
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   586
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   587
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   588
    @Override
57140
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   589
    public File execute(Map<String, ? super Object> params,
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   590
            File outputParentDir) throws PackagerException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   591
        return bundle(params, outputParentDir);
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
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   594
    @Override
57150
fa68c2ab636d 8217894: jpackage CLI syntax changes
herrick
parents: 57140
diff changeset
   595
    public boolean supported(boolean runtimeInstaller) {
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57407
diff changeset
   596
        return true;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   597
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   598
58114
42df7de58e39 8230519: jpackage "--package-type" values and default
herrick
parents: 58037
diff changeset
   599
    @Override
42df7de58e39 8230519: jpackage "--package-type" values and default
herrick
parents: 58037
diff changeset
   600
    public boolean isDefault() {
42df7de58e39 8230519: jpackage "--package-type" values and default
herrick
parents: 58037
diff changeset
   601
        return false;
42df7de58e39 8230519: jpackage "--package-type" values and default
herrick
parents: 58037
diff changeset
   602
    }
42df7de58e39 8230519: jpackage "--package-type" values and default
herrick
parents: 58037
diff changeset
   603
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   604
}