src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
author herrick
Mon, 15 Jul 2019 09:40:36 -0400
branchJDK-8200758-branch
changeset 57473 3ef9726d7eec
parent 57438 4a31db8d42bd
child 57743 8d6f0aff03fc
permissions -rw-r--r--
8220807: excessive verbose output when running with --win-per-user-install Reviewed-by: 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: 57103
diff changeset
     2
 * Copyright (c) 2012, 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.*;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    29
import java.nio.charset.Charset;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    30
import java.nio.file.Files;
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    31
import java.nio.file.Paths;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    32
import java.text.MessageFormat;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    33
import java.util.*;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    34
import java.util.regex.Pattern;
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    35
import javax.xml.stream.XMLOutputFactory;
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    36
import javax.xml.stream.XMLStreamException;
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    37
import javax.xml.stream.XMLStreamWriter;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    38
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    39
import static jdk.jpackage.internal.WindowsBundlerParam.*;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    40
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    41
/**
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    42
 * WinMsiBundler
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    43
 *
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    44
 * Produces .msi installer from application image. Uses WiX Toolkit to build
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    45
 * .msi installer.
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    46
 * <p>
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    47
 * {@link #execute} method creates a number of source files with the description
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    48
 * of installer to be processed by WiX tools. Generated source files are stored
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    49
 * in "config" subdirectory next to "app" subdirectory in the root work
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    50
 * directory. The following WiX source files are generated:
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    51
 * <ul>
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    52
 * <li>main.wxs. Main source file with the installer description
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    53
 * <li>bundle.wxi. Source file with application and Java run-time directory tree
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    54
 * description. This source file is included from main.wxs
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    55
 * <li>icons.wxi. Source file with the list of icons used by the application.
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    56
 * This source file is included from main.wxs
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    57
 * </ul>
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    58
 * <p>
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    59
 * main.wxs file is a copy of main.wxs resource from
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    60
 * jdk.jpackage.internal.resources package. It is parametrized with the
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    61
 * following WiX variables:
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    62
 * <ul>
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    63
 * <li>JpAppName. Name of the application. Set to the value of --name command
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    64
 * line option
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    65
 * <li>JpAppVersion. Version of the application. Set to the value of
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    66
 * --app-version command line option
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    67
 * <li>JpAppVendor. Vendor of the application. Set to the value of --vendor
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    68
 * command line option
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    69
 * <li>JpAppDescription. Description of the application. Set to the value of
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    70
 * --description command line option
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    71
 * <li>JpProductCode. Set to product code UUID of the application. Random value
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    72
 * generated by jpackage every time {@link #execute} method is called
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    73
 * <li>JpProductUpgradeCode. Set to upgrade code UUID of the application. Random
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    74
 * value generated by jpackage every time {@link #execute} method is called if
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    75
 * --win-upgrade-uuid command line option is not specified. Otherwise this
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    76
 * variable is set to the value of --win-upgrade-uuid command line option
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    77
 * <li>JpAllowDowngrades. Set to "yes" if --win-upgrade-uuid command line option
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    78
 * was specified. Undefined otherwise
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    79
 * <li>JpLicenseRtf. Set to the value of --license-file command line option.
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    80
 * Undefined is --license-file command line option was not specified
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    81
 * <li>JpInstallDirChooser. Set to "yes" if --win-dir-chooser command line
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    82
 * option was specified. Undefined otherwise
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    83
 * <li>JpConfigDir. Absolute path to the directory with generated WiX source
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    84
 * files.
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    85
 * <li>JpIsSystemWide. Set to "yes" if --win-per-user-install command line
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    86
 * option was not specified. Undefined otherwise
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    87
 * <li>JpWixVersion36OrNewer. Set to "yes" if WiX Toolkit v3.6 or newer is used.
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    88
 * Undefined otherwise
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    89
 * </ul>
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
    90
 */
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    91
public class WinMsiBundler  extends AbstractBundler {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    92
57059
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
    93
    private static final ResourceBundle I18N = ResourceBundle.getBundle(
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
    94
            "jdk.jpackage.internal.resources.WinResources");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    95
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    96
    public static final BundlerParamInfo<WinAppBundler> APP_BUNDLER =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    97
            new WindowsBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    98
            "win.app.bundler",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    99
            WinAppBundler.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   100
            params -> new WinAppBundler(),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   101
            null);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   102
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   103
    public static final BundlerParamInfo<Boolean> CAN_USE_WIX36 =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   104
            new WindowsBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   105
            "win.msi.canUseWix36",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   106
            Boolean.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   107
            params -> false,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   108
            (s, p) -> Boolean.valueOf(s));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   109
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   110
    public static final BundlerParamInfo<File> MSI_IMAGE_DIR =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   111
            new WindowsBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   112
            "win.msi.imageDir",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   113
            File.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   114
            params -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   115
                File imagesRoot = IMAGES_ROOT.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   116
                if (!imagesRoot.exists()) imagesRoot.mkdirs();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   117
                return new File(imagesRoot, "win-msi.image");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   118
            },
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   119
            (s, p) -> null);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   120
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   121
    public static final BundlerParamInfo<File> WIN_APP_IMAGE =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   122
            new WindowsBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   123
            "win.app.image",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   124
            File.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   125
            null,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   126
            (s, p) -> null);
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 StandardBundlerParam<Boolean> MSI_SYSTEM_WIDE  =
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
                    Arguments.CLIOptions.WIN_PER_USER_INSTALLATION.getId(),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   131
                    Boolean.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   132
                    params -> true, // MSIs default to system wide
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   133
                    // valueOf(null) is false,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   134
                    // and we actually do want null
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   135
                    (s, p) -> (s == null || "null".equalsIgnoreCase(s))? null
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   136
                            : Boolean.valueOf(s)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   137
            );
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   138
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   139
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   140
    public static final StandardBundlerParam<String> PRODUCT_VERSION =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   141
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   142
                    "win.msi.productVersion",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   143
                    String.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   144
                    VERSION::fetchFrom,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   145
                    (s, p) -> s
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
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   148
    public static final BundlerParamInfo<UUID> UPGRADE_UUID =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   149
            new WindowsBundlerParam<>(
57062
044e7a644ee3 8214575: Exe installers will install application to already existing instalation
herrick
parents: 57059
diff changeset
   150
            Arguments.CLIOptions.WIN_UPGRADE_UUID.getId(),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   151
            UUID.class,
57062
044e7a644ee3 8214575: Exe installers will install application to already existing instalation
herrick
parents: 57059
diff changeset
   152
            params -> UUID.randomUUID(),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   153
            (s, p) -> UUID.fromString(s));
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
    private static final String TOOL_CANDLE = "candle.exe";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   156
    private static final String TOOL_LIGHT = "light.exe";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   157
    // autodetect just v3.7, v3.8, 3.9, 3.10 and 3.11
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   158
    private static final String AUTODETECT_DIRS =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   159
            ";C:\\Program Files (x86)\\WiX Toolset v3.11\\bin;"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   160
            + "C:\\Program Files\\WiX Toolset v3.11\\bin;"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   161
            + "C:\\Program Files (x86)\\WiX Toolset v3.10\\bin;"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   162
            + "C:\\Program Files\\WiX Toolset v3.10\\bin;"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   163
            + "C:\\Program Files (x86)\\WiX Toolset v3.9\\bin;"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   164
            + "C:\\Program Files\\WiX Toolset v3.9\\bin;"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   165
            + "C:\\Program Files (x86)\\WiX Toolset v3.8\\bin;"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   166
            + "C:\\Program Files\\WiX Toolset v3.8\\bin;"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   167
            + "C:\\Program Files (x86)\\WiX Toolset v3.7\\bin;"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   168
            + "C:\\Program Files\\WiX Toolset v3.7\\bin";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   169
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   170
    private static String getCandlePath() {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   171
        for (String dirString : (System.getenv("PATH")
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   172
                + AUTODETECT_DIRS).split(";")) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   173
            File f = new File(dirString.replace("\"", ""), TOOL_CANDLE);
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   174
            if (f.isFile()) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   175
                return f.toString();
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   176
            }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   177
        }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   178
        return null;
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   179
    }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   180
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   181
    private static String getLightPath() {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   182
        for (String dirString : (System.getenv("PATH")
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   183
                + AUTODETECT_DIRS).split(";")) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   184
            File f = new File(dirString.replace("\"", ""), TOOL_LIGHT);
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   185
            if (f.isFile()) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   186
                return f.toString();
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   187
            }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   188
        }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   189
        return null;
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   190
    }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   191
        
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   192
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   193
    public static final StandardBundlerParam<Boolean> MENU_HINT =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   194
        new WindowsBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   195
                Arguments.CLIOptions.WIN_MENU_HINT.getId(),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   196
                Boolean.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   197
                params -> false,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   198
                // valueOf(null) is false,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   199
                // and we actually do want null in some cases
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   200
                (s, p) -> (s == null ||
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   201
                        "null".equalsIgnoreCase(s))? true : Boolean.valueOf(s)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   202
        );
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   203
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   204
    public static final StandardBundlerParam<Boolean> SHORTCUT_HINT =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   205
        new WindowsBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   206
                Arguments.CLIOptions.WIN_SHORTCUT_HINT.getId(),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   207
                Boolean.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   208
                params -> false,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   209
                // valueOf(null) is false,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   210
                // and we actually do want null in some cases
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   211
                (s, p) -> (s == null ||
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   212
                       "null".equalsIgnoreCase(s))? false : Boolean.valueOf(s)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   213
        );
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   214
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   215
    @Override
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   216
    public String getName() {
57059
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
   217
        return I18N.getString("msi.bundler.name");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   218
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   219
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   220
    @Override
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   221
    public String getID() {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   222
        return "msi";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   223
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   224
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   225
    @Override
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   226
    public String getBundleType() {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   227
        return "INSTALLER";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   228
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   229
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   230
    @Override
57140
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   231
    public File execute(Map<String, ? super Object> params,
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   232
            File outputParentDir) throws PackagerException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   233
        return bundle(params, outputParentDir);
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
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   236
    @Override
57150
fa68c2ab636d 8217894: jpackage CLI syntax changes
herrick
parents: 57140
diff changeset
   237
    public boolean supported(boolean platformInstaller) {
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   238
        return isSupported();
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   239
    }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   240
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   241
    public static boolean isSupported() {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   242
        try {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   243
            return validateWixTools();
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   244
        } catch (Exception e) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   245
            return false;
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   246
        }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   247
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   248
57219
bfa094e6ce15 8191709 : javapackager detects WiX 3.10 as 3.1 and fails to use WiX 3.6+ compatible code
herrick
parents: 57213
diff changeset
   249
    private static String findToolVersion(String toolName) {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   250
        try {
57219
bfa094e6ce15 8191709 : javapackager detects WiX 3.10 as 3.1 and fails to use WiX 3.6+ compatible code
herrick
parents: 57213
diff changeset
   251
            if (toolName == null || "".equals(toolName)) return null;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   252
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   253
            ProcessBuilder pb = new ProcessBuilder(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   254
                    toolName,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   255
                    "/?");
57219
bfa094e6ce15 8191709 : javapackager detects WiX 3.10 as 3.1 and fails to use WiX 3.6+ compatible code
herrick
parents: 57213
diff changeset
   256
            VersionExtractor ve = new VersionExtractor("version (\\d+.\\d+)");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   257
            // not interested in the output
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   258
            IOUtils.exec(pb, true, ve);
57219
bfa094e6ce15 8191709 : javapackager detects WiX 3.10 as 3.1 and fails to use WiX 3.6+ compatible code
herrick
parents: 57213
diff changeset
   259
            String version = ve.getVersion();
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   260
            Log.verbose(MessageFormat.format(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   261
                    I18N.getString("message.tool-version"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   262
                    toolName, version));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   263
            return version;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   264
        } catch (Exception e) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   265
            if (Log.isDebug()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   266
                Log.verbose(e);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   267
            }
57219
bfa094e6ce15 8191709 : javapackager detects WiX 3.10 as 3.1 and fails to use WiX 3.6+ compatible code
herrick
parents: 57213
diff changeset
   268
            return null;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   269
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   270
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   271
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   272
    public static boolean validateWixTools() {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   273
        String candleVersion = findToolVersion(getCandlePath());
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   274
        String lightVersion = findToolVersion(getLightPath());
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   275
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   276
        // WiX 3.0+ is required
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   277
        String minVersion = "3.0";
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   278
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   279
        if (VersionExtractor.isLessThan(candleVersion, minVersion)) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   280
            Log.verbose(MessageFormat.format(
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   281
                    I18N.getString("message.wrong-tool-version"),
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   282
                    TOOL_CANDLE, candleVersion, minVersion));
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   283
            return false;
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   284
        }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   285
        if (VersionExtractor.isLessThan(lightVersion, minVersion)) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   286
            Log.verbose(MessageFormat.format(
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   287
                    I18N.getString("message.wrong-tool-version"),
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   288
                    TOOL_LIGHT, lightVersion, minVersion));
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   289
            return false;
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   290
        }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   291
        return true;
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   292
    }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   293
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   294
    @Override
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   295
    public boolean validate(Map<String, ? super Object> params)
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   296
            throws ConfigException {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   297
        try {
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   298
            if (params == null) throw new ConfigException(
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   299
                    I18N.getString("error.parameters-null"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   300
                    I18N.getString("error.parameters-null.advice"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   301
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   302
            // run basic validation to ensure requirements are met
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   303
            // we are not interested in return code, only possible exception
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   304
            if (!validateWixTools()){
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   305
                throw new ConfigException(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   306
                        I18N.getString("error.no-wix-tools"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   307
                        I18N.getString("error.no-wix-tools.advice"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   308
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   309
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   310
            String lightVersion = findToolVersion(getLightPath());
57219
bfa094e6ce15 8191709 : javapackager detects WiX 3.10 as 3.1 and fails to use WiX 3.6+ compatible code
herrick
parents: 57213
diff changeset
   311
            if (!VersionExtractor.isLessThan(lightVersion, "3.6")) {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   312
                Log.verbose(I18N.getString("message.use-wix36-features"));
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   313
                params.put(CAN_USE_WIX36.getID(), Boolean.TRUE);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   314
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   315
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   316
            /********* validate bundle parameters *************/
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   317
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   318
            String version = PRODUCT_VERSION.fetchFrom(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   319
            if (!isVersionStringValid(version)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   320
                throw new ConfigException(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   321
                        MessageFormat.format(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   322
                                "error.version-string-wrong-format"), version),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   323
                        MessageFormat.format(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   324
                                "error.version-string-wrong-format.advice"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   325
                                PRODUCT_VERSION.getID()));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   326
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   327
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   328
            // only one mime type per association, at least one file extension
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   329
            List<Map<String, ? super Object>> associations =
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   330
                    FILE_ASSOCIATIONS.fetchFrom(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   331
            if (associations != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   332
                for (int i = 0; i < associations.size(); i++) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   333
                    Map<String, ? super Object> assoc = associations.get(i);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   334
                    List<String> mimes = FA_CONTENT_TYPE.fetchFrom(assoc);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   335
                    if (mimes.size() > 1) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   336
                        throw new ConfigException(MessageFormat.format(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   337
                                I18N.getString("error.too-many-content-"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   338
                                + "types-for-file-association"), i),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   339
                                I18N.getString("error.too-many-content-"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   340
                                + "types-for-file-association.advice"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   341
                    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   342
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   343
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   344
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   345
            return true;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   346
        } catch (RuntimeException re) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   347
            if (re.getCause() instanceof ConfigException) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   348
                throw (ConfigException) re.getCause();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   349
            } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   350
                throw new ConfigException(re);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   351
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   352
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   353
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   354
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   355
    // http://msdn.microsoft.com/en-us/library/aa370859%28v=VS.85%29.aspx
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   356
    // The format of the string is as follows:
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   357
    //     major.minor.build
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   358
    // The first field is the major version and has a maximum value of 255.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   359
    // The second field is the minor version and has a maximum value of 255.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   360
    // The third field is called the build version or the update version and
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   361
    // has a maximum value of 65,535.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   362
    static boolean isVersionStringValid(String v) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   363
        if (v == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   364
            return true;
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
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   367
        String p[] = v.split("\\.");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   368
        if (p.length > 3) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   369
            Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   370
                    "message.version-string-too-many-components"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   371
            return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   372
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   373
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   374
        try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   375
            int val = Integer.parseInt(p[0]);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   376
            if (val < 0 || val > 255) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   377
                Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   378
                        "error.version-string-major-out-of-range"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   379
                return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   380
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   381
            if (p.length > 1) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   382
                val = Integer.parseInt(p[1]);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   383
                if (val < 0 || val > 255) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   384
                    Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   385
                            "error.version-string-minor-out-of-range"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   386
                    return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   387
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   388
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   389
            if (p.length > 2) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   390
                val = Integer.parseInt(p[2]);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   391
                if (val < 0 || val > 65535) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   392
                    Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   393
                            "error.version-string-build-out-of-range"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   394
                    return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   395
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   396
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   397
        } catch (NumberFormatException ne) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   398
            Log.verbose(I18N.getString("error.version-string-part-not-number"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   399
            Log.verbose(ne);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   400
            return false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   401
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   402
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   403
        return true;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   404
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   405
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   406
    private boolean prepareProto(Map<String, ? super Object> params)
57140
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   407
                throws PackagerException, IOException {
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   408
        File appImage = StandardBundlerParam.getPredefinedAppImage(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   409
        File appDir = null;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   410
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   411
        // we either have an application image or need to build one
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   412
        if (appImage != null) {
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   413
            appDir = new File(MSI_IMAGE_DIR.fetchFrom(params),
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   414
                    APP_NAME.fetchFrom(params));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   415
            // copy everything from appImage dir into appDir/name
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   416
            IOUtils.copyRecursive(appImage.toPath(), appDir.toPath());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   417
        } else {
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   418
            appDir = APP_BUNDLER.fetchFrom(params).doBundle(params,
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   419
                    MSI_IMAGE_DIR.fetchFrom(params), true);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   420
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   421
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   422
        params.put(WIN_APP_IMAGE.getID(), appDir);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   423
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   424
        String licenseFile = LICENSE_FILE.fetchFrom(params);
57080
bd4ce7f9ea2c 8214495: Change behavior of --license-file
herrick
parents: 57067
diff changeset
   425
        if (licenseFile != null) {
bd4ce7f9ea2c 8214495: Change behavior of --license-file
herrick
parents: 57067
diff changeset
   426
            // need to copy license file to the working directory and convert to rtf if needed
bd4ce7f9ea2c 8214495: Change behavior of --license-file
herrick
parents: 57067
diff changeset
   427
            File lfile = new File(licenseFile);
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   428
            File destFile = new File(CONFIG_ROOT.fetchFrom(params),
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   429
                    lfile.getName());
57414
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57407
diff changeset
   430
57080
bd4ce7f9ea2c 8214495: Change behavior of --license-file
herrick
parents: 57067
diff changeset
   431
            IOUtils.copyFile(lfile, destFile);
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   432
            destFile.setWritable(true);
57080
bd4ce7f9ea2c 8214495: Change behavior of --license-file
herrick
parents: 57067
diff changeset
   433
            ensureByMutationFileIsRTF(destFile);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   434
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   435
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   436
        // copy file association icons
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   437
        List<Map<String, ? super Object>> fileAssociations =
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   438
                FILE_ASSOCIATIONS.fetchFrom(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   439
        for (Map<String, ? super Object> fa : fileAssociations) {
57397
89549ecec1c7 8223212: Code cleanup found during jpackage review
herrick
parents: 57396
diff changeset
   440
            File icon = FA_ICON.fetchFrom(fa);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   441
            if (icon == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   442
                continue;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   443
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   444
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   445
            File faIconFile = new File(appDir, icon.getName());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   446
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   447
            if (icon.exists()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   448
                try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   449
                    IOUtils.copyFile(icon, faIconFile);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   450
                } catch (IOException e) {
57140
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   451
                    Log.verbose(e);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   452
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   453
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   454
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   455
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   456
        return appDir != null;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   457
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   458
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   459
    public File bundle(Map<String, ? super Object> params, File outdir)
57140
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   460
            throws PackagerException {
57407
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57404
diff changeset
   461
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57404
diff changeset
   462
        IOUtils.writableOutputDir(outdir.toPath());
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   463
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   464
        // validate we have valid tools before continuing
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   465
        String light = getLightPath();
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
   466
        String candle = getCandlePath();
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   467
        if (light == null || !new File(light).isFile() ||
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   468
            candle == null || !new File(candle).isFile()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   469
            Log.verbose(MessageFormat.format(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   470
                   I18N.getString("message.light-file-string"), light));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   471
            Log.verbose(MessageFormat.format(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   472
                   I18N.getString("message.candle-file-string"), candle));
57140
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   473
            throw new PackagerException("error.no-wix-tools");
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
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   476
        Map<String, String> wixVars = null;
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   477
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   478
        File imageDir = MSI_IMAGE_DIR.fetchFrom(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   479
        try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   480
            imageDir.mkdirs();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   481
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   482
            boolean menuShortcut = MENU_HINT.fetchFrom(params);
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   483
            boolean desktopShortcut = SHORTCUT_HINT.fetchFrom(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   484
            if (!menuShortcut && !desktopShortcut) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   485
                // both can not be false - user will not find the app
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   486
                Log.verbose(I18N.getString("message.one-shortcut-required"));
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   487
                params.put(MENU_HINT.getID(), true);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   488
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   489
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   490
            prepareBasicProjectConfig(params);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   491
            if (prepareProto(params)) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   492
                wixVars = prepareWiXConfig(params);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   493
57396
3944e4c2f779 8223586: remove jpackage dead code and other cleanup
herrick
parents: 57391
diff changeset
   494
                File configScriptSrc = getConfig_Script(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   495
                if (configScriptSrc.exists()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   496
                    // we need to be running post script in the image folder
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   497
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   498
                    // NOTE: Would it be better to generate it to the image
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   499
                    // folder and save only if "verbose" is requested?
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   500
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   501
                    // for now we replicate it
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   502
                    File configScript =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   503
                        new File(imageDir, configScriptSrc.getName());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   504
                    IOUtils.copyFile(configScriptSrc, configScript);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   505
                    Log.verbose(MessageFormat.format(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   506
                            I18N.getString("message.running-wsh-script"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   507
                            configScript.getAbsolutePath()));
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
   508
                    IOUtils.run("wscript", configScript);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   509
                }
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   510
                return buildMSI(params, wixVars, outdir);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   511
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   512
            return null;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   513
        } catch (IOException ex) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   514
            Log.verbose(ex);
57140
3dcb33ce7ced 8217751: jpackage messages and failures
herrick
parents: 57119
diff changeset
   515
            throw new PackagerException(ex);
57038
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
    }
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
    // name of post-image script
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   520
    private File getConfig_Script(Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   521
        return new File(CONFIG_ROOT.fetchFrom(params),
57119
b3dda8d77d8a 8217331: Problems when space in application name
herrick
parents: 57106
diff changeset
   522
                APP_NAME.fetchFrom(params) + "-post-image.wsf");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   523
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   524
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   525
    private void prepareBasicProjectConfig(
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   526
        Map<String, ? super Object> params) throws IOException {
57091
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57080
diff changeset
   527
        fetchResource(getConfig_Script(params).getName(),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   528
                I18N.getString("resource.post-install-script"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   529
                (String) null,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   530
                getConfig_Script(params),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   531
                VERBOSE.fetchFrom(params),
57091
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57080
diff changeset
   532
                RESOURCE_DIR.fetchFrom(params));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   533
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   534
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   535
    private static String relativePath(File basedir, File file) {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   536
        return file.getAbsolutePath().substring(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   537
                basedir.getAbsolutePath().length() + 1);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   538
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   539
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   540
    private void prepareIconsFile(
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   541
            Map<String, ? super Object> params) throws IOException {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   542
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   543
        File imageRootDir = WIN_APP_IMAGE.fetchFrom(params);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   544
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   545
        List<Map<String, ? super Object>> addLaunchers =
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   546
                ADD_LAUNCHERS.fetchFrom(params);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   547
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   548
        XMLOutputFactory xmlFactory = XMLOutputFactory.newInstance();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   549
        try (Writer w = new BufferedWriter(new FileWriter(new File(
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   550
                CONFIG_ROOT.fetchFrom(params), "icons.wxi")))) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   551
            XMLStreamWriter xml = xmlFactory.createXMLStreamWriter(w);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   552
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   553
            xml.writeStartDocument();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   554
            xml.writeStartElement("Include");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   555
57407
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57404
diff changeset
   556
            File launcher = new File(imageRootDir,
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57404
diff changeset
   557
                    WinAppBundler.getLauncherRelativePath(params));
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   558
            if (launcher.exists()) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   559
                String iconPath = launcher.getAbsolutePath().replace(".exe", ".ico");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   560
                if (MENU_HINT.fetchFrom(params)) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   561
                    xml.writeStartElement("Icon");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   562
                    xml.writeAttribute("Id", "StartMenuIcon.exe");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   563
                    xml.writeAttribute("SourceFile", iconPath);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   564
                    xml.writeEndElement();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   565
                }
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   566
                if (SHORTCUT_HINT.fetchFrom(params)) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   567
                    xml.writeStartElement("Icon");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   568
                    xml.writeAttribute("Id", "DesktopIcon.exe");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   569
                    xml.writeAttribute("SourceFile", iconPath);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   570
                    xml.writeEndElement();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   571
                }
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   572
            }
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   573
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   574
            for (int i = 0; i < addLaunchers.size(); i++) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   575
                Map<String, ? super Object> sl = addLaunchers.get(i);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   576
                if (SHORTCUT_HINT.fetchFrom(sl) || MENU_HINT.fetchFrom(sl)) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   577
                    File addLauncher = new File(imageRootDir,
57407
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57404
diff changeset
   578
                            WinAppBundler.getLauncherRelativePath(sl));
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   579
                    String addLauncherPath
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   580
                            = relativePath(imageRootDir, addLauncher);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   581
                    String addLauncherIconPath
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   582
                            = addLauncherPath.replace(".exe", ".ico");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   583
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   584
                    xml.writeStartElement("Icon");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   585
                    xml.writeAttribute("Id", "Launcher" + i + ".exe");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   586
                    xml.writeAttribute("SourceFile", addLauncherIconPath);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   587
                    xml.writeEndElement();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   588
                }
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   589
            }
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   590
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   591
            xml.writeEndElement();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   592
            xml.writeEndDocument();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   593
            xml.flush();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   594
            xml.close();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   595
        } catch (XMLStreamException ex) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   596
            Log.verbose(ex);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   597
            throw new IOException(ex);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   598
        }
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   599
    }
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   600
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   601
    Map<String, String> prepareMainProjectFile(
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   602
            Map<String, ? super Object> params) throws IOException {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   603
        Map<String, String> data = new HashMap<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   604
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   605
        UUID productGUID = UUID.randomUUID();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   606
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   607
        Log.verbose(MessageFormat.format(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   608
                I18N.getString("message.generated-product-guid"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   609
                productGUID.toString()));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   610
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   611
        // we use random GUID for product itself but
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   612
        // user provided for upgrade guid
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   613
        // Upgrade guid is important to decide whether it is an upgrade of
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   614
        // installed app.  I.e. we need it to be the same for
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   615
        // 2 different versions of app if possible
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   616
        data.put("JpProductCode", productGUID.toString());
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   617
        data.put("JpProductUpgradeCode",
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   618
                UPGRADE_UUID.fetchFrom(params).toString());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   619
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   620
        if (!UPGRADE_UUID.getIsDefaultValue()) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   621
            data.put("JpAllowDowngrades", "yes");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   622
        }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   623
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   624
        if (CAN_USE_WIX36.fetchFrom(params)) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   625
            data.put("JpWixVersion36OrNewer", "yes");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   626
        }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   627
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   628
        data.put("JpAppName", APP_NAME.fetchFrom(params));
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   629
        data.put("JpAppDescription", DESCRIPTION.fetchFrom(params));
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   630
        data.put("JpAppVendor", VENDOR.fetchFrom(params));
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   631
        data.put("JpAppVersion", PRODUCT_VERSION.fetchFrom(params));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   632
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   633
        data.put("JpConfigDir", CONFIG_ROOT.fetchFrom(params).getAbsolutePath());
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   634
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   635
        File imageRootDir = WIN_APP_IMAGE.fetchFrom(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   636
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   637
        if (MSI_SYSTEM_WIDE.fetchFrom(params)) {
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   638
            data.put("JpIsSystemWide", "yes");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   639
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   640
57414
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57407
diff changeset
   641
        String licenseFile = LICENSE_FILE.fetchFrom(params);
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57407
diff changeset
   642
        if (licenseFile != null) {
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57407
diff changeset
   643
            String lname = new File(licenseFile).getName();
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57407
diff changeset
   644
            File destFile = new File(CONFIG_ROOT.fetchFrom(params), lname);
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57407
diff changeset
   645
            data.put("JpLicenseRtf", destFile.getAbsolutePath());
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   646
        }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   647
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   648
        // Copy CA dll to include with installer
57254
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
   649
        if (INSTALLDIR_CHOOSER.fetchFrom(params)) {
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   650
            data.put("JpInstallDirChooser", "yes");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   651
            String fname = "wixhelper.dll";
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   652
            try (InputStream is = getResourceAsStream(fname)) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   653
                Files.copy(is, Paths.get(
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   654
                        CONFIG_ROOT.fetchFrom(params).getAbsolutePath(), fname));
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   655
            }
57254
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
   656
        }
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
   657
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   658
        // Copy l10n files.
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   659
        for (String loc : Arrays.asList("en", "ja", "zh_CN")) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   660
            String fname = "MsiInstallerStrings_" + loc + ".wxl";
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   661
            try (InputStream is = getResourceAsStream(fname)) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   662
                Files.copy(is, Paths.get(
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   663
                        CONFIG_ROOT.fetchFrom(params).getAbsolutePath(), fname));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   664
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   665
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   666
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   667
        try (InputStream is = getResourceAsStream("main.wxs")) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   668
            Files.copy(is, Paths.get(
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   669
                    getConfig_ProjectFile(params).getAbsolutePath()));
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   670
        }
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   671
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   672
        return data;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   673
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   674
    private int id;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   675
    private int compId;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   676
    private final static String LAUNCHER_ID = "LauncherId";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   677
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   678
    private void walkFileTree(Map<String, ? super Object> params,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   679
            File root, PrintStream out, String prefix) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   680
        List<File> dirs = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   681
        List<File> files = new ArrayList<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   682
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   683
        if (!root.isDirectory()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   684
            throw new RuntimeException(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   685
                    MessageFormat.format(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   686
                            I18N.getString("error.cannot-walk-directory"),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   687
                            root.getAbsolutePath()));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   688
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   689
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   690
        // sort to files and dirs
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   691
        File[] children = root.listFiles();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   692
        if (children != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   693
            for (File f : children) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   694
                if (f.isDirectory()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   695
                    dirs.add(f);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   696
                } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   697
                    files.add(f);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   698
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   699
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   700
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   701
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   702
        // have files => need to output component
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   703
        out.println(prefix + " <Component Id=\"comp" + (compId++)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   704
                + "\" DiskId=\"1\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   705
                + " Guid=\"" + UUID.randomUUID().toString() + "\""
57219
bfa094e6ce15 8191709 : javapackager detects WiX 3.10 as 3.1 and fails to use WiX 3.6+ compatible code
herrick
parents: 57213
diff changeset
   706
                + " Win64=\"yes\""
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   707
                + ">");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   708
        out.println(prefix + "  <CreateFolder/>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   709
        out.println(prefix + "  <RemoveFolder Id=\"RemoveDir"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   710
                + (id++) + "\" On=\"uninstall\" />");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   711
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   712
        boolean needRegistryKey = !MSI_SYSTEM_WIDE.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   713
        File imageRootDir = WIN_APP_IMAGE.fetchFrom(params);
57407
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57404
diff changeset
   714
        File launcherFile = new File(imageRootDir,
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57404
diff changeset
   715
                WinAppBundler.getLauncherRelativePath(params));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   716
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   717
        // Find out if we need to use registry. We need it if
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   718
        //  - we doing user level install as file can not serve as KeyPath
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   719
        //  - if we adding shortcut in this component
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   720
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   721
        for (File f: files) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   722
            boolean isLauncher = f.equals(launcherFile);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   723
            if (isLauncher) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   724
                needRegistryKey = true;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   725
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   726
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   727
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   728
        if (needRegistryKey) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   729
            // has to be under HKCU to make WiX happy
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   730
            out.println(prefix + "    <RegistryKey Root=\"HKCU\" "
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   731
                    + " Key=\"Software\\" + VENDOR.fetchFrom(params) + "\\"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   732
                    + APP_NAME.fetchFrom(params) + "\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   733
                    + (CAN_USE_WIX36.fetchFrom(params) ?
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   734
                    ">" : " Action=\"createAndRemoveOnUninstall\">"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   735
            out.println(prefix
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   736
                    + "     <RegistryValue Name=\"Version\" Value=\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   737
                    + VERSION.fetchFrom(params)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   738
                    + "\" Type=\"string\" KeyPath=\"yes\"/>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   739
            out.println(prefix + "   </RegistryKey>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   740
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   741
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   742
        boolean menuShortcut = MENU_HINT.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   743
        boolean desktopShortcut = SHORTCUT_HINT.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   744
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   745
        Map<String, String> idToFileMap = new TreeMap<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   746
        boolean launcherSet = false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   747
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   748
        for (File f : files) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   749
            boolean isLauncher = f.equals(launcherFile);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   750
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   751
            launcherSet = launcherSet || isLauncher;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   752
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   753
            boolean doShortcuts =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   754
                isLauncher && (menuShortcut || desktopShortcut);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   755
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   756
            String thisFileId = isLauncher ? LAUNCHER_ID : ("FileId" + (id++));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   757
            idToFileMap.put(f.getName(), thisFileId);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   758
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   759
            out.println(prefix + "   <File Id=\"" +
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   760
                    thisFileId + "\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   761
                    + " Name=\"" + f.getName() + "\" "
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   762
                    + " Source=\"" + relativePath(imageRootDir, f) + "\""
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57181
diff changeset
   763
                    + " ProcessorArchitecture=\"x64\"" + ">");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   764
            if (doShortcuts && desktopShortcut) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   765
                out.println(prefix
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   766
                        + "  <Shortcut Id=\"desktopShortcut\" Directory="
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   767
                        + "\"DesktopFolder\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   768
                        + " Name=\"" + APP_NAME.fetchFrom(params)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   769
                        + "\" WorkingDirectory=\"INSTALLDIR\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   770
                        + " Advertise=\"no\" Icon=\"DesktopIcon.exe\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   771
                        + " IconIndex=\"0\" />");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   772
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   773
            if (doShortcuts && menuShortcut) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   774
                out.println(prefix
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   775
                        + "     <Shortcut Id=\"ExeShortcut\" Directory="
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   776
                        + "\"ProgramMenuDir\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   777
                        + " Name=\"" + APP_NAME.fetchFrom(params)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   778
                        + "\" Advertise=\"no\" Icon=\"StartMenuIcon.exe\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   779
                        + " IconIndex=\"0\" />");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   780
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   781
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57254
diff changeset
   782
            List<Map<String, ? super Object>> addLaunchers =
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57254
diff changeset
   783
                    ADD_LAUNCHERS.fetchFrom(params);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57254
diff changeset
   784
            for (int i = 0; i < addLaunchers.size(); i++) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57254
diff changeset
   785
                Map<String, ? super Object> sl = addLaunchers.get(i);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57254
diff changeset
   786
                File addLauncherFile = new File(imageRootDir,
57407
2c14fbeff1dc 8225569: jpackage app-image layout
herrick
parents: 57404
diff changeset
   787
                        WinAppBundler.getLauncherRelativePath(sl));
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57254
diff changeset
   788
                if (f.equals(addLauncherFile)) {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   789
                    if (SHORTCUT_HINT.fetchFrom(sl)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   790
                        out.println(prefix
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   791
                                + "  <Shortcut Id=\"desktopShortcut"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   792
                                + i + "\" Directory=\"DesktopFolder\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   793
                                + " Name=\"" + APP_NAME.fetchFrom(sl)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   794
                                + "\" WorkingDirectory=\"INSTALLDIR\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   795
                                + " Advertise=\"no\" Icon=\"Launcher"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   796
                                + i + ".exe\" IconIndex=\"0\" />");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   797
                    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   798
                    if (MENU_HINT.fetchFrom(sl)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   799
                        out.println(prefix
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   800
                                + "     <Shortcut Id=\"ExeShortcut"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   801
                                + i + "\" Directory=\"ProgramMenuDir\""
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   802
                                + " Name=\"" + APP_NAME.fetchFrom(sl)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   803
                                + "\" Advertise=\"no\" Icon=\"Launcher"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   804
                                + i + ".exe\" IconIndex=\"0\" />");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   805
                        // Should we allow different menu groups?  Not for now.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   806
                    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   807
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   808
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   809
            out.println(prefix + "   </File>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   810
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   811
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   812
        if (launcherSet) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   813
            List<Map<String, ? super Object>> fileAssociations =
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   814
                FILE_ASSOCIATIONS.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   815
            String regName = APP_REGISTRY_NAME.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   816
            Set<String> defaultedMimes = new TreeSet<>();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   817
            int count = 0;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   818
            for (Map<String, ? super Object> fa : fileAssociations) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   819
                String description = FA_DESCRIPTION.fetchFrom(fa);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   820
                List<String> extensions = FA_EXTENSIONS.fetchFrom(fa);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   821
                List<String> mimeTypes = FA_CONTENT_TYPE.fetchFrom(fa);
57397
89549ecec1c7 8223212: Code cleanup found during jpackage review
herrick
parents: 57396
diff changeset
   822
                File icon = FA_ICON.fetchFrom(fa);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   823
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   824
                String mime = (mimeTypes == null ||
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   825
                    mimeTypes.isEmpty()) ? null : mimeTypes.get(0);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   826
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   827
                if (extensions == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   828
                    Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   829
                          "message.creating-association-with-null-extension"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   830
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   831
                    String entryName = regName + "File";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   832
                    if (count > 0) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   833
                        entryName += "." + count;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   834
                    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   835
                    count++;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   836
                    out.print(prefix + "   <ProgId Id='" + entryName
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   837
                            + "' Description='" + description + "'");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   838
                    if (icon != null && icon.exists()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   839
                        out.print(" Icon='" + idToFileMap.get(icon.getName())
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   840
                                + "' IconIndex='0'");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   841
                    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   842
                    out.println(" />");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   843
                } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   844
                    for (String ext : extensions) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   845
                        String entryName = regName + "File";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   846
                        if (count > 0) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   847
                            entryName += "." + count;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   848
                        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   849
                        count++;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   850
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   851
                        out.print(prefix + "   <ProgId Id='" + entryName
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   852
                                + "' Description='" + description + "'");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   853
                        if (icon != null && icon.exists()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   854
                            out.print(" Icon='"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   855
                                    + idToFileMap.get(icon.getName())
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   856
                                    + "' IconIndex='0'");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   857
                        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   858
                        out.println(">");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   859
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   860
                        if (extensions == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   861
                            Log.verbose(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   862
                            "message.creating-association-with-null-extension"));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   863
                        } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   864
                            out.print(prefix + "    <Extension Id='"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   865
                                    + ext + "' Advertise='no'");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   866
                            if (mime == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   867
                                out.println(">");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   868
                            } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   869
                                out.println(" ContentType='" + mime + "'>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   870
                                if (!defaultedMimes.contains(mime)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   871
                                    out.println(prefix
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   872
                                            + "      <MIME ContentType='"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   873
                                            + mime + "' Default='yes' />");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   874
                                    defaultedMimes.add(mime);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   875
                                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   876
                            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   877
                            out.println(prefix
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   878
                                    + "      <Verb Id='open' Command='Open' "
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   879
                                    + "TargetFile='" + LAUNCHER_ID
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   880
                                    + "' Argument='\"%1\"' />");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   881
                            out.println(prefix + "    </Extension>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   882
                        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   883
                        out.println(prefix + "   </ProgId>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   884
                    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   885
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   886
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   887
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   888
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   889
        out.println(prefix + " </Component>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   890
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   891
        for (File d : dirs) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   892
            out.println(prefix + " <Directory Id=\"dirid" + (id++)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   893
                    + "\" Name=\"" + d.getName() + "\">");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   894
            walkFileTree(params, d, out, prefix + " ");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   895
            out.println(prefix + " </Directory>");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   896
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   897
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   898
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   899
    void prepareContentList(Map<String, ? super Object> params)
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   900
            throws FileNotFoundException {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   901
        File f = new File(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   902
                CONFIG_ROOT.fetchFrom(params), MSI_PROJECT_CONTENT_FILE);
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   903
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   904
        try (PrintStream out = new PrintStream(f)) {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   905
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   906
            // opening
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   907
            out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   908
            out.println("<Include>");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   909
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   910
            out.println(" <Directory Id=\"TARGETDIR\" Name=\"SourceDir\">");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   911
            if (MSI_SYSTEM_WIDE.fetchFrom(params)) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   912
                // install to programfiles
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   913
                out.println("  <Directory Id=\"ProgramFiles64Folder\" "
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   914
                            + "Name=\"PFiles\">");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   915
            } else {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   916
                // install to user folder
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   917
                out.println(
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   918
                    "  <Directory Name=\"AppData\" Id=\"LocalAppDataFolder\">");
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   919
            }
57283
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
   920
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   921
            // We should get valid folder or subfolders
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   922
            String installDir = WINDOWS_INSTALL_DIR.fetchFrom(params);
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   923
            String [] installDirs = installDir.split(Pattern.quote("\\"));
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   924
            for (int i = 0; i < (installDirs.length - 1); i++)  {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   925
                out.println("   <Directory Id=\"SUBDIR" + i + "\" Name=\""
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   926
                    + installDirs[i] + "\">");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   927
            }
57283
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
   928
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   929
            out.println("   <Directory Id=\"APPLICATIONFOLDER\" Name=\""
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   930
                    + installDirs[installDirs.length - 1] + "\">");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   931
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   932
            // dynamic part
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   933
            id = 0;
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   934
            compId = 0; // reset counters
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   935
            walkFileTree(params, WIN_APP_IMAGE.fetchFrom(params), out, "    ");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   936
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   937
            // closing
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   938
            for (int i = 0; i < installDirs.length; i++)  {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   939
                out.println("   </Directory>");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   940
            }
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   941
            out.println("  </Directory>");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   942
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   943
            // for shortcuts
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   944
            if (SHORTCUT_HINT.fetchFrom(params)) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   945
                out.println("  <Directory Id=\"DesktopFolder\" />");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   946
            }
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   947
            if (MENU_HINT.fetchFrom(params)) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   948
                out.println("  <Directory Id=\"ProgramMenuFolder\">");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   949
                out.println("    <Directory Id=\"ProgramMenuDir\" Name=\""
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   950
                        + MENU_GROUP.fetchFrom(params) + "\">");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   951
                out.println("      <Component Id=\"comp" + (compId++) + "\""
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   952
                        + " Guid=\"" + UUID.randomUUID().toString() + "\""
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   953
                        + " Win64=\"yes\""
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   954
                        + ">");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   955
                out.println("        <RemoveFolder Id=\"ProgramMenuDir\" "
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   956
                        + "On=\"uninstall\" />");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   957
                // This has to be under HKCU to make WiX happy.
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   958
                // There are numberous discussions on this amoung WiX users
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   959
                // (if user A installs and user B uninstalls key is left behind)
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   960
                // there are suggested workarounds but none are appealing.
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   961
                // Leave it for now
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   962
                out.println(
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   963
                        "         <RegistryValue Root=\"HKCU\" Key=\"Software\\"
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   964
                        + VENDOR.fetchFrom(params) + "\\"
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   965
                        + APP_NAME.fetchFrom(params)
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   966
                        + "\" Type=\"string\" Value=\"\" />");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   967
                out.println("      </Component>");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   968
                out.println("    </Directory>");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   969
                out.println(" </Directory>");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   970
            }
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   971
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   972
            out.println(" </Directory>");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   973
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   974
            out.println(" <Feature Id=\"DefaultFeature\" "
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   975
                    + "Title=\"Main Feature\" Level=\"1\">");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   976
            for (int j = 0; j < compId; j++) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   977
                out.println("    <ComponentRef Id=\"comp" + j + "\" />");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   978
            }
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   979
            // component is defined in the main.wsx
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   980
            out.println(
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   981
                    "    <ComponentRef Id=\"CleanupMainApplicationFolder\" />");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   982
            out.println(" </Feature>");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57283
diff changeset
   983
            out.println("</Include>");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   984
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   985
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   986
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   987
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   988
    private File getConfig_ProjectFile(Map<String, ? super Object> params) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   989
        return new File(CONFIG_ROOT.fetchFrom(params),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   990
                APP_NAME.fetchFrom(params) + ".wxs");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   991
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   992
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   993
    private Map<String, String> prepareWiXConfig(
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   994
            Map<String, ? super Object> params) throws IOException {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   995
        prepareContentList(params);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   996
        prepareIconsFile(params);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
   997
        return prepareMainProjectFile(params);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   998
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   999
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1000
    private final static String MSI_PROJECT_CONTENT_FILE = "bundle.wxi";
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1001
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1002
    private File buildMSI(Map<String, ? super Object> params,
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1003
            Map<String, String> wixVars, File outdir)
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1004
            throws IOException {
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57254
diff changeset
  1005
        File tmpDir = new File(TEMP_ROOT.fetchFrom(params), "tmp");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1006
        File candleOut = new File(
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1007
                tmpDir, APP_NAME.fetchFrom(params) + ".wixobj");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1008
        File msiOut = new File(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1009
                outdir, INSTALLER_FILE_NAME.fetchFrom(params) + ".msi");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1010
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1011
        Log.verbose(MessageFormat.format(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1012
                "message.preparing-msi-config"), msiOut.getAbsolutePath()));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1013
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1014
        msiOut.getParentFile().mkdirs();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1015
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1016
        List<String> commandLine = new ArrayList<>(Arrays.asList(
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
  1017
                getCandlePath(),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1018
                "-nologo",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1019
                getConfig_ProjectFile(params).getAbsolutePath(),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1020
                "-ext", "WixUtilExtension",
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1021
                "-out", candleOut.getAbsolutePath()));
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1022
        for(Map.Entry<String, String> wixVar: wixVars.entrySet()) {
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1023
            String v = "-d" + wixVar.getKey() + "=" + wixVar.getValue();
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1024
            commandLine.add(v);
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1025
        }
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1026
        ProcessBuilder pb = new ProcessBuilder(commandLine);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1027
        pb = pb.directory(WIN_APP_IMAGE.fetchFrom(params));
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
  1028
        IOUtils.exec(pb);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1029
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1030
        Log.verbose(MessageFormat.format(I18N.getString(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1031
                "message.generating-msi"), msiOut.getAbsolutePath()));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1032
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1033
        boolean enableLicenseUI = (LICENSE_FILE.fetchFrom(params) != null);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1034
        boolean enableInstalldirUI = INSTALLDIR_CHOOSER.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1035
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1036
        commandLine = new ArrayList<>();
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1037
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57414
diff changeset
  1038
        commandLine.add(getLightPath());
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1039
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1040
        commandLine.add("-nologo");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1041
        commandLine.add("-spdb");
57473
3ef9726d7eec 8220807: excessive verbose output when running with --win-per-user-install
herrick
parents: 57438
diff changeset
  1042
        if (!MSI_SYSTEM_WIDE.fetchFrom(params)) {
3ef9726d7eec 8220807: excessive verbose output when running with --win-per-user-install
herrick
parents: 57438
diff changeset
  1043
            commandLine.add("-sice:ICE91");
3ef9726d7eec 8220807: excessive verbose output when running with --win-per-user-install
herrick
parents: 57438
diff changeset
  1044
        }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1045
        commandLine.add(candleOut.getAbsolutePath());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1046
        commandLine.add("-ext");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1047
        commandLine.add("WixUtilExtension");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1048
        if (enableLicenseUI || enableInstalldirUI) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1049
            commandLine.add("-ext");
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1050
            commandLine.add("WixUIExtension");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1051
        }
57254
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
  1052
57404
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1053
        commandLine.add("-loc");
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1054
        commandLine.add(new File(CONFIG_ROOT.fetchFrom(params), I18N.getString(
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1055
                "resource.wxl-file-name")).getAbsolutePath());
a477b26bf888 8223643: Provide better defined context for custom installer steps on Windows
herrick
parents: 57397
diff changeset
  1056
57254
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
  1057
        // Only needed if we using CA dll, so Wix can find it
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
  1058
        if (enableInstalldirUI) {
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
  1059
            commandLine.add("-b");
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
  1060
            commandLine.add(CONFIG_ROOT.fetchFrom(params).getAbsolutePath());
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
  1061
        }
c1b92a014e89 8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents: 57219
diff changeset
  1062
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1063
        commandLine.add("-out");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1064
        commandLine.add(msiOut.getAbsolutePath());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1065
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1066
        // create .msi
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1067
        pb = new ProcessBuilder(commandLine);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1068
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1069
        pb = pb.directory(WIN_APP_IMAGE.fetchFrom(params));
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57390
diff changeset
  1070
        IOUtils.exec(pb);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1071
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1072
        candleOut.delete();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1073
        IOUtils.deleteRecursive(tmpDir);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1074
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1075
        return msiOut;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1076
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1077
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1078
    public static void ensureByMutationFileIsRTF(File f) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1079
        if (f == null || !f.isFile()) return;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1080
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1081
        try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1082
            boolean existingLicenseIsRTF = false;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1083
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1084
            try (FileInputStream fin = new FileInputStream(f)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1085
                byte[] firstBits = new byte[7];
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1086
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1087
                if (fin.read(firstBits) == firstBits.length) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1088
                    String header = new String(firstBits);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1089
                    existingLicenseIsRTF = "{\\rtf1\\".equals(header);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1090
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1091
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1092
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1093
            if (!existingLicenseIsRTF) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1094
                List<String> oldLicense = Files.readAllLines(f.toPath());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1095
                try (Writer w = Files.newBufferedWriter(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1096
                        f.toPath(), Charset.forName("Windows-1252"))) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1097
                    w.write("{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1098
                            + "{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\n"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1099
                            + "\\viewkind4\\uc1\\pard\\sa200\\sl276"
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1100
                            + "\\slmult1\\lang9\\fs20 ");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1101
                    oldLicense.forEach(l -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1102
                        try {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1103
                            for (char c : l.toCharArray()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1104
                                // 0x00 <= ch < 0x20 Escaped (\'hh)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1105
                                // 0x20 <= ch < 0x80 Raw(non - escaped) char
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1106
                                // 0x80 <= ch <= 0xFF Escaped(\ 'hh)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1107
                                // 0x5C, 0x7B, 0x7D (special RTF characters
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1108
                                // \,{,})Escaped(\'hh)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1109
                                // ch > 0xff Escaped (\\ud###?)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1110
                                if (c < 0x10) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1111
                                    w.write("\\'0");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1112
                                    w.write(Integer.toHexString(c));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1113
                                } else if (c > 0xff) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1114
                                    w.write("\\ud");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1115
                                    w.write(Integer.toString(c));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1116
                                    // \\uc1 is in the header and in effect
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1117
                                    // so we trail with a replacement char if
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1118
                                    // the font lacks that character - '?'
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1119
                                    w.write("?");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1120
                                } else if ((c < 0x20) || (c >= 0x80) ||
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1121
                                        (c == 0x5C) || (c == 0x7B) ||
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1122
                                        (c == 0x7D)) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1123
                                    w.write("\\'");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1124
                                    w.write(Integer.toHexString(c));
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1125
                                } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1126
                                    w.write(c);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1127
                                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1128
                            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1129
                            // blank lines are interpreted as paragraph breaks
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1130
                            if (l.length() < 1) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1131
                                w.write("\\par");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1132
                            } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1133
                                w.write(" ");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1134
                            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1135
                            w.write("\r\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1136
                        } catch (IOException e) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1137
                            Log.verbose(e);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1138
                        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1139
                    });
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1140
                    w.write("}\r\n");
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1141
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1142
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1143
        } catch (IOException e) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1144
            Log.verbose(e);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1145
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1146
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1147
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
  1148
}