src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java
branchJDK-8200758-branch
changeset 57150 fa68c2ab636d
parent 57106 ea870b9ce89a
child 57192 3d6a21f41c10
equal deleted inserted replaced
57141:e7ba8c89abe7 57150:fa68c2ab636d
    63         add(CLIOptions.CREATE_IMAGE, CLIOptions.OUTPUT);
    63         add(CLIOptions.CREATE_IMAGE, CLIOptions.OUTPUT);
    64         add(CLIOptions.CREATE_IMAGE, CLIOptions.APPCLASS);
    64         add(CLIOptions.CREATE_IMAGE, CLIOptions.APPCLASS);
    65         add(CLIOptions.CREATE_IMAGE, CLIOptions.NAME);
    65         add(CLIOptions.CREATE_IMAGE, CLIOptions.NAME);
    66         add(CLIOptions.CREATE_IMAGE, CLIOptions.IDENTIFIER);
    66         add(CLIOptions.CREATE_IMAGE, CLIOptions.IDENTIFIER);
    67         add(CLIOptions.CREATE_IMAGE, CLIOptions.VERBOSE);
    67         add(CLIOptions.CREATE_IMAGE, CLIOptions.VERBOSE);
    68         add(CLIOptions.CREATE_IMAGE, CLIOptions.FORCE);
    68         add(CLIOptions.CREATE_IMAGE, CLIOptions.OVERWRITE);
    69         add(CLIOptions.CREATE_IMAGE, CLIOptions.FILES);
    69         add(CLIOptions.CREATE_IMAGE, CLIOptions.FILES);
    70         add(CLIOptions.CREATE_IMAGE, CLIOptions.ARGUMENTS);
    70         add(CLIOptions.CREATE_IMAGE, CLIOptions.ARGUMENTS);
    71         add(CLIOptions.CREATE_IMAGE, CLIOptions.STRIP_NATIVE_COMMANDS);
    71         add(CLIOptions.CREATE_IMAGE, CLIOptions.STRIP_NATIVE_COMMANDS);
    72         add(CLIOptions.CREATE_IMAGE, CLIOptions.ICON);
    72         add(CLIOptions.CREATE_IMAGE, CLIOptions.ICON);
    73         add(CLIOptions.CREATE_IMAGE, CLIOptions.VERSION);
    73         add(CLIOptions.CREATE_IMAGE, CLIOptions.VERSION);
    77         add(CLIOptions.CREATE_IMAGE, CLIOptions.PREDEFINED_RUNTIME_IMAGE);
    77         add(CLIOptions.CREATE_IMAGE, CLIOptions.PREDEFINED_RUNTIME_IMAGE);
    78         add(CLIOptions.CREATE_IMAGE, CLIOptions.MAIN_JAR);
    78         add(CLIOptions.CREATE_IMAGE, CLIOptions.MAIN_JAR);
    79         add(CLIOptions.CREATE_IMAGE, CLIOptions.MODULE);
    79         add(CLIOptions.CREATE_IMAGE, CLIOptions.MODULE);
    80         add(CLIOptions.CREATE_IMAGE, CLIOptions.ADD_MODULES);
    80         add(CLIOptions.CREATE_IMAGE, CLIOptions.ADD_MODULES);
    81         add(CLIOptions.CREATE_IMAGE, CLIOptions.MODULE_PATH);
    81         add(CLIOptions.CREATE_IMAGE, CLIOptions.MODULE_PATH);
    82         add(CLIOptions.CREATE_IMAGE, CLIOptions.LIMIT_MODULES);
       
    83         add(CLIOptions.CREATE_IMAGE, CLIOptions.RESOURCE_DIR);
    82         add(CLIOptions.CREATE_IMAGE, CLIOptions.RESOURCE_DIR);
    84 
    83 
    85         if (Platform.getPlatform() == Platform.MAC) {
    84         if (Platform.getPlatform() == Platform.MAC) {
    86             add(CLIOptions.CREATE_IMAGE, CLIOptions.MAC_SIGN);
    85             add(CLIOptions.CREATE_IMAGE, CLIOptions.MAC_SIGN);
    87             add(CLIOptions.CREATE_IMAGE, CLIOptions.MAC_BUNDLE_NAME);
    86             add(CLIOptions.CREATE_IMAGE, CLIOptions.MAC_BUNDLE_NAME);
    99             add(CLIOptions.CREATE_IMAGE, CLIOptions.COPYRIGHT);
    98             add(CLIOptions.CREATE_IMAGE, CLIOptions.COPYRIGHT);
   100             add(CLIOptions.CREATE_IMAGE, CLIOptions.WIN_CONSOLE_HINT);
    99             add(CLIOptions.CREATE_IMAGE, CLIOptions.WIN_CONSOLE_HINT);
   101         }
   100         }
   102 
   101 
   103         // add options for CREATE_INSTALLER
   102         // add options for CREATE_INSTALLER
   104 
   103         // (start with all options for CREATE_IMAGE)
   105         // add all CREATE_IMAGE options for CREATE_JRE_INSTALLER
       
   106         Set<CLIOptions> imageOptions = options.get(CLIOptions.CREATE_IMAGE);
   104         Set<CLIOptions> imageOptions = options.get(CLIOptions.CREATE_IMAGE);
   107         imageOptions.forEach(o -> add(CLIOptions.CREATE_INSTALLER, o));
   105         imageOptions.forEach(o -> add(CLIOptions.CREATE_INSTALLER, o));
   108 
   106 
       
   107         add(CLIOptions.CREATE_INSTALLER, CLIOptions.RUNTIME_INSTALLER);
       
   108         add(CLIOptions.CREATE_INSTALLER, CLIOptions.INSTALLER_TYPE);
   109         add(CLIOptions.CREATE_INSTALLER, CLIOptions.LICENSE_FILE);
   109         add(CLIOptions.CREATE_INSTALLER, CLIOptions.LICENSE_FILE);
   110         add(CLIOptions.CREATE_INSTALLER, CLIOptions.FILE_ASSOCIATIONS);
   110         add(CLIOptions.CREATE_INSTALLER, CLIOptions.FILE_ASSOCIATIONS);
   111         add(CLIOptions.CREATE_INSTALLER, CLIOptions.INSTALL_DIR);
   111         add(CLIOptions.CREATE_INSTALLER, CLIOptions.INSTALL_DIR);
   112         add(CLIOptions.CREATE_INSTALLER, CLIOptions.PREDEFINED_APP_IMAGE);
   112         add(CLIOptions.CREATE_INSTALLER, CLIOptions.PREDEFINED_APP_IMAGE);
       
   113         add(CLIOptions.CREATE_INSTALLER, CLIOptions.INSTALLER_TYPE);
   113 
   114 
   114         if (Platform.getPlatform() == Platform.MAC) {
   115         if (Platform.getPlatform() == Platform.MAC) {
   115             add(CLIOptions.CREATE_INSTALLER, CLIOptions.MAC_APP_STORE_CATEGORY);
   116             add(CLIOptions.CREATE_INSTALLER, CLIOptions.MAC_APP_STORE_CATEGORY);
   116             add(CLIOptions.CREATE_INSTALLER,
   117             add(CLIOptions.CREATE_INSTALLER,
   117                     CLIOptions.MAC_APP_STORE_ENTITLEMENTS);
   118                     CLIOptions.MAC_APP_STORE_ENTITLEMENTS);
   140             add(CLIOptions.CREATE_INSTALLER, CLIOptions.WIN_UPGRADE_UUID);
   141             add(CLIOptions.CREATE_INSTALLER, CLIOptions.WIN_UPGRADE_UUID);
   141             add(CLIOptions.CREATE_INSTALLER, CLIOptions.CATEGORY);
   142             add(CLIOptions.CREATE_INSTALLER, CLIOptions.CATEGORY);
   142             add(CLIOptions.CREATE_INSTALLER, CLIOptions.WIN_CONSOLE_HINT);
   143             add(CLIOptions.CREATE_INSTALLER, CLIOptions.WIN_CONSOLE_HINT);
   143         }
   144         }
   144 
   145 
   145         // add options for CREATE_JRE_INSTALLER
       
   146 
       
   147         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.INPUT);
       
   148         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.OUTPUT);
       
   149         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.NAME);
       
   150         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.VERBOSE);
       
   151         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.FILES);
       
   152         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.STRIP_NATIVE_COMMANDS);
       
   153         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.LICENSE_FILE);
       
   154         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.VERSION);
       
   155         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.BUILD_ROOT);
       
   156         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.INSTALL_DIR);
       
   157         add(CLIOptions.CREATE_JRE_INSTALLER,
       
   158                     CLIOptions.PREDEFINED_RUNTIME_IMAGE);
       
   159         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.ADD_MODULES);
       
   160         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.MODULE_PATH);
       
   161         add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.LIMIT_MODULES);
       
   162 
       
   163         if (Platform.getPlatform() == Platform.MAC) {
       
   164             add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.MAC_SIGN);
       
   165             add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.MAC_BUNDLE_NAME);
       
   166             add(CLIOptions.CREATE_JRE_INSTALLER,
       
   167                     CLIOptions.MAC_BUNDLE_IDENTIFIER);
       
   168             add(CLIOptions.CREATE_JRE_INSTALLER,
       
   169                     CLIOptions.MAC_BUNDLE_SIGNING_PREFIX);
       
   170             add(CLIOptions.CREATE_JRE_INSTALLER,
       
   171                     CLIOptions.MAC_SIGNING_KEY_NAME);
       
   172             add(CLIOptions.CREATE_JRE_INSTALLER,
       
   173                     CLIOptions.MAC_SIGNING_KEYCHAIN);
       
   174         }
       
   175 
       
   176         if (Platform.getPlatform() == Platform.WINDOWS) {
       
   177             add(CLIOptions.CREATE_JRE_INSTALLER,
       
   178                     CLIOptions.WIN_PER_USER_INSTALLATION);
       
   179             add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.WIN_DIR_CHOOSER);
       
   180             add(CLIOptions.CREATE_JRE_INSTALLER,
       
   181                     CLIOptions.WIN_UPGRADE_UUID);
       
   182             add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.DESCRIPTION);
       
   183             add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.VENDOR);
       
   184         }
       
   185 
       
   186         if (Platform.getPlatform() == Platform.LINUX) {
       
   187             add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.LINUX_BUNDLE_NAME);
       
   188             add(CLIOptions.CREATE_JRE_INSTALLER,
       
   189                     CLIOptions.LINUX_DEB_MAINTAINER);
       
   190             add(CLIOptions.CREATE_JRE_INSTALLER,
       
   191                     CLIOptions.LINUX_PACKAGE_DEPENDENCIES);
       
   192             add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.DESCRIPTION);
       
   193             add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.VENDOR);
       
   194             add(CLIOptions.CREATE_JRE_INSTALLER,
       
   195                     CLIOptions.LINUX_RPM_LICENSE_TYPE);
       
   196         }
       
   197 
       
   198         argsInitialized = true;
   146         argsInitialized = true;
   199     }
   147     }
   200 
   148 
   201     static void add(CLIOptions mode, CLIOptions arg) {
   149     static void add(CLIOptions mode, CLIOptions arg) {
   202         if (mode.equals(arg)) {
   150         if (mode.equals(arg)) {