Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #274 from DSheirer/272-java-9-compatibility
272 java 9 compatibility
- Loading branch information
Showing
3 changed files
with
179 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,120 +1,142 @@ | ||
| <project name="SDRTrunk" default="SDRTrunk" basedir="."> | ||
| <description> | ||
| Ant build script for SDRTrunk Decoder Application | ||
| </description> | ||
|
|
||
| <!-- version properties --> | ||
| <property name="major" value="0"/> | ||
| <property name="minor" value="3"/> | ||
| <property name="patch" value="0"/> | ||
| <property name="release" value=""/> | ||
| <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/> | ||
|
|
||
| <!-- Build properties --> | ||
| <property name="repo" location=".."/> | ||
| <property name="source.code" location="${repo}/src"/> | ||
| <property name="source.configs" location="${repo}/config"/> | ||
| <property name="source.images" location="${repo}/images"/> | ||
| <property name="source.libs" location="${repo}/imports"/> | ||
| <property name="source.scripts" location="${repo}/scripts"/> | ||
|
|
||
| <property name="output" location="${repo}/product"/> | ||
| <property name="output.classes" location="${repo}/classes"/> | ||
| <property name="output.folder" location="${output}/sdrtrunk"/> | ||
| <property name="output.config" location="${output.folder}/config"/> | ||
| <property name="output.images" location="${output.folder}/images"/> | ||
| <property name="output.libs" location="${output.folder}/libs"/> | ||
|
|
||
| <path id="classpath"> | ||
| <fileset dir="${source.libs}" includes="*.jar" /> | ||
| </path> | ||
|
|
||
| <target name="init"> | ||
| <!-- Create the classes folder to contain the compiled java classes --> | ||
| <mkdir dir="${output.classes}"/> | ||
|
|
||
| <!-- Create version file --> | ||
| <echo message="${major}.${minor}.${patch}-${release}" file="${output.classes}/sdrtrunk-version"/> | ||
| </target> | ||
|
|
||
| <target name="compile" depends="clean,init" description="Compile java classes" > | ||
| <javac srcdir="${source.code}" destdir="${output.classes}" classpathref="classpath" includeantruntime="false" /> | ||
| </target> | ||
|
|
||
| <target name="SDRTrunk" depends="compile" description="Create SDRTrunk application" > | ||
| <!-- Create the distribution directory --> | ||
| <mkdir dir="${output.folder}"/> | ||
|
|
||
| <!-- Create jar file --> | ||
| <jar jarfile="${output.folder}/sdrtrunk.jar" basedir="${output.classes}"> | ||
| <manifest> | ||
| <attribute name="Title" value="sdrtrunk"/> | ||
| <attribute name="Main-Class" value="gui.SDRTrunk"/> | ||
| <attribute name="Version" value="${major}.${minor}.${patch}-${release}"/> | ||
| </manifest> | ||
| <fileset dir="${source.configs}"> | ||
| <exclude name="*.rules"/> | ||
| </fileset> | ||
|
|
||
| <fileset dir="${repo}"> | ||
| <include name="LICENSE"/> | ||
| </fileset> | ||
| </jar> | ||
|
|
||
| <!-- Copy third-party libraries --> | ||
| <mkdir dir="${output.libs}"/> | ||
| <copy todir="${output.libs}"> | ||
| <fileset dir="${source.libs}" includes="*.jar" /> | ||
| </copy> | ||
|
|
||
| <!-- Copy config files --> | ||
| <mkdir dir="${output.config}"/> | ||
|
|
||
| <copy todir="${output.config}"> | ||
| <fileset dir="${source.configs}"> | ||
| <include name="*.rules"/> | ||
| </fileset> | ||
| </copy> | ||
|
|
||
| <!-- Copy image files --> | ||
| <mkdir dir="${output.images}"/> | ||
| <copy todir="${output.images}"> | ||
| <fileset dir="${source.images}" /> | ||
| </copy> | ||
|
|
||
| <!-- Copy license file --> | ||
| <copy todir="${output.folder}"> | ||
| <fileset dir="${repo}"> | ||
| <include name="LICENSE"/> | ||
| </fileset> | ||
| </copy> | ||
|
|
||
| <!-- Copy program scripts --> | ||
| <copy todir="${output.folder}"> | ||
| <fileset dir="${source.scripts}" /> | ||
| </copy> | ||
|
|
||
|
|
||
| <!-- Bundle the files into .zip --> | ||
| <zip destfile="${output}/${filename}.zip" basedir="${output}" /> | ||
|
|
||
| <!-- Remove linux start script before tar task --> | ||
| <delete file="${output.folder}/run_sdrtrunk_linux.sh"/> | ||
|
|
||
| <!-- Bundle files into .tar.gz and copy/set permissions on linux start script --> | ||
| <tar destfile="${output}/${filename}.tar.gz" compression="gzip"> | ||
| <tarfileset dir="${output.folder}" prefix="sdrtrunk" /> | ||
| <tarfileset dir="${source.scripts}" prefix="sdrtrunk" filemode="777"> | ||
| <include name="run_sdrtrunk_linux.sh"/> | ||
| </tarfileset> | ||
| </tar> | ||
|
|
||
| <delete dir="${output.folder}"/> | ||
| </target> | ||
|
|
||
| <target name="clean" description="Clean previous build artifacts" > | ||
| <delete dir="${output.classes}"/> | ||
| <delete dir="${output}"/> | ||
| </target> | ||
| <description> | ||
| Ant build script for SDRTrunk Decoder Application | ||
| </description> | ||
|
|
||
| <!-- version properties --> | ||
| <property name="major" value="0"/> | ||
| <property name="minor" value="3"/> | ||
| <property name="patch" value="1"/> | ||
| <property name="release" value="final"/> | ||
| <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/> | ||
|
|
||
| <!-- Build properties --> | ||
| <property name="repo" location=".."/> | ||
| <property name="source.code" location="${repo}/src"/> | ||
| <property name="source.configs" location="${repo}/config"/> | ||
| <property name="source.images" location="${repo}/images"/> | ||
| <property name="source.libs" location="${repo}/imports"/> | ||
| <property name="source.scripts" location="${repo}/scripts"/> | ||
|
|
||
| <property name="output" location="${repo}/product"/> | ||
| <property name="output.classes" location="${repo}/classes"/> | ||
| <property name="output.folder" location="${output}/sdrtrunk"/> | ||
| <property name="output.config" location="${output.folder}/config"/> | ||
| <property name="output.images" location="${output.folder}/images"/> | ||
| <property name="output.libs" location="${output.folder}/libs"/> | ||
|
|
||
| <path id="classpath"> | ||
| <fileset dir="${source.libs}" includes="*.jar"/> | ||
| </path> | ||
|
|
||
| <target name="init"> | ||
| <!-- Create the classes folder to contain the compiled java classes --> | ||
| <mkdir dir="${output.classes}"/> | ||
|
|
||
| <!-- Create version file --> | ||
| <echo message="${major}.${minor}.${patch}-${release}" file="${output.classes}/sdrtrunk-version"/> | ||
| </target> | ||
|
|
||
| <target name="compile" depends="clean,init,compile-java-8,compile-java-9" | ||
| description="Compile java classes" /> | ||
|
|
||
| <target name="compile-java-8" depends="check-java-version" if="java.8" description="Compiles code with Java 8 arguments"> | ||
| <echo message="Compiling with Java 8 Options"/> | ||
| <javac srcdir="${source.code}" destdir="${output.classes}" classpathref="classpath" includeantruntime="false"/> | ||
| </target> | ||
|
|
||
| <target name="compile-java-9" depends="check-java-version" if="java.9" description="Compiles code with Java 9 arguments"> | ||
| <echo message="Compiling with Java 9 Options"/> | ||
| <javac srcdir="${source.code}" destdir="${output.classes}" classpathref="classpath" includeantruntime="false"> | ||
| <compilerarg value="--add-modules"/> | ||
| <compilerarg value="java.xml.bind"/> | ||
| </javac> | ||
| </target> | ||
|
|
||
| <target name="check-java-version" description="Determines if the compiler is Java 8 or 9"> | ||
| <condition property="java.8" value="true"> | ||
| <contains string="${java.version}" substring="1.8"/> | ||
| </condition> | ||
| <condition property="java.9" value="true"> | ||
| <equals arg1="${java.version}" arg2="9"/> | ||
| </condition> | ||
| <echo message="Java Version: ${java.version}"/> | ||
| </target> | ||
|
|
||
| <target name="SDRTrunk" depends="compile" description="Create SDRTrunk application"> | ||
| <!-- Create the distribution directory --> | ||
| <mkdir dir="${output.folder}"/> | ||
|
|
||
| <!-- Create jar file --> | ||
| <jar jarfile="${output.folder}/sdrtrunk.jar" basedir="${output.classes}"> | ||
| <manifest> | ||
| <attribute name="Title" value="sdrtrunk"/> | ||
| <attribute name="Main-Class" value="gui.SDRTrunk"/> | ||
| <attribute name="Version" value="${major}.${minor}.${patch}-${release}"/> | ||
| </manifest> | ||
| <fileset dir="${source.configs}"> | ||
| <exclude name="*.rules"/> | ||
| </fileset> | ||
|
|
||
| <fileset dir="${repo}"> | ||
| <include name="LICENSE"/> | ||
| </fileset> | ||
| </jar> | ||
|
|
||
| <!-- Copy third-party libraries --> | ||
| <mkdir dir="${output.libs}"/> | ||
| <copy todir="${output.libs}"> | ||
| <fileset dir="${source.libs}" includes="*.jar"/> | ||
| </copy> | ||
|
|
||
| <!-- Copy config files --> | ||
| <mkdir dir="${output.config}"/> | ||
|
|
||
| <copy todir="${output.config}"> | ||
| <fileset dir="${source.configs}"> | ||
| <include name="*.rules"/> | ||
| </fileset> | ||
| </copy> | ||
|
|
||
| <!-- Copy image files --> | ||
| <mkdir dir="${output.images}"/> | ||
| <copy todir="${output.images}"> | ||
| <fileset dir="${source.images}"/> | ||
| </copy> | ||
|
|
||
| <!-- Copy license file --> | ||
| <copy todir="${output.folder}"> | ||
| <fileset dir="${repo}"> | ||
| <include name="LICENSE"/> | ||
| </fileset> | ||
| </copy> | ||
|
|
||
| <!-- Copy program scripts --> | ||
| <copy todir="${output.folder}"> | ||
| <fileset dir="${source.scripts}"/> | ||
| </copy> | ||
|
|
||
|
|
||
| <!-- Bundle the files into .zip --> | ||
| <zip destfile="${output}/${filename}.zip" basedir="${output}"/> | ||
|
|
||
| <!-- Remove linux start script before tar task --> | ||
| <delete file="${output.folder}/run_sdrtrunk_linux.sh"/> | ||
|
|
||
| <!-- Bundle files into .tar.gz and copy/set permissions on linux start script --> | ||
| <tar destfile="${output}/${filename}.tar.gz" compression="gzip"> | ||
| <tarfileset dir="${output.folder}" prefix="sdrtrunk"/> | ||
| <tarfileset dir="${source.scripts}" prefix="sdrtrunk" filemode="777"> | ||
| <include name="run_sdrtrunk_linux.sh"/> | ||
| </tarfileset> | ||
| </tar> | ||
|
|
||
| <delete dir="${output.folder}"/> | ||
| </target> | ||
|
|
||
| <target name="clean" description="Clean previous build artifacts"> | ||
| <delete dir="${output.classes}"/> | ||
| <delete dir="${output}"/> | ||
| </target> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,16 @@ | ||
| #!/bin/bash | ||
| java -XX:+UseG1GC -cp "*:libs/*" gui.SDRTrunk | ||
|
|
||
| java -version | ||
|
|
||
| # Test for java version 9 | ||
| JAVA_9=$(java -version 2>&1 | grep -i version | sed 's/.* "\([9]\).*/\1/') | ||
|
|
||
| if [ -z ${JAVA_9+x} ]; then | ||
| echo Using Java 9 program options | ||
| # Java 9 uses the G1 garbage collector by default and requires that we specify the | ||
| # java.xml.bind package since it's been removed from the java se core library | ||
| java -cp "*:libs/*" --add-modules java.xml.bind gui.SDRTrunk; | ||
| else | ||
| echo Using Java 8 program options | ||
| java -XX:+UseG1GC -cp "*:libs/*" gui.SDRTrunk; | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,25 @@ | ||
| java -XX:+UseG1GC -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk | ||
| @echo off | ||
|
|
||
| java -version | ||
|
|
||
| SETLOCAL ENABLEDELAYEDEXPANSION | ||
|
|
||
| for /f "usebackq tokens=3" %%a in (`java -version 2^>^&1 ^| find "version"`) do ( | ||
| rem set b to the unquoted version string parsed from the java version command | ||
| set b=%%~a | ||
|
|
||
| rem set c to the first character of the unquoted version string | ||
| set c=!b:~0,1! | ||
|
|
||
| if !c! equ 9 ( | ||
| echo Using Java 9 options | ||
| java -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" --add-modules java.xml.bind gui.SDRTrunk | ||
| ) else ( | ||
| echo Using Java 8 options | ||
| java -XX:+UseG1GC -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk | ||
| ) | ||
| ) | ||
|
|
||
| ENDLOCAL | ||
|
|
||
| @echo on |