arch-jedi/gdxapp4d
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moved Warpship to root and renamed override and cleaned log output

Browse source
This commit is contained in:
Willem Cazander 2025-07-15 14:13:02 +02:00
parent ba99c5bdb6
commit 1d79a22041
11 changed files with 63 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4Activator.java
View file

@ -144,10 +144,7 @@ public class GDXAppTos4Activator implements BundleActivator {
boolean useLocal = args.contains("use-local");
warpshipHome = new File(".", WARPSHIP_HOME);
if (!warpshipHome.exists()) {
warpshipHome = new File("gdxapp4d-boot-desktop", WARPSHIP_HOME); // tmp for: mvn verify -P test-none,run
}
warpshipHome = new File(WARPSHIP_HOME);
if (!warpshipHome.exists()) {
bootScreen.bootLineError("ERROR: No Warpship home.");
startError = true;
@ -180,7 +177,7 @@ public class GDXAppTos4Activator implements BundleActivator {
localOverrides = new Properties();
if (useLocal) {
File localOverride = new File(warpshipHome, "local-override.xml");
File localOverride = new File(warpshipHome, "warp-override.xml");
if (localOverride.exists()) {
try {
localOverrides.loadFromXML(new FileInputStream(localOverride));
@ -192,9 +189,9 @@ public class GDXAppTos4Activator implements BundleActivator {
String value = localOverrides.getProperty(key);
localOverrides.setProperty(key, warpshipHome.getAbsolutePath() + "/" + value);
}
bootScreen.bootLine("use-local: local-override.xml loaded: " + localOverrides.size());
bootScreen.bootLine("use-local: warp-override.xml loaded: " + localOverrides.size());
} else {
bootScreen.bootLine("use-local: local-override.xml not found.");
bootScreen.bootLine("use-local: warp-override.xml not found.");
}
}