equal
deleted
inserted
replaced
170 void usage() { |
170 void usage() { |
171 usage(true); |
171 usage(true); |
172 } |
172 } |
173 |
173 |
174 void usage(boolean exit) { |
174 void usage(boolean exit) { |
175 usage("main.usage", "-help", null, exit); |
175 usage("main.usage", "-help", "main.usage.foot", exit); |
176 } |
176 } |
177 |
177 |
178 @Override |
178 @Override |
179 void Xusage() { |
179 void Xusage() { |
180 Xusage(true); |
180 Xusage(true); |
353 |
353 |
354 if (fileManager instanceof BaseFileManager) { |
354 if (fileManager instanceof BaseFileManager) { |
355 ((BaseFileManager) fileManager).handleOptions(fileManagerOpts); |
355 ((BaseFileManager) fileManager).handleOptions(fileManagerOpts); |
356 } |
356 } |
357 |
357 |
358 String platformString = compOpts.get("-release"); |
358 String platformString = compOpts.get("--release"); |
359 |
359 |
360 if (platformString != null) { |
360 if (platformString != null) { |
361 if (compOpts.isSet("-source")) { |
361 if (compOpts.isSet("-source")) { |
362 usageError("main.release.bootclasspath.conflict", "-source"); |
362 usageError("main.release.bootclasspath.conflict", "-source"); |
363 } |
363 } |
364 if (fileManagerOpts.containsKey(BOOTCLASSPATH)) { |
364 if (fileManagerOpts.containsKey(BOOT_CLASS_PATH)) { |
365 usageError("main.release.bootclasspath.conflict", BOOTCLASSPATH.getText()); |
365 usageError("main.release.bootclasspath.conflict", BOOT_CLASS_PATH.getPrimaryName()); |
366 } |
366 } |
367 |
367 |
368 PlatformDescription platformDescription = |
368 PlatformDescription platformDescription = |
369 PlatformUtils.lookupPlatformDescription(platformString); |
369 PlatformUtils.lookupPlatformDescription(platformString); |
370 |
370 |