BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-12 02:02:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

mac build fixes

Browse Source 
move update and variants file to core project and integrate into Jar
This commit is contained in:
bancika
2020-03-21 23:58:43 +01:00
parent 85a37a2fd7
commit 7477c606f4
9 changed files with 7286 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/build.xml
+4 -7
View File
@@ -72,6 +72,7 @@
<attribute name="Class-Path" value="${manifest.class.path}" />
<attribute name="SplashScreen-Image" value="splash.png" />
</manifest>
<zipfileset dir="." includes="config.properties" />
</jar>
</target>
@@ -96,7 +97,6 @@
<arg value="-nosign"/>
<arg value="-v"/>
</exec>-->
<mkdir dir="${jar.dir}\DIYLC.app" />
<bundleapp
outputdirectory="${build.dir}"
name="DIYLC"
@@ -125,7 +125,7 @@
<option value="-Xdock:icon=Contents/Resources/diylc.icns"/>
</bundleapp>
<zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip">
<zipfileset filemode="755" dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app" />
<zipfileset filemode="755" dir="${build.dir}/DIYLC.app" prefix="DIYLC.app" />
</zip>
</target>
@@ -142,13 +142,10 @@
<zipfileset dir="templates" prefix="templates" />
<zipfileset dir="themes" prefix="themes" />
<zipfileset dir="fonts" prefix="fonts" />
<zipfileset dir="." includes="update.xml" />
<zipfileset dir="." includes="config.properties" />
<zipfileset dir="." includes="variants.xml" />
<zipfileset dir="." includes="splash.png" />
<zipfileset dir="." includes="run.sh" />
<zipfileset dir="." includes="diylc.l4j.ini" />
<zipfileset dir="." includes="diylc.exe" />
<zipfileset dir="." includes="splash.png" />
<zipfileset dir="." includes="diylc.exe" />
</zip>
</target>
diylc/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/library/main.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/src/org/diylc/DIYLCStarter.java
+3 -3
View File
@@ -148,9 +148,9 @@ public class DIYLCStarter {
properties = new Properties();
try {
LOG.info("Injecting default properties.");
File f = new File("config.properties");
if (f.exists()) {
properties.load(new FileInputStream(f));
URL resource = Presenter.class.getClassLoader().getResource("config.properties");
if (resource != null) {
properties.load(resource.openStream());
PropertyInjector.injectProperties(properties);
}
} catch (Exception e) {