jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
author sundar
Wed, 02 Nov 2016 10:49:15 +0530
changeset 41831 2dd91b18195b
parent 41817 b90ad1de93ea
child 41919 612b698f8b8f
permissions -rw-r--r--
8160063: Provide a means to disable a plugin via the command line 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;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    49
41561
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
    50
import jdk.tools.jlink.internal.plugins.ExcludeFilesPlugin;
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;
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 41766
diff changeset
    61
import jdk.internal.misc.SharedSecrets;
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
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    93
    public static class Option<T> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    94
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    95
        public interface Processing<T> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    96
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    97
            void process(T task, String opt, String arg) throws BadArgs;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    98
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    99
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   100
        final boolean hasArg;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   101
        final Processing<T> processing;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   102
        final boolean hidden;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   103
        final String[] aliases;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   104
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   105
        public Option(boolean hasArg, Processing<T> processing, boolean hidden, String... aliases) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   106
            this.hasArg = hasArg;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   107
            this.processing = processing;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   108
            this.aliases = aliases;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   109
            this.hidden = hidden;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   110
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   111
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   112
        public Option(boolean hasArg, Processing<T> processing, String... aliases) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   113
            this(hasArg, processing, false, aliases);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   114
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   115
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   116
        public boolean isHidden() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   117
            return hidden;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   118
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   119
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   120
        public boolean matches(String opt) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   121
            for (String a : aliases) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   122
                if (a.equals(opt)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   123
                    return true;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   124
                } else if (opt.startsWith("--")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   125
                        && (hasArg && opt.startsWith(a + "="))) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   126
                    return true;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   127
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   128
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   129
            return false;
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 ignoreRest() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   133
            return false;
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
        void process(T task, String opt, String arg) throws BadArgs {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   137
            processing.process(task, opt, arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   138
        }
38869
4bac8f3bce74 8156994: jimage --help is not helpful
jlaskey
parents: 38457
diff changeset
   139
4bac8f3bce74 8156994: jimage --help is not helpful
jlaskey
parents: 38457
diff changeset
   140
        public String[] aliases() {
4bac8f3bce74 8156994: jimage --help is not helpful
jlaskey
parents: 38457
diff changeset
   141
            return aliases;
4bac8f3bce74 8156994: jimage --help is not helpful
jlaskey
parents: 38457
diff changeset
   142
        }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   143
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   144
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   145
    private static class PlugOption extends Option<PluginsOptions> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   146
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   147
        public PlugOption(boolean hasArg,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   148
                Processing<PluginsOptions> processing, boolean hidden, String... aliases) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   149
            super(hasArg, processing, hidden, aliases);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   150
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   151
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   152
        public PlugOption(boolean hasArg,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   153
                Processing<PluginsOptions> processing, String... aliases) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   154
            super(hasArg, processing, aliases);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   155
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   156
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   157
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   158
    private final class PluginsOptions {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   159
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   160
        private static final String PLUGINS_PATH = "--plugin-module-path";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   161
        private static final String POST_PROCESS = "--post-process-path";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   162
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   163
        private Layer pluginsLayer = Layer.boot();
41831
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   164
        private final List<Plugin> plugins;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   165
        private String lastSorter;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   166
        private boolean listPlugins;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   167
        private Path existingImage;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   168
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   169
        // plugin to args maps. Each plugin may be used more than once in command line.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   170
        // Each such occurrence results in a Map of arguments. So, there could be multiple
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   171
        // args maps per plugin instance.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   172
        private final Map<Plugin, List<Map<String, String>>> pluginToMaps = new HashMap<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   173
        private final List<PlugOption> pluginsOptions = new ArrayList<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   174
        private final List<PlugOption> mainOptions = new ArrayList<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   175
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   176
        private PluginsOptions(String pp) throws BadArgs {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   177
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   178
            if (pp != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   179
                String[] dirs = pp.split(File.pathSeparator);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   180
                List<Path> paths = new ArrayList<>(dirs.length);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   181
                for (String dir : dirs) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   182
                    paths.add(Paths.get(dir));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   183
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   184
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   185
                pluginsLayer = createPluginsLayer(paths);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   186
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   187
41831
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   188
            plugins = PluginRepository.getPlugins(pluginsLayer);
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   189
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   190
            Set<String> optionsSeen = new HashSet<>();
41831
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   191
            for (Plugin plugin : plugins) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   192
                if (!Utils.isDisabled(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   193
                    addOrderedPluginOptions(plugin, optionsSeen);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   194
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   195
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   196
            mainOptions.add(new PlugOption(false,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   197
                    (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   198
                        // This option is handled prior
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   199
                        // to have the options parsed.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   200
                    },
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39321
diff changeset
   201
                    "--plugin-module-path"));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   202
            mainOptions.add(new PlugOption(true, (task, opt, arg) -> {
41831
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   203
                    for (Plugin plugin : plugins) {
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   204
                        if (plugin.getName().equals(arg)) {
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   205
                            pluginToMaps.remove(plugin);
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   206
                            return;
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   207
                        }
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   208
                    }
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   209
                    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
   210
                },
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   211
                "--disable-plugin"));
2dd91b18195b 8160063: Provide a means to disable a plugin via the command line
sundar
parents: 41817
diff changeset
   212
            mainOptions.add(new PlugOption(true, (task, opt, arg) -> {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   213
                Path path = Paths.get(arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   214
                if (!Files.exists(path) || !Files.isDirectory(path)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   215
                    throw newBadArgs("err.existing.image.must.exist");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   216
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   217
                existingImage = path.toAbsolutePath();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   218
            }, true, POST_PROCESS));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   219
            mainOptions.add(new PlugOption(true,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   220
                    (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   221
                        lastSorter = arg;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   222
                    },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   223
                    true, "--resources-last-sorter"));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   224
            mainOptions.add(new PlugOption(false,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   225
                    (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   226
                        listPlugins = true;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   227
                    },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   228
                    "--list-plugins"));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   229
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   230
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   231
        private List<Map<String, String>> argListFor(Plugin plugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   232
            List<Map<String, String>> mapList = pluginToMaps.get(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   233
            if (mapList == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   234
                mapList = new ArrayList<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   235
                pluginToMaps.put(plugin, mapList);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   236
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   237
            return mapList;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   238
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   239
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   240
        private void addEmptyArgumentMap(Plugin plugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   241
            argListFor(plugin).add(Collections.emptyMap());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   242
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   243
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   244
        private Map<String, String> addArgumentMap(Plugin plugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   245
            Map<String, String> map = new HashMap<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   246
            argListFor(plugin).add(map);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   247
            return map;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   248
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   249
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   250
        private void addOrderedPluginOptions(Plugin plugin,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   251
            Set<String> optionsSeen) throws BadArgs {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   252
            String option = plugin.getOption();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   253
            if (option == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   254
                return;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   255
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   256
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   257
            // make sure that more than one plugin does not use the same option!
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   258
            if (optionsSeen.contains(option)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   259
                throw new BadArgs("err.plugin.mutiple.options",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   260
                        option);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   261
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   262
            optionsSeen.add(option);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   263
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   264
            PlugOption plugOption
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   265
                    = new PlugOption(plugin.hasArguments(),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   266
                            (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   267
                                if (!Utils.isFunctional(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   268
                                    throw newBadArgs("err.provider.not.functional",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   269
                                            option);
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
                                if (! plugin.hasArguments()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   273
                                    addEmptyArgumentMap(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   274
                                    return;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   275
                                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   276
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   277
                                Map<String, String> m = addArgumentMap(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   278
                                // handle one or more arguments
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   279
                                if (arg.indexOf(':') == -1) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   280
                                    // single argument case
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   281
                                    m.put(option, arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   282
                                } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   283
                                    // This option can accept more than one arguments
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   284
                                    // like --option_name=arg_value:arg2=value2:arg3=value3
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   285
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   286
                                    // ":" followed by word char condition takes care of args that
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   287
                                    // like Windows absolute paths "C:\foo", "C:/foo" [cygwin] etc.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   288
                                    // This enforces that key names start with a word character.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   289
                                    String[] args = arg.split(":(?=\\w)", -1);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   290
                                    String firstArg = args[0];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   291
                                    if (firstArg.isEmpty()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   292
                                        throw newBadArgs("err.provider.additional.arg.error",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   293
                                            option, arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   294
                                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   295
                                    m.put(option, firstArg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   296
                                    // process the additional arguments
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   297
                                    for (int i = 1; i < args.length; i++) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   298
                                        String addArg = args[i];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   299
                                        int eqIdx = addArg.indexOf('=');
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   300
                                        if (eqIdx == -1) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   301
                                            throw newBadArgs("err.provider.additional.arg.error",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   302
                                                option, arg);
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
                                        String addArgName = addArg.substring(0, eqIdx);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   306
                                        String addArgValue = addArg.substring(eqIdx+1);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   307
                                        if (addArgName.isEmpty() || addArgValue.isEmpty()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   308
                                            throw newBadArgs("err.provider.additional.arg.error",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   309
                                                option, arg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   310
                                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   311
                                        m.put(addArgName, addArgValue);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   312
                                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   313
                                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   314
                            },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   315
                            "--" + option);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   316
            pluginsOptions.add(plugOption);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   317
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   318
            if (Utils.isFunctional(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   319
                if (Utils.isAutoEnabled(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   320
                    addEmptyArgumentMap(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   321
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   322
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   323
                if (plugin instanceof DefaultCompressPlugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   324
                    plugOption
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   325
                        = new PlugOption(false,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   326
                            (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   327
                                Map<String, String> m = addArgumentMap(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   328
                                m.put(DefaultCompressPlugin.NAME, DefaultCompressPlugin.LEVEL_2);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   329
                            }, "-c");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   330
                    mainOptions.add(plugOption);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   331
                } else if (plugin instanceof StripDebugPlugin) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   332
                    plugOption
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   333
                        = new PlugOption(false,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   334
                            (task, opt, arg) -> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   335
                                addArgumentMap(plugin);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   336
                            }, "-G");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   337
                    mainOptions.add(plugOption);
41561
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   338
                } else if (plugin instanceof ExcludeJmodSectionPlugin) {
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   339
                    plugOption = new PlugOption(false, (task, opt, arg) -> {
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   340
                            Map<String, String> m = addArgumentMap(plugin);
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   341
                            m.put(ExcludeJmodSectionPlugin.NAME,
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   342
                                  ExcludeJmodSectionPlugin.MAN_PAGES);
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   343
                        }, "--no-man-pages");
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   344
                    mainOptions.add(plugOption);
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   345
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   346
                    plugOption = new PlugOption(false, (task, opt, arg) -> {
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   347
                        Map<String, String> m = addArgumentMap(plugin);
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   348
                        m.put(ExcludeJmodSectionPlugin.NAME,
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   349
                              ExcludeJmodSectionPlugin.INCLUDE_HEADER_FILES);
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   350
                    }, "--no-header-files");
0c6942d13f2e 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41559
diff changeset
   351
                    mainOptions.add(plugOption);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   352
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   353
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   354
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   355
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   356
        private PlugOption getOption(String name) throws BadArgs {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   357
            for (PlugOption o : pluginsOptions) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   358
                if (o.matches(name)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   359
                    return o;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   360
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   361
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   362
            for (PlugOption o : mainOptions) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   363
                if (o.matches(name)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   364
                    return o;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   365
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   366
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   367
            return null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   368
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   369
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   370
        private PluginsConfiguration getPluginsConfig(Path output
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   371
                    ) throws IOException, BadArgs {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   372
            if (output != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   373
                if (Files.exists(output)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   374
                    throw new PluginException(PluginsResourceBundle.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   375
                            getMessage("err.dir.already.exits", output));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   376
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   377
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   378
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   379
            List<Plugin> pluginsList = new ArrayList<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   380
            for (Entry<Plugin, List<Map<String, String>>> entry : pluginToMaps.entrySet()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   381
                Plugin plugin = entry.getKey();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   382
                List<Map<String, String>> argsMaps = entry.getValue();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   383
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   384
                // same plugin option may be used multiple times in command line.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   385
                // we call configure once for each occurrence. It is upto the plugin
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   386
                // to 'merge' and/or 'override' arguments.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   387
                for (Map<String, String> map : argsMaps) {
38320
e24c7029e8ba 8156914: jlink API minor cleanups
sundar
parents: 37779
diff changeset
   388
                    plugin.configure(Collections.unmodifiableMap(map));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   389
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   390
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   391
                if (!Utils.isDisabled(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   392
                    pluginsList.add(plugin);
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
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   396
            // recreate or postprocessing don't require an output directory.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   397
            ImageBuilder builder = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   398
            if (output != null) {
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   399
                builder = new DefaultImageBuilder(output);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   400
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   401
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   402
            return new Jlink.PluginsConfiguration(pluginsList,
38320
e24c7029e8ba 8156914: jlink API minor cleanups
sundar
parents: 37779
diff changeset
   403
                    builder, lastSorter);
36511
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
    private static final class ResourceBundleHelper {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   408
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   409
        private final ResourceBundle bundle;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   410
        private final ResourceBundle pluginBundle;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   411
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   412
        ResourceBundleHelper(String path) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   413
            Locale locale = Locale.getDefault();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   414
            try {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   415
                bundle = ResourceBundle.getBundle(path, locale);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   416
                pluginBundle = ResourceBundle.getBundle("jdk.tools.jlink.resources.plugins", locale);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   417
            } catch (MissingResourceException e) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   418
                throw new InternalError("Cannot find jlink resource bundle for locale " + locale);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   419
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   420
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   421
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   422
        String getMessage(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   423
            String val;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   424
            try {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   425
                val = bundle.getString(key);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   426
            } catch (MissingResourceException e) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   427
                // XXX OK, check in plugin bundle
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   428
                val = pluginBundle.getString(key);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   429
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   430
            return MessageFormat.format(val, args);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   431
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   432
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   433
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   434
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   435
    public final class OptionsHelper<T> {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   436
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   437
        private final List<Option<T>> options;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   438
        private String[] command;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   439
        private String defaults;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   440
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   441
        OptionsHelper(List<Option<T>> options) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   442
            this.options = options;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   443
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   444
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   445
        private boolean hasArgument(String optionName) throws BadArgs {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   446
            Option<?> opt = getOption(optionName);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   447
            if (opt == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   448
                opt = pluginOptions.getOption(optionName);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   449
                if (opt == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   450
                    throw new BadArgs("err.unknown.option", optionName).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   451
                            showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   452
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   453
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   454
            return opt.hasArg;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   455
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   456
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   457
        public boolean shouldListPlugins() {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   458
            return pluginOptions.listPlugins;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   459
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   460
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   461
        private String getPluginsPath(String[] args) throws BadArgs {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   462
            String pp = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   463
            for (int i = 0; i < args.length; i++) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   464
                if (args[i].equals(PluginsOptions.PLUGINS_PATH)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   465
                    if (i == args.length - 1) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   466
                        throw new BadArgs("err.no.plugins.path").showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   467
                    } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   468
                        i += 1;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   469
                        pp = args[i];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   470
                        if (!pp.isEmpty() && pp.charAt(0) == '-') {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   471
                            throw new BadArgs("err.no.plugins.path").showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   472
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   473
                        break;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   474
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   475
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   476
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   477
            return pp;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   478
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   479
41766
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   480
        // used by jimage. Return unhandled arguments like "create", "describe".
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   481
        public List<String> handleOptions(T task, String[] args) throws BadArgs {
41766
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   482
            return handleOptions(task, args, true);
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   483
        }
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   484
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   485
        // used by jlink. No unhandled arguments like "create", "describe".
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   486
        void handleOptionsNoUnhandled(T task, String[] args) throws BadArgs {
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   487
            handleOptions(task, args, false);
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   488
        }
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   489
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   490
        // 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
   491
        // "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
   492
        // 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
   493
        // tells whether to allow for unhandled arguments or not.
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   494
        private List<String> handleOptions(T task, String[] args, boolean collectUnhandled) throws BadArgs {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   495
            // findbugs warning, copy instead of keeping a reference.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   496
            command = Arrays.copyOf(args, args.length);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   497
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   498
            // Must extract it prior to do any option analysis.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   499
            // Required to interpret custom plugin options.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   500
            // Unit tests can call Task multiple time in same JVM.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   501
            pluginOptions = new PluginsOptions(getPluginsPath(args));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   502
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   503
            // First extract plugins path if any
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   504
            String pp = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   505
            List<String> filteredArgs = new ArrayList<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   506
            for (int i = 0; i < args.length; i++) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   507
                if (args[i].equals(PluginsOptions.PLUGINS_PATH)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   508
                    if (i == args.length - 1) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   509
                        throw new BadArgs("err.no.plugins.path").showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   510
                    } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   511
                        warning("warn.thirdparty.plugins.enabled");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   512
                        log.println(bundleHelper.getMessage("warn.thirdparty.plugins"));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   513
                        i += 1;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   514
                        String arg = args[i];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   515
                        if (!arg.isEmpty() && arg.charAt(0) == '-') {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   516
                            throw new BadArgs("err.no.plugins.path").showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   517
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   518
                        pp = args[i];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   519
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   520
                } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   521
                    filteredArgs.add(args[i]);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   522
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   523
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   524
            String[] arr = new String[filteredArgs.size()];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   525
            args = filteredArgs.toArray(arr);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   526
41766
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   527
            List<String> rest = collectUnhandled? new ArrayList<>() : null;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   528
            // process options
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   529
            for (int i = 0; i < args.length; i++) {
41766
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   530
                if (args[i].charAt(0) == '-') {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   531
                    String name = args[i];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   532
                    PlugOption pluginOption = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   533
                    Option<T> option = getOption(name);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   534
                    if (option == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   535
                        pluginOption = pluginOptions.getOption(name);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   536
                        if (pluginOption == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   537
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   538
                            throw new BadArgs("err.unknown.option", name).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   539
                                    showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   540
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   541
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   542
                    Option<?> opt = pluginOption == null ? option : pluginOption;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   543
                    String param = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   544
                    if (opt.hasArg) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   545
                        if (name.startsWith("--") && name.indexOf('=') > 0) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   546
                            param = name.substring(name.indexOf('=') + 1,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   547
                                    name.length());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   548
                        } else if (i + 1 < args.length) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   549
                            param = args[++i];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   550
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   551
                        if (param == null || param.isEmpty()
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   552
                                || (param.length() >= 2 && param.charAt(0) == '-'
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   553
                                && param.charAt(1) == '-')) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   554
                            throw new BadArgs("err.missing.arg", name).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   555
                                    showUsage(true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   556
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   557
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   558
                    if (pluginOption != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   559
                        pluginOption.process(pluginOptions, name, param);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   560
                    } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   561
                        option.process(task, name, param);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   562
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   563
                    if (opt.ignoreRest()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   564
                        i = args.length;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   565
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   566
                } else {
41766
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   567
                    if (collectUnhandled) {
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   568
                        rest.add(args[i]);
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   569
                    } else {
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   570
                        throw new BadArgs("err.orphan.argument", args[i]).
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   571
                            showUsage(true);
b5eab76a23a9 8166810: jlink should fail on extra arguments
sundar
parents: 41561
diff changeset
   572
                    }
36511
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
            return rest;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   576
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   577
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   578
        private Option<T> getOption(String name) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   579
            for (Option<T> o : options) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   580
                if (o.matches(name)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   581
                    return o;
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
            return null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   585
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   586
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   587
        public void showHelp(String progName) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   588
            showHelp(progName, true);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   589
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   590
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   591
        private void showHelp(String progName, boolean showsImageBuilder) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   592
            log.println(bundleHelper.getMessage("main.usage", progName));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   593
            for (Option<?> o : options) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   594
                String name = o.aliases[0].substring(1); // there must always be at least one name
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   595
                name = name.charAt(0) == '-' ? name.substring(1) : name;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   596
                if (o.isHidden() || name.equals("h")) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   597
                    continue;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   598
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   599
                log.println(bundleHelper.getMessage("main.opt." + name));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   600
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   601
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   602
            for (Option<?> o : pluginOptions.mainOptions) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   603
                if (o.aliases[0].equals(PluginsOptions.POST_PROCESS)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   604
                        && !showsImageBuilder) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   605
                    continue;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   606
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   607
                String name = o.aliases[0].substring(1); // there must always be at least one name
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   608
                name = name.charAt(0) == '-' ? name.substring(1) : name;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   609
                if (o.isHidden()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   610
                    continue;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   611
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   612
                log.println(bundleHelper.getMessage("plugin.opt." + name));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   613
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   614
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   615
            log.println(bundleHelper.getMessage("main.command.files"));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   616
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   617
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   618
        public void listPlugins() {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   619
            log.println("\n" + bundleHelper.getMessage("main.extended.help"));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   620
            List<Plugin> pluginList = PluginRepository.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   621
                    getPlugins(pluginOptions.pluginsLayer);
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   622
            for (Plugin plugin : Utils.getSortedPlugins(pluginList)) {
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   623
                showPlugin(plugin, log);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   624
            }
39150
cb99396625b4 8159172: Update usage of jlink/jimage/jmod to show option patterns
jlaskey
parents: 38869
diff changeset
   625
cb99396625b4 8159172: Update usage of jlink/jimage/jmod to show option patterns
jlaskey
parents: 38869
diff changeset
   626
            log.println("\n" + bundleHelper.getMessage("main.extended.help.footer"));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   627
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   628
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   629
        private void showPlugin(Plugin plugin, PrintWriter log) {
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   630
            if (showsPlugin(plugin)) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   631
                log.println("\n" + bundleHelper.getMessage("main.plugin.name")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   632
                        + ": " + plugin.getName());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   633
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   634
                // print verbose details for non-builtin plugins
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   635
                if (!Utils.isBuiltin(plugin)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   636
                    log.println(bundleHelper.getMessage("main.plugin.class")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   637
                         + ": " + plugin.getClass().getName());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   638
                    log.println(bundleHelper.getMessage("main.plugin.module")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   639
                         + ": " + plugin.getClass().getModule().getName());
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   640
                    Category category = plugin.getType();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   641
                    log.println(bundleHelper.getMessage("main.plugin.category")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   642
                         + ": " + category.getName());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   643
                    log.println(bundleHelper.getMessage("main.plugin.state")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   644
                        + ": " + plugin.getStateDescription());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   645
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   646
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   647
                String option = plugin.getOption();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   648
                if (option != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   649
                    log.println(bundleHelper.getMessage("main.plugin.option")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   650
                        + ": --" + plugin.getOption()
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   651
                        + (plugin.hasArguments()? ("=" + plugin.getArgumentsDescription()) : ""));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   652
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   653
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   654
                // description can be long spanning more than one line and so
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   655
                // print a newline after description label.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   656
                log.println(bundleHelper.getMessage("main.plugin.description")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   657
                        + ": " + plugin.getDescription());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   658
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   659
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   660
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   661
        String[] getInputCommand() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   662
            return command;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   663
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   664
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   665
        String getDefaults() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   666
            return defaults;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   667
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   668
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   669
        public Layer getPluginsLayer() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   670
            return pluginOptions.pluginsLayer;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   671
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   672
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   673
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   674
    private PluginsOptions pluginOptions;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   675
    private PrintWriter log;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   676
    private final ResourceBundleHelper bundleHelper;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   677
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   678
    public TaskHelper(String path) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   679
        if (!JLINK_BUNDLE.equals(path) && !JIMAGE_BUNDLE.equals(path)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   680
            throw new IllegalArgumentException("Invalid Bundle");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   681
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   682
        this.bundleHelper = new ResourceBundleHelper(path);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   683
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   684
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   685
    public <T> OptionsHelper<T> newOptionsHelper(Class<T> clazz,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   686
            Option<?>[] options) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   687
        List<Option<T>> optionsList = new ArrayList<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   688
        for (Option<?> o : options) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   689
            @SuppressWarnings("unchecked")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   690
            Option<T> opt = (Option<T>) o;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   691
            optionsList.add(opt);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   692
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   693
        return new OptionsHelper<>(optionsList);
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 BadArgs newBadArgs(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   697
        return new BadArgs(key, args);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   698
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   699
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   700
    public String getMessage(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   701
        return bundleHelper.getMessage(key, args);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   702
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   703
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   704
    public void setLog(PrintWriter log) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   705
        this.log = log;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   706
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   707
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   708
    public void reportError(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   709
        log.println(bundleHelper.getMessage("error.prefix") + " "
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   710
                + bundleHelper.getMessage(key, args));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   711
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   712
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   713
    public void reportUnknownError(String message) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   714
        log.println(bundleHelper.getMessage("error.prefix") + " " + message);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   715
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   716
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   717
    public void warning(String key, Object... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   718
        log.println(bundleHelper.getMessage("warn.prefix") + " "
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   719
                + bundleHelper.getMessage(key, args));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   720
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   721
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   722
    public PluginsConfiguration getPluginsConfig(Path output)
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   723
            throws IOException, BadArgs {
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   724
        return pluginOptions.getPluginsConfig(output);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   725
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   726
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   727
    public Path getExistingImage() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   728
        return pluginOptions.existingImage;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   729
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   730
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   731
    public void showVersion(boolean full) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   732
        log.println(version(full ? "full" : "release"));
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
    public String version(String key) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   736
        return System.getProperty("java.version");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   737
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   738
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   739
    static Layer createPluginsLayer(List<Path> paths) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   740
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 41766
diff changeset
   741
        Path[] dirs = paths.toArray(new Path[0]);
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 41766
diff changeset
   742
        ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess()
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 41766
diff changeset
   743
            .newModulePath(Runtime.version(), true, dirs);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   744
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   745
        Configuration bootConfiguration = Layer.boot().configuration();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   746
        try {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   747
            Configuration cf = bootConfiguration
38457
3d019217e322 8152650: ModuleFinder.compose should accept varargs
alanb
parents: 38320
diff changeset
   748
                .resolveRequiresAndUses(ModuleFinder.of(),
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   749
                                        finder,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   750
                                        Collections.emptySet());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   751
            ClassLoader scl = ClassLoader.getSystemClassLoader();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   752
            return Layer.boot().defineModulesWithOneLoader(cf, scl);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   753
        } catch (Exception ex) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   754
            // Malformed plugin modules (e.g.: same package in multiple modules).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   755
            throw new PluginException("Invalid modules in the plugins path: " + ex);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   756
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   757
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   758
39321
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   759
    // Display all plugins
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   760
    private static boolean showsPlugin(Plugin plugin) {
c60f34e8c057 8160641: PostProcessingPlugin and ExecutableImage should not be part of plugin API
sundar
parents: 39150
diff changeset
   761
        return (!Utils.isDisabled(plugin) && plugin.getOption() != null);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   762
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   763
}