java 8 and mac build

This commit is contained in:
admin
2020-03-21 12:18:55 +03:00
parent bb3b37f23b
commit 71f5bcd1f7
11 changed files with 81 additions and 77 deletions
BIN
View File
Binary file not shown.
+13 -13
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
<classpathentry kind="lib" path="lib/app-framework.jar"/>
<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
<classpathentry kind="lib" path="lib/java-http-proxy.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
<classpathentry kind="lib" path="lib/app-framework.jar"/>
<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/java-http-proxy.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
+14 -14
View File
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/app-framework.jar"/>
<classpathentry kind="lib" path="lib/jep-2.4.1.jar"/>
<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
<classpathentry kind="lib" path="lib/xstream-1.4.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/app-framework.jar"/>
<classpathentry kind="lib" path="lib/jep-2.4.1.jar"/>
<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
<classpathentry kind="lib" path="lib/xstream-1.4.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file not shown.
BIN
View File
Binary file not shown.
+21 -21
View File
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="lib/commons-compiler-3.0.6.jar"/>
<classpathentry kind="lib" path="lib/janino-3.0.6.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
<classpathentry kind="lib" path="lib/iText-2.1.7.jar"/>
<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/app-framework.jar" sourcepath="/app-framework"/>
<classpathentry kind="lib" path="lib/swing-framework.jar" sourcepath="/swing-framework"/>
<classpathentry kind="lib" path="library/main.jar" sourcepath="/diylc-library"/>
<classpathentry kind="lib" path="lib/balloontip-1.2.4.1.jar"/>
<classpathentry kind="lib" path="lib/jep-2.4.1.jar"/>
<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
<classpathentry kind="lib" path="lib/xstream-1.4.3.jar"/>
<classpathentry kind="lib" path="lib/java-http-proxy.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="lib/commons-compiler-3.0.6.jar"/>
<classpathentry kind="lib" path="lib/janino-3.0.6.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
<classpathentry kind="lib" path="lib/iText-2.1.7.jar"/>
<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/app-framework.jar" sourcepath="/app-framework"/>
<classpathentry kind="lib" path="lib/swing-framework.jar" sourcepath="/swing-framework"/>
<classpathentry kind="lib" path="library/main.jar" sourcepath="/diylc-library"/>
<classpathentry kind="lib" path="lib/balloontip-1.2.4.1.jar"/>
<classpathentry kind="lib" path="lib/jep-2.4.1.jar"/>
<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
<classpathentry kind="lib" path="lib/xstream-1.4.3.jar"/>
<classpathentry kind="lib" path="lib/java-http-proxy.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View File
Binary file not shown.
+33 -29
View File
@@ -1,4 +1,7 @@
<project name="diylc-swing" basedir="." default="complete">
<project name="diylc-swing" basedir="." default="win">
<taskdef name="bundleapp"
classname="com.oracle.appbundler.AppBundlerTask" />
<property name="src.dir" value="src" />
@@ -71,7 +74,7 @@
</manifest>
</jar>
</target>
<target name="mac" depends="jar">
<!--<echo>Compile with JDK ${java.home}</echo>
<exec executable="javapackager">
@@ -93,27 +96,34 @@
<arg value="-nosign"/>
<arg value="-v"/>
</exec>-->
<taskdef name="jarbundler" classname="com.ultramixer.jarbundler.JarBundler" />
<jarbundler bundleid="org.diylc" dir="${jar.dir}" name="DIYLC" version="${diylc.version}" mainclass="${main.class}" stubfile="JavaApplicationStub" vmoptions="splash:splash.png -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true" icon="icons/diylc.icns" workingdirectory="$APP_PACKAGE/Contents/Resources" copyright="bancika (diy-fever.com)" splashfile="$APP_PACKAGE/Contents/Resources/splash.png">
<jarfileset dir="${jar.dir}">
<include name="diylc.jar" />
<include name="lib/**/*.jar" />
<include name="library/**/*.jar" />
</jarfileset>
<resourcefileset dir="${basedir}">
<include name="splash.png" />
<include name="update.xml" />
<include name="variants.xml" />
<include name="config.properties" />
<include name="templates**/*.diy" />
<include name="themes**/*.xml" />
<include name="fonts**/*.ttf" />
</resourcefileset>
<javaproperty name="apple.laf.useScreenMenuBar" value="true" />
<!--<documenttype name="DIYLC Project"
extensions="diylc"
role="Editor"/>-->
</jarbundler>
<mkdir dir="${jar.dir}\DIYLC.app" />
<bundleapp
outputdirectory="${build.dir}"
name="DIYLC"
jvmrequired="1.8"
copyright="Branislav Stojkovic, a.k.a. bancika"
displayname="DIY Layout Creator"
identifier="org.diylc.App"
shortversion="${diylc.version}"
applicationCategory="public.app-category.graphics-design"
mainclassname="${main.class}">
<!--<runtime dir="${env.JAVA_HOME}" />-->
<classpath file="${jar.dir}\diylc.jar" />
<classpath file="${jar.dir}\lib\*.jar" />
<classpath file="${jar.dir}\library\*.jar" />
<option value="-splash:splash.png" />
<option value="-Xms512m" />
<option value="-Xmx2048m" />
<option value="-Dorg.diylc.scriptRun=false" />
<option value="-Dfile.encoding=UTF-8" />
<option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
<option value="-Dapple.awt.application.name=DIYLC"/>
<option value="-Dcom.apple.smallTabs=true"/>
</bundleapp>
<zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip">
<zipfileset filemode="755" dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app" />
</zip>
</target>
<target name="win" depends="jar">
@@ -122,9 +132,6 @@
<arg value="/Fdiylc-${diylc.version}-win"/>
<arg value="install.iss"/>
</exec>
</target>
<target name="complete" depends="mac, win">
<zip destfile="${build.dir}/diylc-${diylc.version}.zip">
<zipfileset dir="${jar.dir}" includes="diylc.jar" />
<zipfileset dir="${jar.dir}/lib" prefix="lib" />
@@ -140,9 +147,6 @@
<zipfileset dir="." includes="diylc.exe" />
<zipfileset dir="." includes="splash.png" />
</zip>
<zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip">
<zipfileset filemode="755" dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app" />
</zip>
</target>
<target name="javadoc">
Binary file not shown.
Binary file not shown.