src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java
author herrick
Thu, 06 Jun 2019 19:14:02 -0400
branchJDK-8200758-branch
changeset 57391 970f28090a06
parent 57389 cce526c681dc
child 57392 46d4b0aa4542
permissions -rw-r--r--
8223334: Additional cleanup in jpackage tool Reviewed-by: almatvee
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
    private static final String JRE_MODULES_FILENAME =
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    67
            "jdk/jpackage/internal/resources/jre.list";
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    68
    private static final String SERVER_JRE_MODULES_FILENAME =
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57038
diff changeset
    69
            "jdk/jpackage/internal/resources/jre.module.list";
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    70
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    71
    static final ToolProvider JLINK_TOOL =
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    72
            ToolProvider.findFirst("jlink").orElseThrow();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    73
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
    74
    private JLinkBundlerHelper() {}
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    75
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    76
    static String listOfPathToString(List<Path> value) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    77
        String result = "";
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    78
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    79
        for (Path path : value) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    80
            if (result.length() > 0) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    81
                result += File.pathSeparator;
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
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    84
            result += path.toString();
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    85
        }
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
        return result;
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
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
    90
    static String setOfStringToString(Set<String> value) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    91
        String result = "";
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
        for (String element : value) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    94
            if (result.length() > 0) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    95
                result += ",";
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    96
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    97
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    98
            result += element;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
    99
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   100
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   101
        return result;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   102
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   103
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   104
    static File getMainJar(Map<String, ? super Object> params) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   105
        File result = null;
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   106
        RelativeFileSet fileset =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   107
                StandardBundlerParam.MAIN_JAR.fetchFrom(params);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   108
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   109
        if (fileset != null) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   110
            String filename = fileset.getIncludedFiles().iterator().next();
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   111
            result = fileset.getBaseDirectory().toPath().
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   112
                    resolve(filename).toFile();
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
            if (result == null || !result.exists()) {
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   115
                String srcdir =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   116
                    StandardBundlerParam.SOURCE_DIR.fetchFrom(params);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   117
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   118
                if (srcdir != null) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   119
                    result = new File(srcdir + File.separator + filename);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   120
                }
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
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   123
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   124
        return result;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   125
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   126
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   127
    static String getMainClass(Map<String, ? super Object> params) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   128
        String result = "";
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   129
        String mainModule = StandardBundlerParam.MODULE.fetchFrom(params);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   130
        if (mainModule != null)  {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   131
            int index = mainModule.indexOf("/");
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   132
            if (index > 0) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   133
                result = mainModule.substring(index + 1);
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
        } else {
56882
0ec8559f599a 8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents: 56869
diff changeset
   136
            RelativeFileSet fileset =
0ec8559f599a 8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents: 56869
diff changeset
   137
                    StandardBundlerParam.MAIN_JAR.fetchFrom(params);
0ec8559f599a 8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents: 56869
diff changeset
   138
            if (fileset != null) {
0ec8559f599a 8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents: 56869
diff changeset
   139
                result = StandardBundlerParam.MAIN_CLASS.fetchFrom(params);
0ec8559f599a 8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents: 56869
diff changeset
   140
            } else {
0ec8559f599a 8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents: 56869
diff changeset
   141
                // possibly app-image
0ec8559f599a 8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents: 56869
diff changeset
   142
            }
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   143
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   144
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   145
        return result;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   146
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   147
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   148
    static String getMainModule(Map<String, ? super Object> params) {
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   149
        String result = null;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   150
        String mainModule = StandardBundlerParam.MODULE.fetchFrom(params);
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 (mainModule != null) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   153
            int index = mainModule.indexOf("/");
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   154
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   155
            if (index > 0) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   156
                result = mainModule.substring(0, index);
57125
846d4865b362 8217793: Modular jars in jpackage are not working
herrick
parents: 57106
diff changeset
   157
            } else {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   158
                result = mainModule;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   159
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   160
        }
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
        return result;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   163
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   164
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
   165
    private static Set<String> getValidModules(List<Path> modulePath,
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   166
            Set<String> addModules, Set<String> limitModules) {
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   167
        ModuleHelper moduleHelper = new ModuleHelper(
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   168
                modulePath, addModules, limitModules);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   169
        return removeInvalidModules(modulePath, moduleHelper.modules());
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   170
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   171
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   172
    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
   173
            AbstractAppImageBuilder imageBuilder)
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   174
            throws IOException, Exception {
57389
cce526c681dc 8222901: different behavior when --name option not used
herrick
parents: 57348
diff changeset
   175
cce526c681dc 8222901: different behavior when --name option not used
herrick
parents: 57348
diff changeset
   176
        // we might be able to build it (with no main class) but it won't run
cce526c681dc 8222901: different behavior when --name option not used
herrick
parents: 57348
diff changeset
   177
        if (StandardBundlerParam.MAIN_CLASS.fetchFrom(params) == null) {
cce526c681dc 8222901: different behavior when --name option not used
herrick
parents: 57348
diff changeset
   178
            throw new PackagerException("ERR_NoMainClass");
cce526c681dc 8222901: different behavior when --name option not used
herrick
parents: 57348
diff changeset
   179
        }
cce526c681dc 8222901: different behavior when --name option not used
herrick
parents: 57348
diff changeset
   180
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   181
        List<Path> modulePath =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   182
                StandardBundlerParam.MODULE_PATH.fetchFrom(params);
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   183
        Set<String> addModules =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   184
                StandardBundlerParam.ADD_MODULES.fetchFrom(params);
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   185
        Set<String> limitModules =
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   186
                StandardBundlerParam.LIMIT_MODULES.fetchFrom(params);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   187
        Path outputDir = imageBuilder.getRoot();
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   188
        File mainJar = getMainJar(params);
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   189
        ModFile.ModType mainJarType = ModFile.ModType.Unknown;
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
        if (mainJar != null) {
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   192
            mainJarType = new ModFile(mainJar).getModType();
57052
92cdab03fb81 8214070: Analyze and Fix issues reported by Parfait
herrick
parents: 57039
diff changeset
   193
        } else if (StandardBundlerParam.MODULE.fetchFrom(params) == null) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   194
            // 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
   195
            mainJarType = ModFile.ModType.UnnamedJar;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   196
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   197
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   198
        boolean bindServices = addModules.isEmpty();
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   199
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   200
        // Modules
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   201
        String mainModule = getMainModule(params);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   202
        if (mainModule == null) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   203
            if (mainJarType == ModFile.ModType.UnnamedJar) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   204
                if (addModules.isEmpty()) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   205
                    // The default for an unnamed jar is ALL_DEFAULT
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   206
                    addModules.add(ModuleHelper.ALL_DEFAULT);
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   207
                }
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   208
            } else if (mainJarType == ModFile.ModType.Unknown ||
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   209
                    mainJarType == ModFile.ModType.ModularJar) {
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   210
                addModules.add(ModuleHelper.ALL_DEFAULT);
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   211
            }
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   212
        }
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   213
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   214
        Set<String> validModules =
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   215
                  getValidModules(modulePath, addModules, limitModules);
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   216
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   217
        if (mainModule != null) {
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   218
            validModules.add(mainModule);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   219
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   220
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   221
        runJLink(outputDir, modulePath, validModules, limitModules,
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57389
diff changeset
   222
                new HashMap<String,String>(), bindServices);
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   223
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   224
        imageBuilder.prepareApplicationFiles();
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   225
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   226
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   227
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   228
    // 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
   229
    static Path findPathOfModule( List<Path> modulePath, String moduleName) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   230
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   231
        for (Path path : modulePath) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   232
            Path moduleNamePath = path.resolve(moduleName);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   233
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   234
            if (Files.exists(moduleNamePath)) {
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   235
                return path;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   236
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   237
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   238
57197
7fc5a57945d2 8217798: modular jar linking in jpackage
herrick
parents: 57126
diff changeset
   239
        return null;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   240
    }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   241
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   242
    /*
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   243
     * Returns the set of modules that would be visible by default for
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   244
     * a non-modular-aware application consisting of the given elements.
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
    private static Set<String> getDefaultModules(
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   247
            Path[] paths, String[] addModules) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   248
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   249
        // the modules in the run-time image that export an API
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   250
        Stream<String> systemRoots = ModuleFinder.ofSystem().findAll().stream()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   251
                .map(ModuleReference::descriptor)
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   252
                .filter(descriptor -> exportsAPI(descriptor))
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   253
                .map(ModuleDescriptor::name);
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
        Set<String> roots;
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   256
        if (addModules == null || addModules.length == 0) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   257
            roots = systemRoots.collect(Collectors.toSet());
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   258
        } else {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   259
            var extraRoots =  Stream.of(addModules);
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   260
            roots = Stream.concat(systemRoots,
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   261
                    extraRoots).collect(Collectors.toSet());
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   262
        }
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   263
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   264
        ModuleFinder finder = ModuleFinder.ofSystem();
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   265
        if (paths != null && paths.length > 0) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   266
            finder = ModuleFinder.compose(finder, ModuleFinder.of(paths));
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
        return Configuration.empty()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   269
                .resolveAndBind(finder, ModuleFinder.of(), roots)
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   270
                .modules()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   271
                .stream()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   272
                .map(ResolvedModule::name)
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   273
                .collect(Collectors.toSet());
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   274
    }
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   275
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   276
    /*
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   277
     * Returns true if the given module exports an API to all module.
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   278
     */
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   279
    private static boolean exportsAPI(ModuleDescriptor descriptor) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   280
        return descriptor.exports()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   281
                .stream()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   282
                .filter(e -> !e.isQualified())
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   283
                .findAny()
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   284
                .isPresent();
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   285
    }
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   286
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   287
    private static Set<String> removeInvalidModules(
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   288
            List<Path> modulePath, Set<String> modules) {
57015
5d2008115309 JDK-8213244: Fix all warnings in jpackager java code
herrick
parents: 56989
diff changeset
   289
        Set<String> result = new LinkedHashSet<String>();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   290
        ModuleManager mm = new ModuleManager(modulePath);
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   291
        List<ModFile> lmodfiles =
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   292
                mm.getModules(EnumSet.of(ModuleManager.SearchType.ModularJar,
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   293
                        ModuleManager.SearchType.Jmod,
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   294
                        ModuleManager.SearchType.ExplodedModule));
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   295
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   296
        HashMap<String, ModFile> validModules = new HashMap<>();
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   297
56982
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   298
        for (ModFile modFile : lmodfiles) {
e094d5483bd6 8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents: 56882
diff changeset
   299
            validModules.put(modFile.getModName(), modFile);
56821
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
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   302
        for (String name : modules) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   303
            if (validModules.containsKey(name)) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   304
                result.add(name);
57020
a828547f7e50 8213394: Stop using Log.info() except for expected output.
herrick
parents: 57017
diff changeset
   305
            } else {
a828547f7e50 8213394: Stop using Log.info() except for expected output.
herrick
parents: 57017
diff changeset
   306
                Log.error(MessageFormat.format(
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   307
                        I18N.getString("warning.module.does.not.exist"), name));
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   308
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   309
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   310
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   311
        return result;
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
    private static class ModuleHelper {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   315
        // The token for "all modules on the module path".
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   316
        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
   317
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
   318
        // The token for "all valid runtime modules".
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   319
        static final String ALL_DEFAULT = "ALL-DEFAULT";
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   320
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   321
        private final Set<String> modules = new HashSet<>();
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   322
        private enum Macros {None, AllModulePath, AllRuntime}
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   323
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   324
        ModuleHelper(List<Path> paths, Set<String> addModules,
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   325
                Set<String> limitModules) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   326
            boolean addAllModulePath = false;
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   327
            boolean addDefaultMods = false;
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   328
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   329
            for (Iterator<String> iterator = addModules.iterator();
56869
41e17fe9fbeb 8208522: removed unreferenced class and minor formatting of java source
herrick
parents: 56821
diff changeset
   330
                    iterator.hasNext();) {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   331
                String module = iterator.next();
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   332
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   333
                switch (module) {
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   334
                    case ALL_MODULE_PATH:
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   335
                        iterator.remove();
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   336
                        addAllModulePath = true;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   337
                        break;
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   338
                    case ALL_DEFAULT:
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   339
                        iterator.remove();
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   340
                        addDefaultMods = true;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   341
                        break;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   342
                    default:
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   343
                        this.modules.add(module);
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   344
                }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   345
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   346
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   347
            if (addAllModulePath) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   348
                this.modules.addAll(getModuleNamesFromPath(paths));
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   349
            } else if (addDefaultMods) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   350
                this.modules.addAll(getDefaultModules(
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   351
                        paths.toArray(new Path[0]),
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   352
                        addModules.toArray(new String[0])));
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   353
            }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   354
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   355
57067
9c17d779808e 8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents: 57059
diff changeset
   356
        Set<String> modules() {
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   357
            return modules;
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   358
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   359
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   360
        private static Set<String> getModuleNamesFromPath(List<Path> Value) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   361
            Set<String> result = new LinkedHashSet<String>();
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   362
            ModuleManager mm = new ModuleManager(Value);
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   363
            List<ModFile> modFiles = mm.getModules(
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   364
                    EnumSet.of(ModuleManager.SearchType.ModularJar,
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   365
                    ModuleManager.SearchType.Jmod,
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   366
                    ModuleManager.SearchType.ExplodedModule));
57070
42783e8e73de 8212164: resolve jre.list and jre.module.list
herrick
parents: 57067
diff changeset
   367
57126
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   368
            for (ModFile modFile : modFiles) {
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   369
                result.add(modFile.getModName());
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   370
            }
8041f62342f0 8217792 : Investigate what modules are included
herrick
parents: 57125
diff changeset
   371
            return result;
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   372
        }
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   373
    }
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   374
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   375
    private static void runJLink(Path output, List<Path> modulePath,
57391
970f28090a06 8223334: Additional cleanup in jpackage tool
herrick
parents: 57389
diff changeset
   376
            Set<String> modules, Set<String> limitModules,
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   377
            HashMap<String, String> user, boolean bindServices)
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   378
            throws IOException {
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   379
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   380
        // This is just to ensure jlink is given a non-existant directory
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   381
        // The passed in output path should be non-existant or empty directory
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   382
        IOUtils.deleteRecursive(output.toFile());
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
        ArrayList<String> args = new ArrayList<String>();
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   385
        args.add("--output");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   386
        args.add(output.toString());
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   387
        if (modulePath != null && !modulePath.isEmpty()) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   388
            args.add("--module-path");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   389
            args.add(getPathList(modulePath));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   390
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   391
        if (modules != null && !modules.isEmpty()) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   392
            args.add("--add-modules");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   393
            args.add(getStringList(modules));
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
        if (limitModules != null && !limitModules.isEmpty()) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   396
            args.add("--limit-modules");
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   397
            args.add(getStringList(limitModules));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   398
        }
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   399
        if (user != null && !user.isEmpty()) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   400
            for (Map.Entry<String, String> entry : user.entrySet()) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   401
                args.add(entry.getKey());
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   402
                args.add(entry.getValue());
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   403
            }
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   404
        } else {
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   405
            args.add("--strip-native-commands");
57256
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   406
            args.add("--strip-debug");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   407
            args.add("--no-man-pages");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   408
            args.add("--no-header-files");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   409
            if (bindServices) {
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   410
                args.add("--bind-services");
d7c27451f759 8219678: CLI changes in jpackage
herrick
parents: 57213
diff changeset
   411
            }
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   412
        }
57348
d3a667ff5579 JDK-8223189: Fix trailing whitespace and whitespace only file modification.
herrick
parents: 57256
diff changeset
   413
57213
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   414
        StringWriter writer = new StringWriter();
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   415
        PrintWriter pw = new PrintWriter(writer);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   416
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   417
        Log.verbose("jlink arguments: " + args);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   418
        int retVal = JLINK_TOOL.run(pw, pw, args.toArray(new String[0]));
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   419
        String jlinkOut = writer.toString();
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   420
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   421
        if (retVal != 0) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   422
            throw new IOException("jlink failed with: " + jlinkOut);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   423
        } else if (jlinkOut.length() > 0) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   424
            Log.verbose("jlink output: " + jlinkOut);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   425
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   426
    }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   427
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   428
    private static String getPathList(List<Path> pathList) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   429
        String ret = null;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   430
        for (Path p : pathList) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   431
            String s =  Matcher.quoteReplacement(p.toString());
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   432
            if (ret == null) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   433
                ret = s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   434
            } else {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   435
                ret += File.pathSeparator +  s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   436
            }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   437
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   438
        return ret;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   439
    }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   440
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   441
    private static String getStringList(Set<String> strings) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   442
        String ret = null;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   443
        for (String s : strings) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   444
            if (ret == null) {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   445
                ret = s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   446
            } else {
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   447
                ret += "," + s;
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   448
            }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   449
        }
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   450
        return (ret == null) ? null : Matcher.quoteReplacement(ret);
8ff0a29bf9bc 8218055: Use ToolProvider instead of AppRuntimeImageBuilder.
herrick
parents: 57197
diff changeset
   451
    }
56821
565d54ca1f41 8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff changeset
   452
}