src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsBundlerParam.java
author herrick
Fri, 18 Oct 2019 14:14:37 -0400
branchJDK-8200758-branch
changeset 58696 61c44899b4eb
parent 57806 91f8eec58086
permissions -rw-r--r--
8223325: Improve wix sources generated by jpackage Submitted-by: asemenyuk Reviewed-by: aherrick, almatvee
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     1
/*
57106
ea870b9ce89a 8216492: Update copyright of all new jpackage fils to 2019
kcr
parents: 57091
diff changeset
     2
 * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     4
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    10
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    15
 * accompanied this code).
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    16
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    20
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    23
 * questions.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    24
 */
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    25
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    26
package jdk.jpackage.internal;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    27
57283
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    28
import java.text.MessageFormat;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    29
import java.util.Map;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    30
import java.util.ResourceBundle;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    31
import java.util.function.BiFunction;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    32
import java.util.function.Function;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    33
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    34
class WindowsBundlerParam<T> extends StandardBundlerParam<T> {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    35
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    36
    private static final ResourceBundle I18N = ResourceBundle.getBundle(
57059
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
    37
            "jdk.jpackage.internal.resources.WinResources");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    38
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
    39
    WindowsBundlerParam(String id, Class<T> valueType,
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    40
            Function<Map<String, ? super Object>, T> defaultValueFunction,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    41
            BiFunction<String,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    42
            Map<String, ? super Object>, T> stringConverter) {
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
    43
        super(id, valueType, defaultValueFunction, stringConverter);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    44
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    45
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    46
    static final BundlerParamInfo<String> INSTALLER_FILE_NAME =
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    47
            new StandardBundlerParam<> (
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    48
            "win.installerName",
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    49
            String.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    50
            params -> {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    51
                String nm = APP_NAME.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    52
                if (nm == null) return null;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    53
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    54
                String version = VERSION.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    55
                if (version == null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    56
                    return nm;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    57
                } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    58
                    return nm + "-" + version;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    59
                }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    60
            },
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    61
            (s, p) -> s);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    62
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    63
    static final StandardBundlerParam<String> MENU_GROUP =
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    64
            new StandardBundlerParam<>(
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    65
                    Arguments.CLIOptions.WIN_MENU_GROUP.getId(),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    66
                    String.class,
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
    67
                    params -> I18N.getString("param.menu-group.default"),
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    68
                    (s, p) -> s
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    69
            );
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    70
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    71
    static final BundlerParamInfo<Boolean> INSTALLDIR_CHOOSER =
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    72
            new StandardBundlerParam<> (
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    73
            Arguments.CLIOptions.WIN_DIR_CHOOSER.getId(),
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    74
            Boolean.class,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    75
            params -> Boolean.FALSE,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    76
            (s, p) -> Boolean.valueOf(s)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    77
    );
57283
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    78
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    79
    static final BundlerParamInfo<String> WINDOWS_INSTALL_DIR =
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    80
            new StandardBundlerParam<>(
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    81
            "windows-install-dir",
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    82
            String.class,
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    83
            params -> {
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    84
                 String dir = INSTALL_DIR.fetchFrom(params);
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    85
                 if (dir != null) {
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    86
                     if (dir.contains(":") || dir.contains("..")) {
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    87
                         Log.error(MessageFormat.format(I18N.getString(
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    88
                                "message.invalid.install.dir"), dir,
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    89
                                APP_NAME.fetchFrom(params)));
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    90
                     } else {
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    91
                        if (dir.startsWith("\\")) {
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    92
                             dir = dir.substring(1);
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    93
                        }
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    94
                        if (dir.endsWith("\\")) {
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    95
                             dir = dir.substring(0, dir.length() - 1);
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    96
                        }
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    97
                        return dir;
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    98
                     }
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
    99
                 }
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
   100
                 return APP_NAME.fetchFrom(params); // Default to app name
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
   101
             },
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
   102
            (s, p) -> s
0b0be19f79e4 8215019: Allow --install-dir on windows
herrick
parents: 57256
diff changeset
   103
    );
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   104
}