src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java
author herrick
Fri, 08 Nov 2019 14:53:03 -0500
branchJDK-8200758-branch
changeset 58994 b09ba68c6a19
parent 58992 src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java@7249e95cc439
permissions -rw-r--r--
8233636 : Make jpackage an incubator and remove tool provider implementation Reviewed-by: asemenyuk, almatvee, kcr
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     1
/*
57106
ea870b9ce89a 8216492: Update copyright of all new jpackage fils to 2019
kcr
parents: 57070
diff changeset
     2
 * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     4
 *
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    10
 *
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    15
 * accompanied this code).
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    16
 *
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    20
 *
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    23
 * questions.
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    24
 */
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    25
58994
b09ba68c6a19 8233636 : Make jpackage an incubator and remove tool provider implementation
herrick
parents: 58992
diff changeset
    26
package jdk.incubator.jpackage.internal;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    27
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    28
import java.io.File;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    29
import java.io.IOException;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    30
import java.io.StringReader;
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    31
import java.io.PrintWriter;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    32
import java.io.StringWriter;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    33
import java.nio.file.Files;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    34
import java.nio.file.Path;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    35
import java.text.MessageFormat;
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    36
import java.util.ArrayList;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    37
import java.util.Collection;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    38
import java.util.Collections;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    39
import java.util.EnumSet;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    40
import java.util.HashMap;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    41
import java.util.HashSet;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    42
import java.util.Iterator;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    43
import java.util.LinkedHashMap;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    44
import java.util.LinkedHashSet;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    45
import java.util.List;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    46
import java.util.Map;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    47
import java.util.Properties;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    48
import java.util.ResourceBundle;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    49
import java.util.Set;
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
    50
import java.util.Optional;
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
    51
import java.util.Arrays;
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
    52
import java.util.stream.Collectors;
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
    53
import java.util.stream.Stream;
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    54
import java.util.regex.Matcher;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    55
import java.util.spi.ToolProvider;
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
    56
import java.util.jar.JarFile;
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
    57
import java.lang.module.Configuration;
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
    58
import java.lang.module.ResolvedModule;
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
    59
import java.lang.module.ModuleDescriptor;
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
    60
import java.lang.module.ModuleFinder;
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
    61
import java.lang.module.ModuleReference;
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
    62
import jdk.internal.module.ModulePath;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    63
58994
b09ba68c6a19 8233636 : Make jpackage an incubator and remove tool provider implementation
herrick
parents: 58992
diff changeset
    64
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    65
final class JLinkBundlerHelper {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    66
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    67
    private static final ResourceBundle I18N = ResourceBundle.getBundle(
58994
b09ba68c6a19 8233636 : Make jpackage an incubator and remove tool provider implementation
herrick
parents: 58992
diff changeset
    68
            "jdk.incubator.jpackage.internal.resources.MainResources");
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    69
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    70
    static final ToolProvider JLINK_TOOL =
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    71
            ToolProvider.findFirst("jlink").orElseThrow();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    72
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    73
    static File getMainJar(Map<String, ? super Object> params) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    74
        File result = null;
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    75
        RelativeFileSet fileset =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    76
                StandardBundlerParam.MAIN_JAR.fetchFrom(params);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    77
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    78
        if (fileset != null) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    79
            String filename = fileset.getIncludedFiles().iterator().next();
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    80
            result = fileset.getBaseDirectory().toPath().
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    81
                    resolve(filename).toFile();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    82
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    83
            if (result == null || !result.exists()) {
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    84
                String srcdir =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    85
                    StandardBundlerParam.SOURCE_DIR.fetchFrom(params);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    86
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    87
                if (srcdir != null) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    88
                    result = new File(srcdir + File.separator + filename);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    89
                }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    90
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    91
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    92
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    93
        return result;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    94
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    95
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
    96
    static String getMainClassFromModule(Map<String, ? super Object> params) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    97
        String mainModule = StandardBundlerParam.MODULE.fetchFrom(params);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    98
        if (mainModule != null)  {
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
    99
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   100
            int index = mainModule.indexOf("/");
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   101
            if (index > 0) {
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
   102
                return mainModule.substring(index + 1);
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   103
            } else {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   104
                ModuleDescriptor descriptor =
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   105
                        JLinkBundlerHelper.getMainModuleDescription(params);
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   106
                if (descriptor != null) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   107
                    Optional<String> mainClass = descriptor.mainClass();
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   108
                    if (mainClass.isPresent()) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   109
                        Log.verbose(MessageFormat.format(I18N.getString(
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   110
                                    "message.module-class"),
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   111
                                    mainClass.get(),
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   112
                                    JLinkBundlerHelper.getMainModule(params)));
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
   113
                        return mainClass.get();
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   114
                    }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   115
                }
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   116
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   117
        }
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
   118
        return null;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   119
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   120
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   121
    static String getMainModule(Map<String, ? super Object> params) {
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   122
        String result = null;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   123
        String mainModule = StandardBundlerParam.MODULE.fetchFrom(params);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   124
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   125
        if (mainModule != null) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   126
            int index = mainModule.indexOf("/");
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   127
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   128
            if (index > 0) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   129
                result = mainModule.substring(0, index);
57125
846d4865b362 8217793: Modular jars in jpackage are not working
herrick
parents: 57106
diff changeset
   130
            } else {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   131
                result = mainModule;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   132
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   133
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   134
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   135
        return result;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   136
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   137
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   138
    static void execute(Map<String, ? super Object> params,
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   139
            AbstractAppImageBuilder imageBuilder)
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   140
            throws IOException, Exception {
57389
cce526c681dc 8222901: different behavior when --name option not used
herrick
parents: 57348
diff changeset
   141
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   142
        List<Path> modulePath =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   143
                StandardBundlerParam.MODULE_PATH.fetchFrom(params);
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   144
        Set<String> addModules =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   145
                StandardBundlerParam.ADD_MODULES.fetchFrom(params);
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   146
        Set<String> limitModules =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   147
                StandardBundlerParam.LIMIT_MODULES.fetchFrom(params);
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 57789
diff changeset
   148
        Path outputDir = imageBuilder.getRuntimeRoot();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   149
        File mainJar = getMainJar(params);
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   150
        ModFile.ModType mainJarType = ModFile.ModType.Unknown;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   151
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   152
        if (mainJar != null) {
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   153
            mainJarType = new ModFile(mainJar).getModType();
57052
92cdab03fb81 8214070: Analyze and Fix issues reported by Parfait
herrick
parents: 57039
diff changeset
   154
        } else if (StandardBundlerParam.MODULE.fetchFrom(params) == null) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   155
            // user specified only main class, all jars will be on the classpath
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   156
            mainJarType = ModFile.ModType.UnnamedJar;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   157
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   158
58992
7249e95cc439 8233594: create a new option --bind-servces to pass on to jlink
herrick
parents: 58889
diff changeset
   159
        boolean bindServices =
7249e95cc439 8233594: create a new option --bind-servces to pass on to jlink
herrick
parents: 58889
diff changeset
   160
                StandardBundlerParam.BIND_SERVICES.fetchFrom(params);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   161
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   162
        // Modules
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   163
        String mainModule = getMainModule(params);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   164
        if (mainModule == null) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   165
            if (mainJarType == ModFile.ModType.UnnamedJar) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   166
                if (addModules.isEmpty()) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   167
                    // The default for an unnamed jar is ALL_DEFAULT
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   168
                    addModules.add(ModuleHelper.ALL_DEFAULT);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   169
                }
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   170
            } else if (mainJarType == ModFile.ModType.Unknown ||
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   171
                    mainJarType == ModFile.ModType.ModularJar) {
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   172
                addModules.add(ModuleHelper.ALL_DEFAULT);
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   173
            }
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   174
        }
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   175
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   176
        Set<String> modules = new ModuleHelper(
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   177
                modulePath, addModules, limitModules).modules();
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   178
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   179
        if (mainModule != null) {
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   180
            modules.add(mainModule);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   181
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   182
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   183
        runJLink(outputDir, modulePath, modules, limitModules,
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57389
diff changeset
   184
                new HashMap<String,String>(), bindServices);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   185
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57438
diff changeset
   186
        imageBuilder.prepareApplicationFiles(params);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   187
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   188
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   189
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   190
    // Returns the path to the JDK modules in the user defined module path.
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   191
    static Path findPathOfModule( List<Path> modulePath, String moduleName) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   192
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   193
        for (Path path : modulePath) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   194
            Path moduleNamePath = path.resolve(moduleName);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   195
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   196
            if (Files.exists(moduleNamePath)) {
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   197
                return path;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   198
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   199
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   200
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   201
        return null;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   202
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   203
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   204
    static ModuleDescriptor getMainModuleDescription(Map<String, ? super Object> params) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   205
        boolean hasModule = params.containsKey(StandardBundlerParam.MODULE.getID());
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   206
        if (hasModule) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   207
            List<Path> modulePath = StandardBundlerParam.MODULE_PATH.fetchFrom(params);
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   208
            if (!modulePath.isEmpty()) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   209
                ModuleFinder finder = ModuleFinder.of(modulePath.toArray(new Path[0]));
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   210
                String mainModule = JLinkBundlerHelper.getMainModule(params);
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   211
                Optional<ModuleReference> omref = finder.find(mainModule);
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   212
                if (omref.isPresent()) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   213
                    return omref.get().descriptor();
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   214
                }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   215
            }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   216
        }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   217
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   218
        return null;
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   219
    }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   220
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   221
    /*
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   222
     * Returns the set of modules that would be visible by default for
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   223
     * a non-modular-aware application consisting of the given elements.
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   224
     */
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   225
    private static Set<String> getDefaultModules(
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   226
            Collection<Path> paths, Collection<String> addModules) {
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   227
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   228
        // the modules in the run-time image that export an API
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   229
        Stream<String> systemRoots = ModuleFinder.ofSystem().findAll().stream()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   230
                .map(ModuleReference::descriptor)
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   231
                .filter(JLinkBundlerHelper::exportsAPI)
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   232
                .map(ModuleDescriptor::name);
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   233
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   234
        Set<String> roots = Stream.concat(systemRoots,
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   235
                 addModules.stream()).collect(Collectors.toSet());
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   236
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   237
        ModuleFinder finder = createModuleFinder(paths);
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   238
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   239
        return Configuration.empty()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   240
                .resolveAndBind(finder, ModuleFinder.of(), roots)
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   241
                .modules()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   242
                .stream()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   243
                .map(ResolvedModule::name)
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   244
                .collect(Collectors.toSet());
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   245
    }
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   246
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   247
    /*
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   248
     * Returns true if the given module exports an API to all module.
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   249
     */
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   250
    private static boolean exportsAPI(ModuleDescriptor descriptor) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   251
        return descriptor.exports()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   252
                .stream()
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   253
                .anyMatch(e -> !e.isQualified());
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   254
    }
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   255
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   256
    private static ModuleFinder createModuleFinder(Collection<Path> modulePath) {
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   257
        return ModuleFinder.compose(
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   258
                ModulePath.of(JarFile.runtimeVersion(), true,
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   259
                        modulePath.toArray(Path[]::new)),
58466
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   260
                ModuleFinder.ofSystem());
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   261
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   262
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   263
    private static class ModuleHelper {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   264
        // The token for "all modules on the module path".
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   265
        private static final String ALL_MODULE_PATH = "ALL-MODULE-PATH";
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   266
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
   267
        // The token for "all valid runtime modules".
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   268
        static final String ALL_DEFAULT = "ALL-DEFAULT";
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   269
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   270
        private final Set<String> modules = new HashSet<>();
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   271
        ModuleHelper(List<Path> paths, Set<String> addModules,
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   272
                Set<String> limitModules) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   273
            boolean addAllModulePath = false;
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   274
            boolean addDefaultMods = false;
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   275
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   276
            for (Iterator<String> iterator = addModules.iterator();
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   277
                    iterator.hasNext();) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   278
                String module = iterator.next();
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   279
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   280
                switch (module) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   281
                    case ALL_MODULE_PATH:
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   282
                        iterator.remove();
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   283
                        addAllModulePath = true;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   284
                        break;
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   285
                    case ALL_DEFAULT:
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   286
                        iterator.remove();
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   287
                        addDefaultMods = true;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   288
                        break;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   289
                    default:
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   290
                        this.modules.add(module);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   291
                }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   292
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   293
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   294
            if (addAllModulePath) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   295
                this.modules.addAll(getModuleNamesFromPath(paths));
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   296
            } else if (addDefaultMods) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   297
                this.modules.addAll(getDefaultModules(
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   298
                        paths, addModules));
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   299
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   300
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   301
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   302
        Set<String> modules() {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   303
            return modules;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   304
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   305
58466
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   306
        private static Set<String> getModuleNamesFromPath(List<Path> paths) {
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
   307
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   308
            return createModuleFinder(paths)
58466
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   309
                    .findAll()
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   310
                    .stream()
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   311
                    .map(ModuleReference::descriptor)
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   312
                    .map(ModuleDescriptor::name)
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   313
                    .collect(Collectors.toSet());
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   314
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   315
    }
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   316
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   317
    private static void runJLink(Path output, List<Path> modulePath,
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57389
diff changeset
   318
            Set<String> modules, Set<String> limitModules,
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   319
            HashMap<String, String> user, boolean bindServices)
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   320
            throws PackagerException {
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   321
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   322
        // This is just to ensure jlink is given a non-existant directory
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   323
        // The passed in output path should be non-existant or empty directory
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   324
        try {
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   325
            IOUtils.deleteRecursive(output.toFile());
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   326
        } catch (IOException ioe) {
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   327
            throw new PackagerException(ioe);
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   328
        }
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   329
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   330
        ArrayList<String> args = new ArrayList<String>();
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   331
        args.add("--output");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   332
        args.add(output.toString());
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   333
        if (modulePath != null && !modulePath.isEmpty()) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   334
            args.add("--module-path");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   335
            args.add(getPathList(modulePath));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   336
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   337
        if (modules != null && !modules.isEmpty()) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   338
            args.add("--add-modules");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   339
            args.add(getStringList(modules));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   340
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   341
        if (limitModules != null && !limitModules.isEmpty()) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   342
            args.add("--limit-modules");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   343
            args.add(getStringList(limitModules));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   344
        }
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   345
        if (user != null && !user.isEmpty()) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   346
            for (Map.Entry<String, String> entry : user.entrySet()) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   347
                args.add(entry.getKey());
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   348
                args.add(entry.getValue());
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   349
            }
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   350
        } else {
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   351
            args.add("--strip-native-commands");
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   352
            args.add("--strip-debug");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   353
            args.add("--no-man-pages");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   354
            args.add("--no-header-files");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   355
            if (bindServices) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   356
                args.add("--bind-services");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   357
            }
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   358
        }
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   359
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   360
        StringWriter writer = new StringWriter();
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   361
        PrintWriter pw = new PrintWriter(writer);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   362
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   363
        Log.verbose("jlink arguments: " + args);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   364
        int retVal = JLINK_TOOL.run(pw, pw, args.toArray(new String[0]));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   365
        String jlinkOut = writer.toString();
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   366
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   367
        if (retVal != 0) {
58889
f04c0704a006 8233265: jpackage --add-modules cannot find additional modules with non-modular app
herrick
parents: 58695
diff changeset
   368
            throw new PackagerException("error.jlink.failed" , jlinkOut);
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   369
        } else if (jlinkOut.length() > 0) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   370
            Log.verbose("jlink output: " + jlinkOut);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   371
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   372
    }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   373
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   374
    private static String getPathList(List<Path> pathList) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   375
        String ret = null;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   376
        for (Path p : pathList) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   377
            String s =  Matcher.quoteReplacement(p.toString());
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   378
            if (ret == null) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   379
                ret = s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   380
            } else {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   381
                ret += File.pathSeparator +  s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   382
            }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   383
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   384
        return ret;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   385
    }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   386
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   387
    private static String getStringList(Set<String> strings) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   388
        String ret = null;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   389
        for (String s : strings) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   390
            if (ret == null) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   391
                ret = s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   392
            } else {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   393
                ret += "," + s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   394
            }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   395
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   396
        return (ret == null) ? null : Matcher.quoteReplacement(ret);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   397
    }
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   398
}