equal
deleted
inserted
replaced
58 Path classes = base.resolve("classes"); |
58 Path classes = base.resolve("classes"); |
59 tb.createDirectories(classes); |
59 tb.createDirectories(classes); |
60 |
60 |
61 String log = new JavacTask(tb) |
61 String log = new JavacTask(tb) |
62 .options("-XDrawDiagnostics", |
62 .options("-XDrawDiagnostics", |
63 "-modulesourcepath", src.toString()) |
63 "--module-source-path", src.toString()) |
64 .outdir(classes) |
64 .outdir(classes) |
65 .files(findJavaFiles(src)) |
65 .files(findJavaFiles(src)) |
66 .run(Task.Expect.FAIL) |
66 .run(Task.Expect.FAIL) |
67 .writeAll() |
67 .writeAll() |
68 .getOutput(Task.OutputKind.DIRECT); |
68 .getOutput(Task.OutputKind.DIRECT); |
81 Path classes = base.resolve("classes"); |
81 Path classes = base.resolve("classes"); |
82 tb.createDirectories(classes); |
82 tb.createDirectories(classes); |
83 |
83 |
84 String log = new JavacTask(tb) |
84 String log = new JavacTask(tb) |
85 .options("-XDrawDiagnostics", |
85 .options("-XDrawDiagnostics", |
86 "-modulesourcepath", src.toString()) |
86 "--module-source-path", src.toString()) |
87 .outdir(classes) |
87 .outdir(classes) |
88 .files(join(findJavaFiles(src), findJavaFiles(misc))) |
88 .files(join(findJavaFiles(src), findJavaFiles(misc))) |
89 .run(Task.Expect.FAIL) |
89 .run(Task.Expect.FAIL) |
90 .writeAll() |
90 .writeAll() |
91 .getOutput(Task.OutputKind.DIRECT); |
91 .getOutput(Task.OutputKind.DIRECT); |
102 Path classes = base.resolve("classes"); |
102 Path classes = base.resolve("classes"); |
103 tb.createDirectories(classes); |
103 tb.createDirectories(classes); |
104 |
104 |
105 String log = new JavacTask(tb) |
105 String log = new JavacTask(tb) |
106 .options("-XDrawDiagnostics", |
106 .options("-XDrawDiagnostics", |
107 "-modulesourcepath", src.toString()) |
107 "--module-source-path", src.toString()) |
108 .outdir(classes) |
108 .outdir(classes) |
109 .files(findJavaFiles(src)) |
109 .files(findJavaFiles(src)) |
110 .run(Task.Expect.FAIL) |
110 .run(Task.Expect.FAIL) |
111 .writeAll() |
111 .writeAll() |
112 .getOutput(Task.OutputKind.DIRECT); |
112 .getOutput(Task.OutputKind.DIRECT); |
122 tb.writeJavaFiles(src.resolve("m2"), "module m2 { requires m1; }"); |
122 tb.writeJavaFiles(src.resolve("m2"), "module m2 { requires m1; }"); |
123 Path modules = base.resolve("modules"); |
123 Path modules = base.resolve("modules"); |
124 Files.createDirectories(modules); |
124 Files.createDirectories(modules); |
125 |
125 |
126 new JavacTask(tb) |
126 new JavacTask(tb) |
127 .options("-modulesourcepath", src.toString()) |
127 .options("--module-source-path", src.toString()) |
128 .outdir(modules) |
128 .outdir(modules) |
129 .files(src.resolve("m2/module-info.java")) |
129 .files(src.resolve("m2/module-info.java")) |
130 .run() |
130 .run() |
131 .writeAll(); |
131 .writeAll(); |
132 } |
132 } |
137 tb.writeJavaFiles(src1.resolve("m1"), "module m1 { }"); |
137 tb.writeJavaFiles(src1.resolve("m1"), "module m1 { }"); |
138 Path modules1 = base.resolve("modules1"); |
138 Path modules1 = base.resolve("modules1"); |
139 Files.createDirectories(modules1); |
139 Files.createDirectories(modules1); |
140 |
140 |
141 new JavacTask(tb) |
141 new JavacTask(tb) |
142 .options("-modulesourcepath", src1.toString()) |
142 .options("--module-source-path", src1.toString()) |
143 .outdir(modules1) |
143 .outdir(modules1) |
144 .files(src1.resolve("m1/module-info.java")) |
144 .files(src1.resolve("m1/module-info.java")) |
145 .run() |
145 .run() |
146 .writeAll(); |
146 .writeAll(); |
147 |
147 |
149 tb.writeJavaFiles(src2.resolve("m2"), "module m2 { requires m1; }"); |
149 tb.writeJavaFiles(src2.resolve("m2"), "module m2 { requires m1; }"); |
150 Path modules2 = base.resolve("modules2"); |
150 Path modules2 = base.resolve("modules2"); |
151 Files.createDirectories(modules2); |
151 Files.createDirectories(modules2); |
152 |
152 |
153 new JavacTask(tb) |
153 new JavacTask(tb) |
154 .options("-modulepath", modules1.toString(), |
154 .options("--module-path", modules1.toString(), |
155 "-modulesourcepath", src2.toString()) |
155 "--module-source-path", src2.toString()) |
156 .outdir(modules2) |
156 .outdir(modules2) |
157 .files(src2.resolve("m2/module-info.java")) |
157 .files(src2.resolve("m2/module-info.java")) |
158 .run() |
158 .run() |
159 .writeAll(); |
159 .writeAll(); |
160 } |
160 } |