Application export

Small macOS regression
This commit is contained in:
Stef Tervelde
2024-12-16 22:49:17 +01:00
parent 284594f0f8
commit 49e5878b9f
4 changed files with 31 additions and 12 deletions
+1
View File
@@ -28,6 +28,7 @@ dependencies{
implementation(project(":java:preprocessor"))
implementation(libs.eclipseJDT)
implementation(libs.eclipseJDTCompiler)
implementation(libs.classpathExplorer)
implementation(libs.netbeansSwing)
implementation(libs.ant)
+12 -10
View File
@@ -732,18 +732,20 @@ public class JavaBuild {
writer.println("APPL????");
writer.flush();
writer.close();
if(System.getProperty("compose.application.resources.dir") == null) {
// Use faster(?) native copy here (also to do sym links)
if (embedJava) {
Util.copyDirNative(new File(contentsOrig, "PlugIns"),
new File(contentsFolder, "PlugIns"));
}
// Use faster(?) native copy here (also to do sym links)
if (embedJava) {
Util.copyDirNative(new File(contentsOrig, "PlugIns"),
new File(contentsFolder, "PlugIns"));
File resourcesFolder = new File(contentsFolder, "Resources");
Util.copyDir(new File(contentsOrig, "Resources/en.lproj"),
new File(resourcesFolder, "en.lproj"));
Util.copyFile(mode.getContentFile("application/application.icns"),
new File(resourcesFolder, "application.icns"));
}
File resourcesFolder = new File(contentsFolder, "Resources");
Util.copyDir(new File(contentsOrig, "Resources/en.lproj"),
new File(resourcesFolder, "en.lproj"));
Util.copyFile(mode.getContentFile("application/application.icns"),
new File(resourcesFolder, "application.icns"));
// TODO: Handle the java embed and Icon with the new build system
} else if (exportPlatform == PConstants.LINUX) {
if (embedJava) {