Skip to content

Commit 9c43871

Browse files
author
Alexey Semenyuk
committed
8356219: jpackage places libapplauncher.so in incorrect location in the app image
Reviewed-by: almatvee
1 parent 064b036 commit 9c43871

File tree

8 files changed

+758
-181
lines changed

8 files changed

+758
-181
lines changed

src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@
2626

2727
import jdk.internal.util.OperatingSystem;
2828
import jdk.jpackage.internal.util.PathGroup;
29+
import java.io.IOException;
2930
import java.nio.file.Path;
31+
import java.util.List;
3032
import java.util.Map;
3133

3234

3335
/**
3436
* Application directory layout.
3537
*/
36-
public final class ApplicationLayout implements PathGroup.Facade<ApplicationLayout> {
38+
public final class ApplicationLayout {
3739
enum PathRole {
3840
/**
3941
* Java run-time directory.
@@ -84,16 +86,34 @@ private ApplicationLayout(PathGroup data) {
8486
this.data = data;
8587
}
8688

87-
@Override
8889
public PathGroup pathGroup() {
8990
return data;
9091
}
9192

92-
@Override
9393
public ApplicationLayout resolveAt(Path root) {
9494
return new ApplicationLayout(pathGroup().resolveAt(root));
9595
}
9696

97+
public List<Path> roots() {
98+
return data.roots();
99+
}
100+
101+
public long sizeInBytes() throws IOException {
102+
return data.sizeInBytes();
103+
}
104+
105+
public void copy(ApplicationLayout other) throws IOException {
106+
data.copy(other.data);
107+
}
108+
109+
public void move(ApplicationLayout other) throws IOException {
110+
data.move(other.data);
111+
}
112+
113+
public void transform(ApplicationLayout other, PathGroup.TransformHandler handler) throws IOException {
114+
data.transform(other.data, handler);
115+
}
116+
97117
/**
98118
* Path to launchers directory.
99119
*/

0 commit comments

Comments
 (0)