GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 17:47:32 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Closes issue #44. Creates /sdrtrunk folder within the .zip and .tar.gz

Browse Source 
output products so that upon extracting the contents they are contained
within the /sdrtrunk folder.
This commit is contained in:
denny
2016-01-15 10:37:45 -05:00
parent 663378ad20
commit 0c5692cb1e
3 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
build/build.xml
View File

@@ -8,112 +8,114 @@
<property name="minor" value="2"/> <property name="minor" value="2"/>
<property name="patch" value="0"/> <property name="patch" value="0"/>
<property name="release" value="beta.2"/> <property name="release" value="beta.2"/>
<property name="filename" value="sdrtrunk_${major}.${minor}.${patch}-${release}"/>
<!-- Build properties --> <!-- Build properties -->
<property name="classes" location="../classes"/> <property name="repo" location=".."/>
<property name="configs" location="../config"/> <property name="source.code" location="${repo}/src"/>
<property name="images" location="../images"/> <property name="source.configs" location="${repo}/config"/>
<property name="libs" location="../imports"/> <property name="source.images" location="${repo}/images"/>
<property name="license" location="../license"/> <property name="source.libs" location="${repo}/imports"/>
<property name="product" location="../product"/> <property name="source.license" location="${repo}/license"/>
<property name="scripts" location="../scripts"/> <property name="source.scripts" location="${repo}/scripts"/>
<property name="src" location="../src"/>
<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"> <path id="classpath">
<fileset dir="${libs}" includes="*.jar" /> <fileset dir="${source.libs}" includes="*.jar" />
</path> </path>
<target name="init"> <target name="init">
<!-- Create the classes folder to contain the compiled java classes --> <!-- Create the classes folder to contain the compiled java classes -->
<mkdir dir="${classes}"/> <mkdir dir="${output.classes}"/>
<!-- Create version file --> <!-- Create version file -->
<echo message="${major}.${minor}.${patch}-${release}" file="${classes}/sdrtrunk-version"/> <echo message="${major}.${minor}.${patch}-${release}" file="${output.classes}/sdrtrunk-version"/>
</target> </target>
<target name="compile" depends="clean,init" <target name="compile" depends="clean,init" description="Compile java classes" >
description="Compile java classes" > <javac srcdir="${source.code}" destdir="${output.classes}" classpathref="classpath" includeantruntime="false" />
<!-- Compile the java code from ${src} into ${classes} -->
<javac srcdir="${src}"
destdir="${classes}"
classpathref="classpath"
includeantruntime="false" />
</target> </target>
<target name="SDRTrunk" depends="compile" description="Create SDRTrunk application" > <target name="SDRTrunk" depends="compile" description="Create SDRTrunk application" >
<!-- Create the distribution directory --> <!-- Create the distribution directory -->
<mkdir dir="${product}"/> <mkdir dir="${output.folder}"/>
<!-- Create jar file --> <!-- Create jar file -->
<jar jarfile="${product}/SDRTrunk.jar" basedir="${classes}"> <jar jarfile="${output.folder}/sdrtrunk.jar" basedir="${output.classes}">
<manifest> <manifest>
<attribute name="Title" value="sdrtrunk"/>
<attribute name="Main-Class" value="gui.SDRTrunk"/> <attribute name="Main-Class" value="gui.SDRTrunk"/>
<attribute name="Version" value="${major}.${minor}.${patch}-${release}"/>
</manifest> </manifest>
<fileset dir="${configs}"> <fileset dir="${source.configs}">
<exclude name="*.rules"/> <exclude name="*.rules"/>
</fileset> </fileset>
<fileset dir="${license}"> <fileset dir="${source.license}">
<include name="license.txt"/> <include name="license.txt"/>
</fileset> </fileset>
</jar> </jar>
<!-- Copy third-party libraries --> <!-- Copy third-party libraries -->
<mkdir dir="${product}/libs"/> <mkdir dir="${output.libs}"/>
<copy todir="${product}/libs"> <copy todir="${output.libs}">
<fileset dir="${libs}" includes="*.jar" /> <fileset dir="${source.libs}" includes="*.jar" />
</copy> </copy>
<!-- Copy config files --> <!-- Copy config files -->
<mkdir dir="${product}/config"/> <mkdir dir="${output.config}"/>
<copy todir="${product}/config"> <copy todir="${output.config}">
<fileset dir="${configs}"> <fileset dir="${source.configs}">
<include name="*.rules"/> <include name="*.rules"/>
</fileset> </fileset>
</copy> </copy>
<!-- Copy image files --> <!-- Copy image files -->
<mkdir dir="${product}/images"/> <mkdir dir="${output.images}"/>
<copy todir="${product}/images"> <copy todir="${output.images}">
<fileset dir="${images}" /> <fileset dir="${source.images}" />
</copy> </copy>
<!-- Copy license file --> <!-- Copy license file -->
<copy todir="${product}"> <copy todir="${output.folder}">
<fileset dir="${license}" /> <fileset dir="${source.license}">
<include name="license.txt"/>
</fileset>
</copy> </copy>
<!-- Copy program scripts --> <!-- Copy program scripts -->
<copy todir="${product}"> <copy todir="${output.folder}">
<fileset dir="${scripts}" /> <fileset dir="${source.scripts}" />
</copy> </copy>
<!-- Set linux permissions on start script -->
<chmod file="${product}/run_sdrtrunk_linux.sh" perm="777" />
<tstamp prefix="build" />
<property name="filename" value="sdrtrunk_${build.DSTAMP}_${build.TSTAMP}_${major}.${minor}.${patch}-${release}"/>
<!-- Bundle the files into .zip --> <!-- Bundle the files into .zip -->
<zip destfile="${product}/${filename}.zip" basedir="${product}" /> <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>
<!-- Bundle the files into .tar.gz to preserve linux script permissions --> <delete dir="${output.folder}"/>
<tar destfile="${product}/${filename}.tar.gz" compression="gzip">
<tarfileset dir="${product}" filemode="777">
<include name="*.sh"/>
</tarfileset>
<tarfileset dir="${product}">
<exclude name="*.sh"/>
<exclude name="${filename}.zip"/>
</tarfileset>
</tar>
</target> </target>
<target name="clean" description="Clean previous build artifacts" > <target name="clean" description="Clean previous build artifacts" >
<delete dir="${classes}"/> <delete dir="${output.classes}"/>
<delete dir="${product}"/> <delete dir="${output}"/>
</target> </target>
</project> </project>

2
scripts/run_sdrtrunk_windows.bat
View File

@@ -1 +1 @@
java -XX:+UseG1GC -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk java -XX:+UseG1GC -cp "sdrtrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk

2
src/gui/SDRTrunk.java
View File

@@ -421,7 +421,7 @@ public class SDRTrunk
if( version != null ) if( version != null )
{ {
sb.append( " V" ); sb.append( " v" );
sb.append( version ); sb.append( version );
} }
} }