jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
author redestad
Thu, 23 Feb 2017 18:37:51 +0100
changeset 43987 068a2419b5a7
parent 43712 5dfd0950317c
child 44367 a81c9c6619fb
permissions -rw-r--r--
8169713: jimage fails with StringIndexOutOfBoundsException when path to the inspected image is an empty string Reviewed-by: jlaskey
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     1
/*
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     2
 * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     4
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    10
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    15
 * accompanied this code).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    16
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    20
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    23
 * questions.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    24
 */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    25
package jdk.tools.jlink.internal;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    26
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    27
import java.io.File;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    28
import java.io.IOException;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    29
import java.io.PrintWriter;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    30
import java.lang.module.Configuration;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    31
import java.lang.module.ModuleFinder;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    32
import java.lang.reflect.Layer;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    33
import java.nio.file.Files;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    34
import java.nio.file.Path;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    35
import java.nio.file.Paths;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    36
import java.text.MessageFormat;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    37
import java.util.ArrayList;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    38
import java.util.Arrays;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    39
import java.util.Collections;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    40
import java.util.HashMap;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    41
import java.util.HashSet;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    42
import java.util.List;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    43
import java.util.Locale;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    44
import java.util.Map;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    45
import java.util.Map.Entry;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    46
import java.util.MissingResourceException;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    47
import java.util.ResourceBundle;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    48
import java.util.Set;
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
    49
import java.util.stream.Stream;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    50
41561
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
    51
import jdk.tools.jlink.internal.plugins.ExcludeJmodSectionPlugin;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    52
import jdk.tools.jlink.plugin.Plugin;
38320
e24c7029e8ba 8156914: jlink API minor cleanups
sundar
parents: 37779
diff changeset
    53
import jdk.tools.jlink.plugin.Plugin.Category;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    54
import jdk.tools.jlink.builder.DefaultImageBuilder;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    55
import jdk.tools.jlink.builder.ImageBuilder;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    56
import jdk.tools.jlink.plugin.PluginException;
41559
5b33f33df1fb 8168091: jlink should check security permission early when programmatic access is used
sundar
parents: 40261
diff changeset
    57
import jdk.tools.jlink.internal.Jlink.PluginsConfiguration;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    58
import jdk.tools.jlink.internal.plugins.PluginsResourceBundle;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    59
import jdk.tools.jlink.internal.plugins.DefaultCompressPlugin;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    60
import jdk.tools.jlink.internal.plugins.StripDebugPlugin;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42330
diff changeset
    61
import jdk.internal.module.ModulePath;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    62
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    63
/**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    64
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    65
 * JLink and JImage tools shared helper.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    66
 */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    67
public final class TaskHelper {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    68
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    69
    public static final String JLINK_BUNDLE = "jdk.tools.jlink.resources.jlink";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    70
    public static final String JIMAGE_BUNDLE = "jdk.tools.jimage.resources.jimage";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    71
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    72
    private static final String DEFAULTS_PROPERTY = "jdk.jlink.defaults";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    73
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    74
    public final class BadArgs extends Exception {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    75
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    76
        static final long serialVersionUID = 8765093759964640721L;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    77
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    78
        private BadArgs(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    79
            super(bundleHelper.getMessage(key, args));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    80
            this.key = key;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    81
            this.args = args;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    82
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    83
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    84
        public BadArgs showUsage(boolean b) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    85
            showUsage = b;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    86
            return this;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    87
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    88
        public final String key;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    89
        public final Object[] args;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    90
        public boolean showUsage;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    91
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    92
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
    93
    public static class Option<T> implements Comparable<T> {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    94
        public interface Processing<T> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    95
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    96
            void process(T task, String opt, String arg) throws BadArgs;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    97
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    98
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    99
        final boolean hasArg;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   100
        final Processing<T> processing;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   101
        final boolean hidden;
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   102
        final String name;
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   103
        final String shortname;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   104
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   105
        public Option(boolean hasArg, Processing<T> processing, boolean hidden, String name, String shortname) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   106
            if (!name.startsWith("--")) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   107
                throw new RuntimeException("option name missing --, " + name);
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   108
            }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   109
            if (!shortname.isEmpty() && !shortname.startsWith("-")) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   110
                throw new RuntimeException("short name missing -, " + shortname);
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   111
            }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   112
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   113
            this.hasArg = hasArg;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   114
            this.processing = processing;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   115
            this.hidden = hidden;
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   116
            this.name = name;
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   117
            this.shortname = shortname;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   118
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   119
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   120
        public Option(boolean hasArg, Processing<T> processing, String name, String shortname) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   121
            this(hasArg, processing, false, name, shortname);
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   122
        }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   123
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   124
        public Option(boolean hasArg, Processing<T> processing, boolean hidden, String name) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   125
            this(hasArg, processing, hidden, name, "");
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   126
        }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   127
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   128
        public Option(boolean hasArg, Processing<T> processing, String name) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   129
            this(hasArg, processing, false, name, "");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   130
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   131
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   132
        public boolean isHidden() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   133
            return hidden;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   134
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   135
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   136
        public boolean matches(String opt) {
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   137
            return opt.equals(name) ||
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   138
                   opt.equals(shortname) ||
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   139
                   hasArg && opt.startsWith("--") && opt.startsWith(name + "=");
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   140
         }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   141
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   142
        public boolean ignoreRest() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   143
            return false;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   144
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   145
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   146
        void process(T task, String opt, String arg) throws BadArgs {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   147
            processing.process(task, opt, arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   148
        }
38869
4bac8f3bce74 8156994: jimage --help is not helpful
jlaskey
parents: 38457
diff changeset
   149
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   150
        public String getName() {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   151
            return name;
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   152
        }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   153
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   154
        public String resourceName() {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   155
            return resourcePrefix() + name.substring(2);
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   156
        }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   157
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   158
        public String getShortname() {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   159
            return shortname;
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   160
        }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   161
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   162
        public String resourcePrefix() {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   163
            return "main.opt.";
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   164
        }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   165
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   166
        @Override
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   167
        public int compareTo(Object object) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   168
            if (!(object instanceof Option<?>)) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   169
                throw new RuntimeException("comparing non-Option");
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   170
            }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   171
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   172
            Option<?> option = (Option<?>)object;
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   173
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   174
            return name.compareTo(option.name);
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   175
        }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   176
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   177
    }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   178
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   179
    private static class PluginOption extends Option<PluginsHelper> {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   180
        public PluginOption(boolean hasArg,
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   181
                Processing<PluginsHelper> processing, boolean hidden, String name, String shortname) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   182
            super(hasArg, processing, hidden, name, shortname);
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   183
        }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   184
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   185
        public PluginOption(boolean hasArg,
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   186
                Processing<PluginsHelper> processing, boolean hidden, String name) {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   187
            super(hasArg, processing, hidden, name, "");
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   188
        }
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   189
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   190
        public String resourcePrefix() {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   191
            return "plugin.opt.";
38869
4bac8f3bce74 8156994: jimage --help is not helpful
jlaskey
parents: 38457
diff changeset
   192
        }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   193
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   194
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   195
    private final class PluginsHelper {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   196
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   197
        private Layer pluginsLayer = Layer.boot();
41831
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   198
        private final List<Plugin> plugins;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   199
        private String lastSorter;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   200
        private boolean listPlugins;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   201
        private Path existingImage;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   202
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   203
        // plugin to args maps. Each plugin may be used more than once in command line.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   204
        // Each such occurrence results in a Map of arguments. So, there could be multiple
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   205
        // args maps per plugin instance.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   206
        private final Map<Plugin, List<Map<String, String>>> pluginToMaps = new HashMap<>();
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   207
        private final List<PluginOption> pluginsOptions = new ArrayList<>();
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   208
        private final List<PluginOption> mainOptions = new ArrayList<>();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   209
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   210
        private PluginsHelper(String pp) throws BadArgs {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   211
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   212
            if (pp != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   213
                String[] dirs = pp.split(File.pathSeparator);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   214
                List<Path> paths = new ArrayList<>(dirs.length);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   215
                for (String dir : dirs) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   216
                    paths.add(Paths.get(dir));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   217
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   218
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   219
                pluginsLayer = createPluginsLayer(paths);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   220
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   221
41831
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   222
            plugins = PluginRepository.getPlugins(pluginsLayer);
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   223
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   224
            Set<String> optionsSeen = new HashSet<>();
41831
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   225
            for (Plugin plugin : plugins) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   226
                if (!Utils.isDisabled(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   227
                    addOrderedPluginOptions(plugin, optionsSeen);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   228
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   229
            }
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   230
            mainOptions.add(new PluginOption(true, (task, opt, arg) -> {
41831
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   231
                    for (Plugin plugin : plugins) {
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   232
                        if (plugin.getName().equals(arg)) {
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   233
                            pluginToMaps.remove(plugin);
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   234
                            return;
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   235
                        }
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   236
                    }
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   237
                    throw newBadArgs("err.no.such.plugin", arg);
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   238
                },
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   239
                false, "--disable-plugin"));
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   240
            mainOptions.add(new PluginOption(true, (task, opt, arg) -> {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   241
                Path path = Paths.get(arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   242
                if (!Files.exists(path) || !Files.isDirectory(path)) {
41953
3e89e6103470 8155756: Better context for some jlink exceptions
jlaskey
parents: 41919
diff changeset
   243
                    throw newBadArgs("err.image.must.exist", path);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   244
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   245
                existingImage = path.toAbsolutePath();
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   246
            }, true, "--post-process-path"));
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   247
            mainOptions.add(new PluginOption(true,
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   248
                    (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   249
                        lastSorter = arg;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   250
                    },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   251
                    true, "--resources-last-sorter"));
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   252
            mainOptions.add(new PluginOption(false,
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   253
                    (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   254
                        listPlugins = true;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   255
                    },
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   256
                    false, "--list-plugins"));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   257
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   258
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   259
        private List<Map<String, String>> argListFor(Plugin plugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   260
            List<Map<String, String>> mapList = pluginToMaps.get(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   261
            if (mapList == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   262
                mapList = new ArrayList<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   263
                pluginToMaps.put(plugin, mapList);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   264
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   265
            return mapList;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   266
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   267
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   268
        private void addEmptyArgumentMap(Plugin plugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   269
            argListFor(plugin).add(Collections.emptyMap());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   270
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   271
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   272
        private Map<String, String> addArgumentMap(Plugin plugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   273
            Map<String, String> map = new HashMap<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   274
            argListFor(plugin).add(map);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   275
            return map;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   276
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   277
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   278
        private void addOrderedPluginOptions(Plugin plugin,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   279
            Set<String> optionsSeen) throws BadArgs {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   280
            String option = plugin.getOption();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   281
            if (option == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   282
                return;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   283
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   284
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   285
            // make sure that more than one plugin does not use the same option!
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   286
            if (optionsSeen.contains(option)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   287
                throw new BadArgs("err.plugin.mutiple.options",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   288
                        option);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   289
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   290
            optionsSeen.add(option);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   291
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   292
            PluginOption plugOption
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   293
                    = new PluginOption(plugin.hasArguments(),
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   294
                            (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   295
                                if (!Utils.isFunctional(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   296
                                    throw newBadArgs("err.provider.not.functional",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   297
                                            option);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   298
                                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   299
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   300
                                if (! plugin.hasArguments()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   301
                                    addEmptyArgumentMap(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   302
                                    return;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   303
                                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   304
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   305
                                Map<String, String> m = addArgumentMap(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   306
                                // handle one or more arguments
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   307
                                if (arg.indexOf(':') == -1) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   308
                                    // single argument case
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   309
                                    m.put(option, arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   310
                                } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   311
                                    // This option can accept more than one arguments
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   312
                                    // like --option_name=arg_value:arg2=value2:arg3=value3
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   313
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   314
                                    // ":" followed by word char condition takes care of args that
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   315
                                    // like Windows absolute paths "C:\foo", "C:/foo" [cygwin] etc.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   316
                                    // This enforces that key names start with a word character.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   317
                                    String[] args = arg.split(":(?=\\w)", -1);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   318
                                    String firstArg = args[0];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   319
                                    if (firstArg.isEmpty()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   320
                                        throw newBadArgs("err.provider.additional.arg.error",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   321
                                            option, arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   322
                                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   323
                                    m.put(option, firstArg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   324
                                    // process the additional arguments
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   325
                                    for (int i = 1; i < args.length; i++) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   326
                                        String addArg = args[i];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   327
                                        int eqIdx = addArg.indexOf('=');
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   328
                                        if (eqIdx == -1) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   329
                                            throw newBadArgs("err.provider.additional.arg.error",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   330
                                                option, arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   331
                                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   332
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   333
                                        String addArgName = addArg.substring(0, eqIdx);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   334
                                        String addArgValue = addArg.substring(eqIdx+1);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   335
                                        if (addArgName.isEmpty() || addArgValue.isEmpty()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   336
                                            throw newBadArgs("err.provider.additional.arg.error",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   337
                                                option, arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   338
                                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   339
                                        m.put(addArgName, addArgValue);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   340
                                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   341
                                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   342
                            },
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   343
                            false, "--" + option);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   344
            pluginsOptions.add(plugOption);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   345
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   346
            if (Utils.isFunctional(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   347
                if (Utils.isAutoEnabled(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   348
                    addEmptyArgumentMap(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   349
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   350
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   351
                if (plugin instanceof DefaultCompressPlugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   352
                    plugOption
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   353
                        = new PluginOption(false,
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   354
                            (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   355
                                Map<String, String> m = addArgumentMap(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   356
                                m.put(DefaultCompressPlugin.NAME, DefaultCompressPlugin.LEVEL_2);
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   357
                            }, false, "--compress", "-c");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   358
                    mainOptions.add(plugOption);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   359
                } else if (plugin instanceof StripDebugPlugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   360
                    plugOption
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   361
                        = new PluginOption(false,
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   362
                            (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   363
                                addArgumentMap(plugin);
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   364
                            }, false, "--strip-debug", "-G");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   365
                    mainOptions.add(plugOption);
41561
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   366
                } else if (plugin instanceof ExcludeJmodSectionPlugin) {
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   367
                    plugOption = new PluginOption(false, (task, opt, arg) -> {
41561
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   368
                            Map<String, String> m = addArgumentMap(plugin);
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   369
                            m.put(ExcludeJmodSectionPlugin.NAME,
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   370
                                  ExcludeJmodSectionPlugin.MAN_PAGES);
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   371
                        }, false, "--no-man-pages");
41561
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   372
                    mainOptions.add(plugOption);
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   373
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   374
                    plugOption = new PluginOption(false, (task, opt, arg) -> {
41561
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   375
                        Map<String, String> m = addArgumentMap(plugin);
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   376
                        m.put(ExcludeJmodSectionPlugin.NAME,
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   377
                              ExcludeJmodSectionPlugin.INCLUDE_HEADER_FILES);
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   378
                    }, false, "--no-header-files");
41561
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   379
                    mainOptions.add(plugOption);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   380
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   381
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   382
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   383
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   384
        private PluginOption getOption(String name) throws BadArgs {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   385
            for (PluginOption o : pluginsOptions) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   386
                if (o.matches(name)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   387
                    return o;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   388
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   389
            }
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   390
            for (PluginOption o : mainOptions) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   391
                if (o.matches(name)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   392
                    return o;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   393
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   394
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   395
            return null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   396
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   397
42762
11a1ad340d4f 8170289: Re-examine entry point support in jlink
sundar
parents: 42703
diff changeset
   398
        private PluginsConfiguration getPluginsConfig(Path output, Map<String, String> launchers
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   399
                    ) throws IOException, BadArgs {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   400
            if (output != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   401
                if (Files.exists(output)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   402
                    throw new PluginException(PluginsResourceBundle.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   403
                            getMessage("err.dir.already.exits", output));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   404
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   405
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   406
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   407
            List<Plugin> pluginsList = new ArrayList<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   408
            for (Entry<Plugin, List<Map<String, String>>> entry : pluginToMaps.entrySet()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   409
                Plugin plugin = entry.getKey();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   410
                List<Map<String, String>> argsMaps = entry.getValue();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   411
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   412
                // same plugin option may be used multiple times in command line.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   413
                // we call configure once for each occurrence. It is upto the plugin
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   414
                // to 'merge' and/or 'override' arguments.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   415
                for (Map<String, String> map : argsMaps) {
42330
bd999576b78d 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42174
diff changeset
   416
                    try {
bd999576b78d 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42174
diff changeset
   417
                        plugin.configure(Collections.unmodifiableMap(map));
bd999576b78d 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42174
diff changeset
   418
                    } catch (IllegalArgumentException e) {
bd999576b78d 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42174
diff changeset
   419
                        if (JlinkTask.DEBUG) {
bd999576b78d 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42174
diff changeset
   420
                            System.err.println("Plugin " + plugin.getName() + " threw exception with config: " + map);
bd999576b78d 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42174
diff changeset
   421
                            e.printStackTrace();
bd999576b78d 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42174
diff changeset
   422
                        }
bd999576b78d 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42174
diff changeset
   423
                        throw e;
bd999576b78d 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42174
diff changeset
   424
                    }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   425
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   426
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   427
                if (!Utils.isDisabled(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   428
                    pluginsList.add(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   429
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   430
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   431
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   432
            // recreate or postprocessing don't require an output directory.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   433
            ImageBuilder builder = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   434
            if (output != null) {
42762
11a1ad340d4f 8170289: Re-examine entry point support in jlink
sundar
parents: 42703
diff changeset
   435
                builder = new DefaultImageBuilder(output, launchers);
11a1ad340d4f 8170289: Re-examine entry point support in jlink
sundar
parents: 42703
diff changeset
   436
            }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   437
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   438
            return new Jlink.PluginsConfiguration(pluginsList,
38320
e24c7029e8ba 8156914: jlink API minor cleanups
sundar
parents: 37779
diff changeset
   439
                    builder, lastSorter);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   440
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   441
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   442
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   443
    private static final class ResourceBundleHelper {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   444
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   445
        private final ResourceBundle bundle;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   446
        private final ResourceBundle pluginBundle;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   447
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   448
        ResourceBundleHelper(String path) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   449
            Locale locale = Locale.getDefault();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   450
            try {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   451
                bundle = ResourceBundle.getBundle(path, locale);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   452
                pluginBundle = ResourceBundle.getBundle("jdk.tools.jlink.resources.plugins", locale);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   453
            } catch (MissingResourceException e) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   454
                throw new InternalError("Cannot find jlink resource bundle for locale " + locale);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   455
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   456
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   457
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   458
        String getMessage(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   459
            String val;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   460
            try {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   461
                val = bundle.getString(key);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   462
            } catch (MissingResourceException e) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   463
                // XXX OK, check in plugin bundle
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   464
                val = pluginBundle.getString(key);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   465
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   466
            return MessageFormat.format(val, args);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   467
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   468
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   469
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   470
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   471
    public final class OptionsHelper<T> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   472
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   473
        private final List<Option<T>> options;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   474
        private String[] command;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   475
        private String defaults;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   476
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   477
        OptionsHelper(List<Option<T>> options) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   478
            this.options = options;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   479
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   480
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   481
        private boolean hasArgument(String optionName) throws BadArgs {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   482
            Option<?> opt = getOption(optionName);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   483
            if (opt == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   484
                opt = pluginOptions.getOption(optionName);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   485
                if (opt == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   486
                    throw new BadArgs("err.unknown.option", optionName).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   487
                            showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   488
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   489
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   490
            return opt.hasArg;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   491
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   492
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   493
        public boolean shouldListPlugins() {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   494
            return pluginOptions.listPlugins;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   495
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   496
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   497
        private String getPluginsPath(String[] args) throws BadArgs {
43328
91f9c9170d97 8172864: Remove custom plugin module path
sundar
parents: 42762
diff changeset
   498
            return null;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   499
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   500
41766
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   501
        // used by jimage. Return unhandled arguments like "create", "describe".
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   502
        public List<String> handleOptions(T task, String[] args) throws BadArgs {
41766
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   503
            return handleOptions(task, args, true);
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   504
        }
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   505
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   506
        // used by jlink. No unhandled arguments like "create", "describe".
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   507
        void handleOptionsNoUnhandled(T task, String[] args) throws BadArgs {
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   508
            handleOptions(task, args, false);
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   509
        }
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   510
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   511
        // shared code that handles options for both jlink and jimage. jimage uses arguments like
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   512
        // "create", "describe" etc. as "task names". Those arguments are unhandled here and returned
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   513
        // as "unhandled arguments list". jlink does not want such arguments. "collectUnhandled" flag
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   514
        // tells whether to allow for unhandled arguments or not.
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   515
        private List<String> handleOptions(T task, String[] args, boolean collectUnhandled) throws BadArgs {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   516
            // findbugs warning, copy instead of keeping a reference.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   517
            command = Arrays.copyOf(args, args.length);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   518
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   519
            // Must extract it prior to do any option analysis.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   520
            // Required to interpret custom plugin options.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   521
            // Unit tests can call Task multiple time in same JVM.
43328
91f9c9170d97 8172864: Remove custom plugin module path
sundar
parents: 42762
diff changeset
   522
            pluginOptions = new PluginsHelper(null);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   523
41766
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   524
            List<String> rest = collectUnhandled? new ArrayList<>() : null;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   525
            // process options
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   526
            for (int i = 0; i < args.length; i++) {
43987
068a2419b5a7 8169713: jimage fails with StringIndexOutOfBoundsException when path to the inspected image is an empty string
redestad
parents: 43712
diff changeset
   527
                if (args[i].startsWith("-")) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   528
                    String name = args[i];
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   529
                    PluginOption pluginOption = null;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   530
                    Option<T> option = getOption(name);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   531
                    if (option == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   532
                        pluginOption = pluginOptions.getOption(name);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   533
                        if (pluginOption == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   534
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   535
                            throw new BadArgs("err.unknown.option", name).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   536
                                    showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   537
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   538
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   539
                    Option<?> opt = pluginOption == null ? option : pluginOption;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   540
                    String param = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   541
                    if (opt.hasArg) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   542
                        if (name.startsWith("--") && name.indexOf('=') > 0) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   543
                            param = name.substring(name.indexOf('=') + 1,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   544
                                    name.length());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   545
                        } else if (i + 1 < args.length) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   546
                            param = args[++i];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   547
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   548
                        if (param == null || param.isEmpty()
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   549
                                || (param.length() >= 2 && param.charAt(0) == '-'
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   550
                                && param.charAt(1) == '-')) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   551
                            throw new BadArgs("err.missing.arg", name).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   552
                                    showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   553
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   554
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   555
                    if (pluginOption != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   556
                        pluginOption.process(pluginOptions, name, param);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   557
                    } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   558
                        option.process(task, name, param);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   559
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   560
                    if (opt.ignoreRest()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   561
                        i = args.length;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   562
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   563
                } else {
41766
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   564
                    if (collectUnhandled) {
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   565
                        rest.add(args[i]);
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   566
                    } else {
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   567
                        throw new BadArgs("err.orphan.argument", args[i]).
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   568
                            showUsage(true);
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   569
                    }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   570
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   571
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   572
            return rest;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   573
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   574
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   575
        private Option<T> getOption(String name) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   576
            for (Option<T> o : options) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   577
                if (o.matches(name)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   578
                    return o;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   579
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   580
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   581
            return null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   582
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   583
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   584
        public void showHelp(String progName) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   585
            log.println(bundleHelper.getMessage("main.usage", progName));
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   586
            Stream.concat(options.stream(), pluginOptions.mainOptions.stream())
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   587
                .filter(option -> !option.isHidden())
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   588
                .sorted()
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   589
                .forEach(option -> {
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   590
                     log.println(bundleHelper.getMessage(option.resourceName()));
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   591
                });
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   592
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   593
            log.println(bundleHelper.getMessage("main.command.files"));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   594
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   595
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   596
        public void listPlugins() {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   597
            log.println("\n" + bundleHelper.getMessage("main.extended.help"));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   598
            List<Plugin> pluginList = PluginRepository.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   599
                    getPlugins(pluginOptions.pluginsLayer);
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   600
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   601
            for (Plugin plugin : Utils.getSortedPlugins(pluginList)) {
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   602
                showPlugin(plugin, log);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   603
            }
39150
cb99396625b4 8159172: Update usage of jlink/jimage/jmod to show option patterns
jlaskey
parents: 38869
diff changeset
   604
cb99396625b4 8159172: Update usage of jlink/jimage/jmod to show option patterns
jlaskey
parents: 38869
diff changeset
   605
            log.println("\n" + bundleHelper.getMessage("main.extended.help.footer"));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   606
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   607
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   608
        private void showPlugin(Plugin plugin, PrintWriter log) {
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   609
            if (showsPlugin(plugin)) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   610
                log.println("\n" + bundleHelper.getMessage("main.plugin.name")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   611
                        + ": " + plugin.getName());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   612
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   613
                // print verbose details for non-builtin plugins
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   614
                if (!Utils.isBuiltin(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   615
                    log.println(bundleHelper.getMessage("main.plugin.class")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   616
                         + ": " + plugin.getClass().getName());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   617
                    log.println(bundleHelper.getMessage("main.plugin.module")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   618
                         + ": " + plugin.getClass().getModule().getName());
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   619
                    Category category = plugin.getType();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   620
                    log.println(bundleHelper.getMessage("main.plugin.category")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   621
                         + ": " + category.getName());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   622
                    log.println(bundleHelper.getMessage("main.plugin.state")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   623
                        + ": " + plugin.getStateDescription());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   624
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   625
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   626
                String option = plugin.getOption();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   627
                if (option != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   628
                    log.println(bundleHelper.getMessage("main.plugin.option")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   629
                        + ": --" + plugin.getOption()
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   630
                        + (plugin.hasArguments()? ("=" + plugin.getArgumentsDescription()) : ""));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   631
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   632
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   633
                // description can be long spanning more than one line and so
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   634
                // print a newline after description label.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   635
                log.println(bundleHelper.getMessage("main.plugin.description")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   636
                        + ": " + plugin.getDescription());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   637
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   638
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   639
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   640
        String[] getInputCommand() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   641
            return command;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   642
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   643
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   644
        String getDefaults() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   645
            return defaults;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   646
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   647
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   648
        public Layer getPluginsLayer() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   649
            return pluginOptions.pluginsLayer;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   650
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   651
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   652
42174
fa763b059501 8168256: Plugin alias options in jlink --help output seems to be in an arbitrary order
jlaskey
parents: 41953
diff changeset
   653
    private PluginsHelper pluginOptions;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   654
    private PrintWriter log;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   655
    private final ResourceBundleHelper bundleHelper;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   656
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   657
    public TaskHelper(String path) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   658
        if (!JLINK_BUNDLE.equals(path) && !JIMAGE_BUNDLE.equals(path)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   659
            throw new IllegalArgumentException("Invalid Bundle");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   660
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   661
        this.bundleHelper = new ResourceBundleHelper(path);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   662
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   663
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   664
    public <T> OptionsHelper<T> newOptionsHelper(Class<T> clazz,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   665
            Option<?>[] options) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   666
        List<Option<T>> optionsList = new ArrayList<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   667
        for (Option<?> o : options) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   668
            @SuppressWarnings("unchecked")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   669
            Option<T> opt = (Option<T>) o;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   670
            optionsList.add(opt);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   671
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   672
        return new OptionsHelper<>(optionsList);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   673
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   674
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   675
    public BadArgs newBadArgs(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   676
        return new BadArgs(key, args);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   677
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   678
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   679
    public String getMessage(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   680
        return bundleHelper.getMessage(key, args);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   681
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   682
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   683
    public void setLog(PrintWriter log) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   684
        this.log = log;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   685
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   686
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   687
    public void reportError(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   688
        log.println(bundleHelper.getMessage("error.prefix") + " "
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   689
                + bundleHelper.getMessage(key, args));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   690
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   691
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   692
    public void reportUnknownError(String message) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   693
        log.println(bundleHelper.getMessage("error.prefix") + " " + message);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   694
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   695
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   696
    public void warning(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   697
        log.println(bundleHelper.getMessage("warn.prefix") + " "
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   698
                + bundleHelper.getMessage(key, args));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   699
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   700
42762
11a1ad340d4f 8170289: Re-examine entry point support in jlink
sundar
parents: 42703
diff changeset
   701
    public PluginsConfiguration getPluginsConfig(Path output, Map<String, String> launchers)
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   702
            throws IOException, BadArgs {
42762
11a1ad340d4f 8170289: Re-examine entry point support in jlink
sundar
parents: 42703
diff changeset
   703
        return pluginOptions.getPluginsConfig(output, launchers);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   704
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   705
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   706
    public Path getExistingImage() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   707
        return pluginOptions.existingImage;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   708
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   709
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   710
    public void showVersion(boolean full) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   711
        log.println(version(full ? "full" : "release"));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   712
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   713
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   714
    public String version(String key) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   715
        return System.getProperty("java.version");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   716
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   717
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   718
    static Layer createPluginsLayer(List<Path> paths) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   719
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 41766
diff changeset
   720
        Path[] dirs = paths.toArray(new Path[0]);
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43495
diff changeset
   721
        ModuleFinder finder = ModulePath.of(Runtime.version(), true, dirs);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   722
        Configuration bootConfiguration = Layer.boot().configuration();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   723
        try {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   724
            Configuration cf = bootConfiguration
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43495
diff changeset
   725
                .resolveAndBind(ModuleFinder.of(),
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43495
diff changeset
   726
                                finder,
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43495
diff changeset
   727
                                Collections.emptySet());
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   728
            ClassLoader scl = ClassLoader.getSystemClassLoader();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   729
            return Layer.boot().defineModulesWithOneLoader(cf, scl);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   730
        } catch (Exception ex) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   731
            // Malformed plugin modules (e.g.: same package in multiple modules).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   732
            throw new PluginException("Invalid modules in the plugins path: " + ex);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   733
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   734
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   735
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   736
    // Display all plugins
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   737
    private static boolean showsPlugin(Plugin plugin) {
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   738
        return (!Utils.isDisabled(plugin) && plugin.getOption() != null);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   739
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   740
}