equal
deleted
inserted
replaced
212 } |
212 } |
213 } else if (mainJarType == ModFile.ModType.Unknown || |
213 } else if (mainJarType == ModFile.ModType.Unknown || |
214 mainJarType == ModFile.ModType.ModularJar) { |
214 mainJarType == ModFile.ModType.ModularJar) { |
215 addModules.add(ModuleHelper.ALL_DEFAULT); |
215 addModules.add(ModuleHelper.ALL_DEFAULT); |
216 } |
216 } |
217 } |
217 } |
218 |
218 |
219 Set<String> validModules = |
219 Set<String> validModules = |
220 getValidModules(modulePath, addModules, limitModules); |
220 getValidModules(modulePath, addModules, limitModules); |
221 |
221 |
222 if (mainModule != null) { |
222 if (mainModule != null) { |
277 .resolveAndBind(finder, ModuleFinder.of(), roots) |
277 .resolveAndBind(finder, ModuleFinder.of(), roots) |
278 .modules() |
278 .modules() |
279 .stream() |
279 .stream() |
280 .map(ResolvedModule::name) |
280 .map(ResolvedModule::name) |
281 .collect(Collectors.toSet()); |
281 .collect(Collectors.toSet()); |
282 } |
282 } |
283 |
283 |
284 /* |
284 /* |
285 * Returns true if the given module exports an API to all module. |
285 * Returns true if the given module exports an API to all module. |
286 */ |
286 */ |
287 private static boolean exportsAPI(ModuleDescriptor descriptor) { |
287 private static boolean exportsAPI(ModuleDescriptor descriptor) { |
331 |
331 |
332 ModuleHelper(List<Path> paths, Set<String> addModules, |
332 ModuleHelper(List<Path> paths, Set<String> addModules, |
333 Set<String> limitModules) { |
333 Set<String> limitModules) { |
334 boolean addAllModulePath = false; |
334 boolean addAllModulePath = false; |
335 boolean addDefaultMods = false; |
335 boolean addDefaultMods = false; |
336 |
336 |
337 for (Iterator<String> iterator = addModules.iterator(); |
337 for (Iterator<String> iterator = addModules.iterator(); |
338 iterator.hasNext();) { |
338 iterator.hasNext();) { |
339 String module = iterator.next(); |
339 String module = iterator.next(); |
340 |
340 |
341 switch (module) { |
341 switch (module) { |
420 args.add("--no-header-files"); |
420 args.add("--no-header-files"); |
421 if (bindServices) { |
421 if (bindServices) { |
422 args.add("--bind-services"); |
422 args.add("--bind-services"); |
423 } |
423 } |
424 } |
424 } |
425 |
425 |
426 StringWriter writer = new StringWriter(); |
426 StringWriter writer = new StringWriter(); |
427 PrintWriter pw = new PrintWriter(writer); |
427 PrintWriter pw = new PrintWriter(writer); |
428 |
428 |
429 Log.verbose("jlink arguments: " + args); |
429 Log.verbose("jlink arguments: " + args); |
430 int retVal = JLINK_TOOL.run(pw, pw, args.toArray(new String[0])); |
430 int retVal = JLINK_TOOL.run(pw, pw, args.toArray(new String[0])); |