equal
deleted
inserted
replaced
75 "Runtime-Info.plist.template"; |
75 "Runtime-Info.plist.template"; |
76 |
76 |
77 private final Path root; |
77 private final Path root; |
78 private final Path contentsDir; |
78 private final Path contentsDir; |
79 private final Path javaDir; |
79 private final Path javaDir; |
|
80 private final Path javaModsDir; |
80 private final Path resourcesDir; |
81 private final Path resourcesDir; |
81 private final Path macOSDir; |
82 private final Path macOSDir; |
82 private final Path runtimeDir; |
83 private final Path runtimeDir; |
83 private final Path runtimeRoot; |
84 private final Path runtimeRoot; |
84 private final Path mdir; |
85 private final Path mdir; |
202 |
203 |
203 this.params = config; |
204 this.params = config; |
204 this.root = imageOutDir.resolve(APP_NAME.fetchFrom(params) + ".app"); |
205 this.root = imageOutDir.resolve(APP_NAME.fetchFrom(params) + ".app"); |
205 this.contentsDir = root.resolve("Contents"); |
206 this.contentsDir = root.resolve("Contents"); |
206 this.javaDir = contentsDir.resolve("Java"); |
207 this.javaDir = contentsDir.resolve("Java"); |
|
208 this.javaModsDir = javaDir.resolve("mods"); |
207 this.resourcesDir = contentsDir.resolve("Resources"); |
209 this.resourcesDir = contentsDir.resolve("Resources"); |
208 this.macOSDir = contentsDir.resolve("MacOS"); |
210 this.macOSDir = contentsDir.resolve("MacOS"); |
209 this.runtimeDir = contentsDir.resolve("PlugIns/Java.runtime"); |
211 this.runtimeDir = contentsDir.resolve("PlugIns/Java.runtime"); |
210 this.runtimeRoot = runtimeDir.resolve("Contents/Home"); |
212 this.runtimeRoot = runtimeDir.resolve("Contents/Home"); |
211 this.mdir = runtimeRoot.resolve("lib"); |
213 this.mdir = runtimeRoot.resolve("lib"); |
223 |
225 |
224 this.params = config; |
226 this.params = config; |
225 this.root = imageOutDir.resolve(jreName ); |
227 this.root = imageOutDir.resolve(jreName ); |
226 this.contentsDir = root.resolve("Contents"); |
228 this.contentsDir = root.resolve("Contents"); |
227 this.javaDir = null; |
229 this.javaDir = null; |
|
230 this.javaModsDir = null; |
228 this.resourcesDir = null; |
231 this.resourcesDir = null; |
229 this.macOSDir = null; |
232 this.macOSDir = null; |
230 this.runtimeDir = this.root; |
233 this.runtimeDir = this.root; |
231 this.runtimeRoot = runtimeDir.resolve("Contents/Home"); |
234 this.runtimeRoot = runtimeDir.resolve("Contents/Home"); |
232 this.mdir = runtimeRoot.resolve("lib"); |
235 this.mdir = runtimeRoot.resolve("lib"); |
310 Log.verbose(ne); |
313 Log.verbose(ne); |
311 return false; |
314 return false; |
312 } |
315 } |
313 |
316 |
314 return true; |
317 return true; |
|
318 } |
|
319 |
|
320 @Override |
|
321 public Path getAppDir() { |
|
322 return javaDir; |
|
323 } |
|
324 |
|
325 @Override |
|
326 public Path getAppModsDir() { |
|
327 return javaModsDir; |
315 } |
328 } |
316 |
329 |
317 @Override |
330 @Override |
318 public InputStream getResourceAsStream(String name) { |
331 public InputStream getResourceAsStream(String name) { |
319 return MacResources.class.getResourceAsStream(name); |
332 return MacResources.class.getResourceAsStream(name); |