From 0c5692cb1e372e7da2c6add67f4880fe0449eb9a Mon Sep 17 00:00:00 2001
From: denny <dennissheirer2002@yahoo.com>
Date: Fri, 15 Jan 2016 10:37:45 -0500
Subject: [PATCH] Closes issue #44.  Creates /sdrtrunk folder within the .zip
 and .tar.gz output products so that upon extracting the contents they are
 contained within the /sdrtrunk folder.

---
 build/build.xml                  | 112 ++++++++++++++++---------------
 scripts/run_sdrtrunk_windows.bat |   2 +-
 src/gui/SDRTrunk.java            |   2 +-
 3 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 3667c7ff..b1cd7353 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -8,112 +8,114 @@
   <property name="minor" value="2"/>
   <property name="patch" value="0"/>
   <property name="release" value="beta.2"/>
-
+  <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}-${release}"/>
+	
   <!-- Build properties -->
-  <property name="classes" location="../classes"/>
-  <property name="configs"  location="../config"/>
-  <property name="images"  location="../images"/>
-  <property name="libs"  location="../imports"/>
-  <property name="license"  location="../license"/>
-  <property name="product"  location="../product"/>
-  <property name="scripts"  location="../scripts"/>
-  <property name="src" location="../src"/>
+  <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.license"  location="${repo}/license"/>
+  <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="${libs}" includes="*.jar" />
+    <fileset dir="${source.libs}" includes="*.jar" />
   </path>
   
   <target name="init">
     <!-- Create the classes folder to contain the compiled java classes -->
-    <mkdir dir="${classes}"/>
+    <mkdir dir="${output.classes}"/>
   	
     <!-- 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 name="compile" depends="clean,init"
-        description="Compile java classes" >
-    <!-- Compile the java code from ${src} into ${classes} -->
-    <javac srcdir="${src}" 
-           destdir="${classes}" 
-           classpathref="classpath"
-           includeantruntime="false" />
+  <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="${product}"/>
+    <mkdir dir="${output.folder}"/>
 
     <!-- Create jar file -->
-    <jar jarfile="${product}/SDRTrunk.jar" basedir="${classes}">
+    <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="${configs}">
+	  <fileset dir="${source.configs}">
   	  	<exclude name="*.rules"/>
   	  </fileset>
 	  
-  	  <fileset dir="${license}">
+  	  <fileset dir="${source.license}">
   	  	<include name="license.txt"/>
   	  </fileset>
     </jar>
     
     <!-- Copy third-party libraries -->
-    <mkdir dir="${product}/libs"/>
-    <copy todir="${product}/libs">
-	  <fileset dir="${libs}" includes="*.jar" />
+    <mkdir dir="${output.libs}"/>
+    <copy todir="${output.libs}">
+	  <fileset dir="${source.libs}" includes="*.jar" />
     </copy>
     
     <!-- Copy config files -->
-    <mkdir dir="${product}/config"/>
+    <mkdir dir="${output.config}"/>
 
-    <copy todir="${product}/config">
-	  <fileset dir="${configs}">
+    <copy todir="${output.config}">
+	  <fileset dir="${source.configs}">
   	  	<include name="*.rules"/>
   	  </fileset>
     </copy>
     
     <!-- Copy image files -->
-    <mkdir dir="${product}/images"/>
-    <copy todir="${product}/images">
-	  <fileset dir="${images}" />
+    <mkdir dir="${output.images}"/>
+    <copy todir="${output.images}">
+	  <fileset dir="${source.images}" />
     </copy>
     
     <!-- Copy license file -->
-    <copy todir="${product}">
-	  <fileset dir="${license}" />
+    <copy todir="${output.folder}">
+	  <fileset dir="${source.license}">
+  	  	<include name="license.txt"/>
+	  </fileset>
     </copy>
     
     <!-- Copy program scripts -->
-    <copy todir="${product}">
-	  <fileset dir="${scripts}" />
+    <copy todir="${output.folder}">
+	  <fileset dir="${source.scripts}" />
     </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 -->
-  	<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 -->
-  	<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>  	
+    <delete dir="${output.folder}"/>
   </target>
 
   <target name="clean" description="Clean previous build artifacts" >
-    <delete dir="${classes}"/>
-    <delete dir="${product}"/>
+    <delete dir="${output.classes}"/>
+    <delete dir="${output}"/>
   </target>
 
 </project>
\ No newline at end of file
diff --git a/scripts/run_sdrtrunk_windows.bat b/scripts/run_sdrtrunk_windows.bat
index 1206e039..27c0b763 100644
--- a/scripts/run_sdrtrunk_windows.bat
+++ b/scripts/run_sdrtrunk_windows.bat
@@ -1 +1 @@
-java -XX:+UseG1GC -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk
\ No newline at end of file
+java -XX:+UseG1GC -cp "sdrtrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk
\ No newline at end of file
diff --git a/src/gui/SDRTrunk.java b/src/gui/SDRTrunk.java
index 14470aee..80d3c8fb 100644
--- a/src/gui/SDRTrunk.java
+++ b/src/gui/SDRTrunk.java
@@ -421,7 +421,7 @@ public class SDRTrunk
 
     		if( version != null )
     		{
-    			sb.append( " V" );
+    			sb.append( " v" );
     			sb.append( version );
     		}
     	}