equal
deleted
inserted
replaced
272 helper.getJmodSrcDir(), helper.getJmodClassesDir(), moduleName1, classNames); |
272 helper.getJmodSrcDir(), helper.getJmodClassesDir(), moduleName1, classNames); |
273 Path module2 = helper.generateModuleCompiledClasses( |
273 Path module2 = helper.generateModuleCompiledClasses( |
274 helper.getJmodSrcDir(), helper.getJmodClassesDir(), moduleName2, classNames); |
274 helper.getJmodSrcDir(), helper.getJmodClassesDir(), moduleName2, classNames); |
275 |
275 |
276 try (OutputStream out = Files.newOutputStream(module2.resolve("module-info.class"))) { |
276 try (OutputStream out = Files.newOutputStream(module2.resolve("module-info.class"))) { |
277 ModuleInfoWriter.write(ModuleDescriptor.module(moduleName1) |
277 ModuleInfoWriter.write(ModuleDescriptor.newModule(moduleName1) |
278 .requires("java.base").build(), out); |
278 .requires("java.base").build(), out); |
279 } |
279 } |
280 |
280 |
281 Path jmod1 = JImageGenerator.getJModTask() |
281 Path jmod1 = JImageGenerator.getJModTask() |
282 .addClassPath(module1) |
282 .addClassPath(module1) |
330 helper.getJarSrcDir(), helper.getJarClassesDir(), moduleName1, classNames); |
330 helper.getJarSrcDir(), helper.getJarClassesDir(), moduleName1, classNames); |
331 Path module2 = helper.generateModuleCompiledClasses( |
331 Path module2 = helper.generateModuleCompiledClasses( |
332 helper.getJarSrcDir(), helper.getJarClassesDir(), moduleName2, classNames); |
332 helper.getJarSrcDir(), helper.getJarClassesDir(), moduleName2, classNames); |
333 |
333 |
334 try (OutputStream out = Files.newOutputStream(module2.resolve("module-info.class"))) { |
334 try (OutputStream out = Files.newOutputStream(module2.resolve("module-info.class"))) { |
335 ModuleInfoWriter.write(ModuleDescriptor.module(moduleName1) |
335 ModuleInfoWriter.write(ModuleDescriptor.newModule(moduleName1) |
336 .requires("java.base").build(), out); |
336 .requires("java.base").build(), out); |
337 } |
337 } |
338 |
338 |
339 Path jar1 = JImageGenerator.createJarFile(helper.getJarDir().resolve(moduleName1 + ".jar"), module1); |
339 Path jar1 = JImageGenerator.createJarFile(helper.getJarDir().resolve(moduleName1 + ".jar"), module1); |
340 Path jar2 = JImageGenerator.createJarFile(helper.getJarDir().resolve(moduleName2 + ".jar"), module2); |
340 Path jar2 = JImageGenerator.createJarFile(helper.getJarDir().resolve(moduleName2 + ".jar"), module2); |