src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
author herrick
Fri, 18 Oct 2019 11:00:57 -0400
branchJDK-8200758-branch
changeset 58695 64adf683bc7b
parent 58647 2c43b89b1679
permissions -rw-r--r--
8232281: jpackage is not always reporting an error when no main class specified Reviewed-by: asemenyuk, asemenuk
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: 57099
diff changeset
     2
 * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     4
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    10
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    15
 * accompanied this code).
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    16
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    20
 *
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    23
 * questions.
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    24
 */
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    25
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    26
package jdk.jpackage.internal;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    27
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    28
import java.io.ByteArrayOutputStream;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    29
import java.io.File;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    30
import java.io.FileInputStream;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    31
import java.io.IOException;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    32
import java.io.InputStream;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    33
import java.io.PrintStream;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    34
import java.nio.file.Files;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    35
import java.nio.file.Path;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    36
import java.text.MessageFormat;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    37
import java.util.List;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    38
import java.util.Map;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    39
import java.util.ResourceBundle;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    40
import java.util.ArrayList;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    41
57091
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57078
diff changeset
    42
import jdk.jpackage.internal.resources.ResourceLocator;
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57078
diff changeset
    43
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    44
import static jdk.jpackage.internal.StandardBundlerParam.*;
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    45
57392
46d4b0aa4542 8223241: jpackage cleanup from code review
herrick
parents: 57391
diff changeset
    46
/*
46d4b0aa4542 8223241: jpackage cleanup from code review
herrick
parents: 57391
diff changeset
    47
 * AbstractAppImageBuilder
46d4b0aa4542 8223241: jpackage cleanup from code review
herrick
parents: 57391
diff changeset
    48
 *     This is sub-classed by each of the platform dependent AppImageBuilder
57909
c7de06ed4b54 8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents: 57789
diff changeset
    49
 * classes, and contains resource processing code common to all platforms.
57392
46d4b0aa4542 8223241: jpackage cleanup from code review
herrick
parents: 57391
diff changeset
    50
 */
46d4b0aa4542 8223241: jpackage cleanup from code review
herrick
parents: 57391
diff changeset
    51
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    52
public abstract class AbstractAppImageBuilder {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    53
57059
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
    54
    private static final ResourceBundle I18N = ResourceBundle.getBundle(
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57039
diff changeset
    55
            "jdk.jpackage.internal.resources.MainResources");
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    56
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    57
    private final Path root;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    58
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57393
diff changeset
    59
    public AbstractAppImageBuilder(Map<String, Object> unused, Path root) {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    60
        this.root = root;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    61
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    62
57091
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57078
diff changeset
    63
    public InputStream getResourceAsStream(String name) {
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57078
diff changeset
    64
        return ResourceLocator.class.getResourceAsStream(name);
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57078
diff changeset
    65
    }
06bc4bd64599 8215515: Add a command line option to override internal resources.
herrick
parents: 57078
diff changeset
    66
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57687
diff changeset
    67
    public abstract void prepareApplicationFiles(
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57687
diff changeset
    68
            Map<String, ? super Object> params) throws IOException;
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57687
diff changeset
    69
    public abstract void prepareJreFiles(
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57687
diff changeset
    70
            Map<String, ? super Object> params) throws IOException;
57077
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
    71
    public abstract Path getAppDir();
8f9cf6ad59f0 8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents: 57070
diff changeset
    72
    public abstract Path getAppModsDir();
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    73
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 57909
diff changeset
    74
    public Path getRuntimeRoot() {
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    75
        return this.root;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    76
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    77
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    78
    protected void copyEntry(Path appDir, File srcdir, String fname)
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    79
            throws IOException {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    80
        Path dest = appDir.resolve(fname);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    81
        Files.createDirectories(dest.getParent());
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    82
        File src = new File(srcdir, fname);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    83
        if (src.isDirectory()) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    84
            IOUtils.copyRecursive(src.toPath(), dest);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    85
        } else {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    86
            Files.copy(src.toPath(), dest);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    87
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    88
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    89
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    90
    public void writeCfgFile(Map<String, ? super Object> params,
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
    91
            File cfgFileName) throws IOException {
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 57909
diff changeset
    92
        cfgFileName.getParentFile().mkdirs();
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    93
        cfgFileName.delete();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    94
        File mainJar = JLinkBundlerHelper.getMainJar(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    95
        ModFile.ModType mainJarType = ModFile.ModType.Unknown;
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    96
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    97
        if (mainJar != null) {
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    98
            mainJarType = new ModFile(mainJar).getModType();
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
    99
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   100
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   101
        String mainModule = StandardBundlerParam.MODULE.fetchFrom(params);
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   102
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   103
        try (PrintStream out = new PrintStream(cfgFileName)) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   104
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   105
            out.println("[Application]");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   106
            out.println("app.name=" + APP_NAME.fetchFrom(params));
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   107
            out.println("app.version=" + VERSION.fetchFrom(params));
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   108
            out.println("app.runtime=" + getCfgRuntimeDir());
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   109
            out.println("app.identifier=" + IDENTIFIER.fetchFrom(params));
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   110
            out.println("app.classpath="
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   111
                    + getCfgClassPath(CLASSPATH.fetchFrom(params)));
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   112
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   113
            // The main app is required to be a jar, modular or unnamed.
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   114
            if (mainModule != null &&
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   115
                    (mainJarType == ModFile.ModType.Unknown ||
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   116
                    mainJarType == ModFile.ModType.ModularJar)) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   117
                out.println("app.mainmodule=" + mainModule);
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   118
            } else {
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58647
diff changeset
   119
                String mainClass =
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58647
diff changeset
   120
                        StandardBundlerParam.MAIN_CLASS.fetchFrom(params);
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   121
                // If the app is contained in an unnamed jar then launch it the
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   122
                // legacy way and the main class string must be
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   123
                // of the format com/foo/Main
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   124
                if (mainJar != null) {
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   125
                    out.println("app.mainjar=" + getCfgAppDir()
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   126
                            + mainJar.toPath().getFileName().toString());
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   127
                }
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   128
                if (mainClass != null) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   129
                    out.println("app.mainclass="
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   130
                            + mainClass.replace("\\", "/"));
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   131
                }
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   132
            }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   133
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   134
            out.println();
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   135
            out.println("[JavaOptions]");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   136
            List<String> jvmargs = JAVA_OPTIONS.fetchFrom(params);
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   137
            for (String arg : jvmargs) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   138
                out.println(arg);
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   139
            }
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   140
            Path modsDir = getAppModsDir();
57446
5a5b85f00a63 8226891: rename and re-layout jpackage tests.
herrick
parents: 57445
diff changeset
   141
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   142
            if (modsDir != null && modsDir.toFile().exists()) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   143
                out.println("--module-path");
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   144
                out.println(getCfgAppDir().replace("\\","/") + "mods");
57390
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   145
            }
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   146
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   147
            out.println();
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   148
            out.println("[ArgOptions]");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   149
            List<String> args = ARGUMENTS.fetchFrom(params);
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   150
            for (String arg : args) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   151
                if (arg.endsWith("=") &&
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   152
                        (arg.indexOf("=") == arg.lastIndexOf("="))) {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   153
                    out.print(arg.substring(0, arg.length() - 1));
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   154
                    out.println("\\=");
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   155
                } else {
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   156
                    out.println(arg);
1cb722a11ead 8223333: Use try-with-resources where feasible
herrick
parents: 57323
diff changeset
   157
                }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   158
            }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   159
        }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   160
    }
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   161
57687
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   162
    File getRuntimeImageDir(File runtimeImageTop) {
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   163
        return runtimeImageTop;
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   164
    }
c56bbf4aaf98 JDK-8224788: jpackage fails on OS X when using --runtime-image
herrick
parents: 57450
diff changeset
   165
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 57909
diff changeset
   166
    protected String getCfgAppDir() {
58538
12c965587689 8231910: Expose the APPDIR variable to applications that use jpackage
herrick
parents: 58302
diff changeset
   167
        return "$ROOTDIR" + File.separator
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   168
                + getAppDir().getFileName() + File.separator;
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   169
    }
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   170
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 57909
diff changeset
   171
    protected String getCfgRuntimeDir() {
58538
12c965587689 8231910: Expose the APPDIR variable to applications that use jpackage
herrick
parents: 58302
diff changeset
   172
        return "$ROOTDIR" + File.separator + "runtime";
57450
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   173
    }
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   174
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   175
    String getCfgClassPath(String classpath) {
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   176
        String cfgAppDir = getCfgAppDir();
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   177
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   178
        StringBuilder sb = new StringBuilder();
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   179
        for (String path : classpath.split("[:;]")) {
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   180
            if (path.length() > 0) {
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   181
                sb.append(cfgAppDir);
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   182
                sb.append(path);
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   183
                sb.append(File.pathSeparator);
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   184
            }
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   185
        }
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   186
        if (sb.length() > 0) {
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   187
            sb.deleteCharAt(sb.length() - 1);
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   188
        }
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   189
        return sb.toString();
82c78b40b39d 8227058: Regressions related to no longer setting user.dir
herrick
parents: 57446
diff changeset
   190
    }
57038
b0f09e7c4680 8213963: Flatten out jpackager packages and resources
herrick
parents:
diff changeset
   191
}