src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java
author herrick
Fri, 18 Oct 2019 11:00:57 -0400
branchJDK-8200758-branch
changeset 58695 64adf683bc7b
parent 58466 47f0d21c7e8d
child 58889 f04c0704a006
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:
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
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    26
package jdk.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;
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
    56
import java.lang.module.Configuration;
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
    57
import java.lang.module.ResolvedModule;
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
    58
import java.lang.module.ModuleDescriptor;
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
    59
import java.lang.module.ModuleFinder;
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
    60
import java.lang.module.ModuleReference;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    61
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    62
final class JLinkBundlerHelper {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    63
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    64
    private static final ResourceBundle I18N = ResourceBundle.getBundle(
57059
9bb2a4dc3af7 8214143: Reduce Resource files
herrick
parents: 57052
diff changeset
    65
            "jdk.jpackage.internal.resources.MainResources");
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    66
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    67
    static final ToolProvider JLINK_TOOL =
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    68
            ToolProvider.findFirst("jlink").orElseThrow();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    69
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    70
    static File getMainJar(Map<String, ? super Object> params) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    71
        File result = null;
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    72
        RelativeFileSet fileset =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    73
                StandardBundlerParam.MAIN_JAR.fetchFrom(params);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    74
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    75
        if (fileset != null) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    76
            String filename = fileset.getIncludedFiles().iterator().next();
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    77
            result = fileset.getBaseDirectory().toPath().
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    78
                    resolve(filename).toFile();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    79
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    80
            if (result == null || !result.exists()) {
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    81
                String srcdir =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
    82
                    StandardBundlerParam.SOURCE_DIR.fetchFrom(params);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    83
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    84
                if (srcdir != null) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    85
                    result = new File(srcdir + File.separator + filename);
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
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    88
        }
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
        return result;
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
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
    93
    static String getMainClassFromModule(Map<String, ? super Object> params) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    94
        String mainModule = StandardBundlerParam.MODULE.fetchFrom(params);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    95
        if (mainModule != null)  {
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
    96
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    97
            int index = mainModule.indexOf("/");
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    98
            if (index > 0) {
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
    99
                return mainModule.substring(index + 1);
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   100
            } else {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   101
                ModuleDescriptor descriptor =
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   102
                        JLinkBundlerHelper.getMainModuleDescription(params);
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   103
                if (descriptor != null) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   104
                    Optional<String> mainClass = descriptor.mainClass();
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   105
                    if (mainClass.isPresent()) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   106
                        Log.verbose(MessageFormat.format(I18N.getString(
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   107
                                    "message.module-class"),
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   108
                                    mainClass.get(),
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   109
                                    JLinkBundlerHelper.getMainModule(params)));
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
   110
                        return mainClass.get();
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   111
                    }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   112
                }
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   113
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   114
        }
58695
64adf683bc7b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58466
diff changeset
   115
        return null;
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
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   118
    static String getMainModule(Map<String, ? super Object> params) {
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   119
        String result = null;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   120
        String mainModule = StandardBundlerParam.MODULE.fetchFrom(params);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   121
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   122
        if (mainModule != null) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   123
            int index = mainModule.indexOf("/");
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 (index > 0) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   126
                result = mainModule.substring(0, index);
57125
846d4865b362 8217793: Modular jars in jpackage are not working
herrick
parents: 57106
diff changeset
   127
            } else {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   128
                result = mainModule;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   129
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   130
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   131
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   132
        return result;
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
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
   135
    private static Set<String> getValidModules(List<Path> modulePath,
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   136
            Set<String> addModules, Set<String> limitModules) {
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   137
        ModuleHelper moduleHelper = new ModuleHelper(
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   138
                modulePath, addModules, limitModules);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   139
        return removeInvalidModules(modulePath, moduleHelper.modules());
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   140
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   141
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   142
    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
   143
            AbstractAppImageBuilder imageBuilder)
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   144
            throws IOException, Exception {
57389
cce526c681dc 8222901: different behavior when --name option not used
herrick
parents: 57348
diff changeset
   145
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   146
        List<Path> modulePath =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   147
                StandardBundlerParam.MODULE_PATH.fetchFrom(params);
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   148
        Set<String> addModules =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   149
                StandardBundlerParam.ADD_MODULES.fetchFrom(params);
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   150
        Set<String> limitModules =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   151
                StandardBundlerParam.LIMIT_MODULES.fetchFrom(params);
58302
718bd56695b3 8231277 : Adjust Linux application image layout
herrick
parents: 57789
diff changeset
   152
        Path outputDir = imageBuilder.getRuntimeRoot();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   153
        File mainJar = getMainJar(params);
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   154
        ModFile.ModType mainJarType = ModFile.ModType.Unknown;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   155
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   156
        if (mainJar != null) {
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   157
            mainJarType = new ModFile(mainJar).getModType();
57052
92cdab03fb81 8214070: Analyze and Fix issues reported by Parfait
herrick
parents: 57039
diff changeset
   158
        } else if (StandardBundlerParam.MODULE.fetchFrom(params) == null) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   159
            // 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
   160
            mainJarType = ModFile.ModType.UnnamedJar;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   161
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   162
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   163
        boolean bindServices = addModules.isEmpty();
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   164
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   165
        // Modules
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   166
        String mainModule = getMainModule(params);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   167
        if (mainModule == null) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   168
            if (mainJarType == ModFile.ModType.UnnamedJar) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   169
                if (addModules.isEmpty()) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   170
                    // The default for an unnamed jar is ALL_DEFAULT
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   171
                    addModules.add(ModuleHelper.ALL_DEFAULT);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   172
                }
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   173
            } else if (mainJarType == ModFile.ModType.Unknown ||
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   174
                    mainJarType == ModFile.ModType.ModularJar) {
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   175
                addModules.add(ModuleHelper.ALL_DEFAULT);
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   176
            }
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   177
        }
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   178
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   179
        Set<String> validModules =
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   180
                  getValidModules(modulePath, addModules, limitModules);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   181
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   182
        if (mainModule != null) {
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   183
            validModules.add(mainModule);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   184
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   185
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   186
        runJLink(outputDir, modulePath, validModules, limitModules,
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57389
diff changeset
   187
                new HashMap<String,String>(), bindServices);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   188
57789
9280ca6669a2 8229791: Code clean up regressions
herrick
parents: 57438
diff changeset
   189
        imageBuilder.prepareApplicationFiles(params);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   190
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   191
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   192
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   193
    // 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
   194
    static Path findPathOfModule( List<Path> modulePath, String moduleName) {
56821
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
        for (Path path : modulePath) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   197
            Path moduleNamePath = path.resolve(moduleName);
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
            if (Files.exists(moduleNamePath)) {
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   200
                return path;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   201
            }
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
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   204
        return null;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   205
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   206
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   207
    static ModuleDescriptor getMainModuleDescription(Map<String, ? super Object> params) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   208
        boolean hasModule = params.containsKey(StandardBundlerParam.MODULE.getID());
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   209
        if (hasModule) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   210
            List<Path> modulePath = StandardBundlerParam.MODULE_PATH.fetchFrom(params);
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   211
            if (!modulePath.isEmpty()) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   212
                ModuleFinder finder = ModuleFinder.of(modulePath.toArray(new Path[0]));
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   213
                String mainModule = JLinkBundlerHelper.getMainModule(params);
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   214
                Optional<ModuleReference> omref = finder.find(mainModule);
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   215
                if (omref.isPresent()) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   216
                    return omref.get().descriptor();
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
            }
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
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   221
        return null;
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   222
    }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58302
diff changeset
   223
57126
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
     * Returns the set of modules that would be visible by default for
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   226
     * a non-modular-aware application consisting of the given elements.
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
    private static Set<String> getDefaultModules(
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   229
            Path[] paths, String[] addModules) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   230
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   231
        // the modules in the run-time image that export an API
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   232
        Stream<String> systemRoots = ModuleFinder.ofSystem().findAll().stream()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   233
                .map(ModuleReference::descriptor)
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   234
                .filter(descriptor -> exportsAPI(descriptor))
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   235
                .map(ModuleDescriptor::name);
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   236
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   237
        Set<String> roots;
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   238
        if (addModules == null || addModules.length == 0) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   239
            roots = systemRoots.collect(Collectors.toSet());
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   240
        } else {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   241
            var extraRoots =  Stream.of(addModules);
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   242
            roots = Stream.concat(systemRoots,
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   243
                    extraRoots).collect(Collectors.toSet());
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   244
        }
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   245
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   246
        ModuleFinder finder = ModuleFinder.ofSystem();
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   247
        if (paths != null && paths.length > 0) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   248
            finder = ModuleFinder.compose(finder, ModuleFinder.of(paths));
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
        return Configuration.empty()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   251
                .resolveAndBind(finder, ModuleFinder.of(), roots)
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   252
                .modules()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   253
                .stream()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   254
                .map(ResolvedModule::name)
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   255
                .collect(Collectors.toSet());
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   256
    }
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   257
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   258
    /*
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   259
     * Returns true if the given module exports an API to all module.
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   260
     */
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   261
    private static boolean exportsAPI(ModuleDescriptor descriptor) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   262
        return descriptor.exports()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   263
                .stream()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   264
                .filter(e -> !e.isQualified())
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   265
                .findAny()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   266
                .isPresent();
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   267
    }
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   268
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   269
    private static Set<String> removeInvalidModules(
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   270
            List<Path> modulePath, Set<String> modules) {
58466
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   271
        ModuleFinder moduleFinder = ModuleFinder.compose(
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   272
                ModuleFinder.of(modulePath.toArray(Path[]::new)),
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   273
                ModuleFinder.ofSystem());
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   274
        return modules.stream().filter(moduleName -> {
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   275
            if (moduleFinder.find(moduleName).isEmpty()) {
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   276
                Log.error(MessageFormat.format(I18N.getString(
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   277
                        "warning.module.does.not.exist"), moduleName));
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   278
                return false;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   279
            }
58466
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   280
            return true;
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   281
        }).collect(Collectors.toSet());
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   282
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   283
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   284
    private static class ModuleHelper {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   285
        // The token for "all modules on the module path".
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   286
        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
   287
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
   288
        // The token for "all valid runtime modules".
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   289
        static final String ALL_DEFAULT = "ALL-DEFAULT";
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   290
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   291
        private final Set<String> modules = new HashSet<>();
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   292
        ModuleHelper(List<Path> paths, Set<String> addModules,
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   293
                Set<String> limitModules) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   294
            boolean addAllModulePath = false;
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   295
            boolean addDefaultMods = false;
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   296
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   297
            for (Iterator<String> iterator = addModules.iterator();
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   298
                    iterator.hasNext();) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   299
                String module = iterator.next();
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
                switch (module) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   302
                    case ALL_MODULE_PATH:
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   303
                        iterator.remove();
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   304
                        addAllModulePath = true;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   305
                        break;
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   306
                    case ALL_DEFAULT:
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   307
                        iterator.remove();
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   308
                        addDefaultMods = true;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   309
                        break;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   310
                    default:
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   311
                        this.modules.add(module);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   312
                }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   313
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   314
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   315
            if (addAllModulePath) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   316
                this.modules.addAll(getModuleNamesFromPath(paths));
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   317
            } else if (addDefaultMods) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   318
                this.modules.addAll(getDefaultModules(
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   319
                        paths.toArray(new Path[0]),
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   320
                        addModules.toArray(new String[0])));
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   321
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   322
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   323
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   324
        Set<String> modules() {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   325
            return modules;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   326
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   327
58466
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   328
        private static Set<String> getModuleNamesFromPath(List<Path> paths) {
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
   329
58466
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   330
            return ModuleFinder.compose(
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   331
                    ModuleFinder.of(paths.toArray(Path[]::new)),
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   332
                    ModuleFinder.ofSystem())
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   333
                    .findAll()
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   334
                    .stream()
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   335
                    .map(ModuleReference::descriptor)
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   336
                    .map(ModuleDescriptor::name)
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58360
diff changeset
   337
                    .collect(Collectors.toSet());
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   338
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   339
    }
57213
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
    private static void runJLink(Path output, List<Path> modulePath,
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57389
diff changeset
   342
            Set<String> modules, Set<String> limitModules,
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   343
            HashMap<String, String> user, boolean bindServices)
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   344
            throws IOException {
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   345
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   346
        // This is just to ensure jlink is given a non-existant directory
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   347
        // The passed in output path should be non-existant or empty directory
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   348
        IOUtils.deleteRecursive(output.toFile());
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   349
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   350
        ArrayList<String> args = new ArrayList<String>();
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   351
        args.add("--output");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   352
        args.add(output.toString());
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   353
        if (modulePath != null && !modulePath.isEmpty()) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   354
            args.add("--module-path");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   355
            args.add(getPathList(modulePath));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   356
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   357
        if (modules != null && !modules.isEmpty()) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   358
            args.add("--add-modules");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   359
            args.add(getStringList(modules));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   360
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   361
        if (limitModules != null && !limitModules.isEmpty()) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   362
            args.add("--limit-modules");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   363
            args.add(getStringList(limitModules));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   364
        }
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   365
        if (user != null && !user.isEmpty()) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   366
            for (Map.Entry<String, String> entry : user.entrySet()) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   367
                args.add(entry.getKey());
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   368
                args.add(entry.getValue());
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   369
            }
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   370
        } else {
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   371
            args.add("--strip-native-commands");
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   372
            args.add("--strip-debug");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   373
            args.add("--no-man-pages");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   374
            args.add("--no-header-files");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   375
            if (bindServices) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   376
                args.add("--bind-services");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   377
            }
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   378
        }
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   379
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   380
        StringWriter writer = new StringWriter();
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   381
        PrintWriter pw = new PrintWriter(writer);
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
        Log.verbose("jlink arguments: " + args);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   384
        int retVal = JLINK_TOOL.run(pw, pw, args.toArray(new String[0]));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   385
        String jlinkOut = writer.toString();
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
        if (retVal != 0) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   388
            throw new IOException("jlink failed with: " + jlinkOut);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   389
        } else if (jlinkOut.length() > 0) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   390
            Log.verbose("jlink output: " + jlinkOut);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   391
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   392
    }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   393
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   394
    private static String getPathList(List<Path> pathList) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   395
        String ret = null;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   396
        for (Path p : pathList) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   397
            String s =  Matcher.quoteReplacement(p.toString());
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   398
            if (ret == null) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   399
                ret = s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   400
            } else {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   401
                ret += File.pathSeparator +  s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   402
            }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   403
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   404
        return ret;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   405
    }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   406
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   407
    private static String getStringList(Set<String> strings) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   408
        String ret = null;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   409
        for (String s : strings) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   410
            if (ret == null) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   411
                ret = s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   412
            } else {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   413
                ret += "," + s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   414
            }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   415
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   416
        return (ret == null) ? null : Matcher.quoteReplacement(ret);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   417
    }
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   418
}