Move location of java 7 libs

cleanup of build file
davidzof · Oct 7, 2014 · 62d1eff · 62d1eff
1 parent d39fdc2
commit 62d1eff
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 27 deletions.
diff --git a/build.xml b/build.xml
@@ -1,15 +1,18 @@
-<project name="wattzap" default="dist" basedir=".">
+<project name="wattzap" default="linux" basedir=".">
     <description>
         Wattzap Ant Build File
     </description>
   <!-- set global properties for this build -->
   <property name="src" location="src"/>
-  <property name="build" location="bin"/>
-  <property name="dist"  location="dist"/>
+  <property name="build" location="dist-ce/bin"/>
+  <property name="dist"  location="dist-ce"/>
 
   <path id="master-classpath">
       <fileset dir="lib">
-        <include name="**/*.jar"/>
+        <include name="*.jar"/>
+      </fileset>
+      <fileset dir="lib/java1.7">
+        <include name="*.jar"/>
       </fileset>
     </path>
   <property name="classpath"  refid="master-classpath"/>
@@ -29,51 +32,62 @@
     </javac>
   </target>
 
-  <target name="dist" depends="compile"
-        description="generate the distribution" >
+  <target name="dist" depends="compile" description="generate the distribution" >
     <!-- Create the distribution directory -->
     <mkdir dir="${dist}/lib"/>
 
-    <jar destfile="${dist}/lib/wattzap.jar">
+    <jar destfile="${dist}/wattzap/lib/wattzap.jar">
       <fileset dir="${build}">
         <exclude name="**/*Test.class" />
         <exclude name="org/**/*.class" />
       </fileset>
     </jar>
 
     <zip destfile="tmp.jar" > 
-      <zipfileset src="lib/jformica_jsr80.jar" excludes="org/cowboycoders/ant/interfaces/**/*.class" />
-      <zipfileset dir="bin" includes="org/cowboycoders/ant/interfaces/**/*.class"  />
+      <zipfileset src="lib/java1.7/jformica_jsr80.jar" excludes="org/cowboycoders/ant/interfaces/**/*.class" />
+      <zipfileset dir="${build}" includes="org/cowboycoders/ant/interfaces/**/*.class"  />
     </zip>
-    <move file="tmp.jar" tofile="lib/jformica_jsr80.jar"/>
+    <move file="tmp.jar" tofile="lib/java1.7/jformica_jsr80.jar"/>
 
     <zip destfile="tmp.jar" > 
       <zipfileset src="lib/usb4java-javax-1.2.0.jar" excludes="org/usb4java/javax/AbstractIrp*.class" />
-      <zipfileset dir="bin" includes="org/usb4java/javax/AbstractIrp*.class"  />
+      <zipfileset dir="${build}" includes="org/usb4java/javax/AbstractIrp*.class"  />
     </zip>
     <move file="tmp.jar" tofile="lib/usb4java-javax-1.2.0.jar"/>
   </target>
 
 
   <target name="clean"
         description="clean up" >
-    <!-- Delete the ${build} and ${dist} directory trees -->
-    <delete dir="${build}"/>
+    <!-- Delete the ${dist} directory trees -->
     <delete dir="${dist}"/>
   </target>
 
-  <target name="linux" description="make Linux release">
- <copy todir="dist/wattzap/lib">
-    <fileset dir="lib"/>
-  </copy>
- <copy todir="dist/wattzap/properties">
-    <fileset dir="properties"/>
-  </copy>
-<copy file="wattzap.sh" todir="dist/wattzap/"/>
-<chmod file="dist/wattzap/wattzap.sh" perm="755"/>
-<copy file="wattzap.jar" todir="dist/wattzap/lib/"/>
+  <target name="linux" description="make Linux release" depends="dist">
+    <copy todir="${dist}/wattzap/lib">
+      <fileset dir="lib">
+        <include name="*.jar"/>
+      </fileset>
+      <fileset dir="lib/java1.7">
+        <include name="*.jar"/>
+      </fileset>
+    </copy>
+    <copy todir="${dist}/wattzap/lib/org">
+      <fileset dir="lib/org"/>
+    </copy>
 
-<tar destfile="dist/wattzap.tar" basedir="dist/wattzap"/>
-<gzip destfile="dist/wattzap.tgz" src="dist/wattzap.tar"/>
-</target>
+    <copy todir="${dist}/wattzap/properties">
+      <fileset dir="properties"/>
+    </copy>
+    <copy todir="${dist}/wattzap/icons">
+      <fileset dir="icons"/>
+    </copy>
+
+    <copy file="wattzap.sh" tofile="${dist}/wattzap/wattzap.sh"/>
+      <chmod file="${dist}/wattzap/wattzap.sh" perm="755"/>
+    <copy file="wattzap.jar" todir="${dist}/wattzap/lib/"/>
+
+    <tar destfile="${dist}/wattzap.tar" basedir="${dist}/wattzap"/>
+    <gzip destfile="${dist}/wattzap.tar.gz" src="${dist}/wattzap.tar"/>
+  </target>
 </project>
diff --git a/lib/jformica_core.jar → lib/java1.7/jformica_core.jar b/lib/jformica_core.jar → lib/java1.7/jformica_core.jar
diff --git a/lib/java1.7/jformica_jsr80.jar b/lib/java1.7/jformica_jsr80.jar
diff --git a/lib/jformica_jsr80.jar b/lib/jformica_jsr80.jar
diff --git a/lib/usb4java-javax-1.2.0.jar b/lib/usb4java-javax-1.2.0.jar
diff --git a/src/com/wattzap/view/AboutPanel.java b/src/com/wattzap/view/AboutPanel.java
@@ -58,7 +58,7 @@ public class AboutPanel extends JFrame implements ActionListener {
 	private static final String decodeKey = "CAFEBABE";
 	// <html>WattzAp Virtual Turbo Trainer<br/><br/>Version: x.x.x 
 	// <br/>Date: xx xxx xxx<br/>(c) xxxx, All rights reserved<br/>
-	private static final String blurb = "fykyKC5/FSQ3NTwEMmEWMDEjKWUWMyMsLSQ0ZREuJDE0IDQgfiMwan19JDdtfxQgMTIvKix7Yndtc2h1fiMwan0FJzEne2J0MDVmCiE1LScmM3onMG58bSBoZndycHZpYwAqKWIzKyIrNTVlMCQxIDE3IyF+IzBqfQ==";
+	private static final String blurb = "fykyKC5/FSQ3NTwEMmEWMDEjKWUWMyMsLSQ0ZREuJDE0IDQgfiMwan19JDdtfxQgMTIvKix7Yndtc2h0fiMwan0FJzEne2JyNylmCiE1LScmM3onMG58bSBoZndycHZpYwAqKWIzKyIrNTVlMCQxIDE3IyF+IzBqfQ==";
 	// Your software is registered
 	private static final String registered = "Gi4zN2IyLSM3Nic3J2ErNmMzIyIrMjYgMSQi";
 	// Incorrect registration key

diff --git a/wattzap.sh b/wattzap.sh
@@ -0,0 +1,4 @@
+LIBS="lib/wattzap.jar:properties:lib/log4j-1.2.17.jar:lib/derby.jar:lib/opencsv-2.3.jar:lib/com-sun-tools-visualvm-charts.jar:lib/com-sun-tools-visualvm-uisupport.jar:lib/gpx-creator-0.1-beta.jar:lib/hamcrest-core-1.3.jar:lib/jcommon-1.0.17.jar:lib/jcommon-1.0.18.jar:lib/jformica_core.jar:lib/jformica_jsr80.jar:lib/jfreechart-1.0.14.jar:lib/jna-3.5.1.jar:lib/junit-4.11.jar:lib/miglayout-core-4.2.jar:lib/miglayout-swing-4.2.jar:lib/org-netbeans-lib-profiler-charts.jar:lib/org-netbeans-lib-profiler-ui.jar:lib/org-openide-util-lookup.jar:lib/org-openide-util.jar:lib/usb-api-1.0.2.jar:lib/usb4java-1.2.0.jar:lib/vlcj-2.2.0.jar:lib/usb4java-javax-1.2.0.jar:lib/commons-lang3-3.2.1.jar "
+
+#java -cp $LIBS -Dlog4j.logger.level=DEBUG com.wattzap.Main
+java -cp $LIBS com.wattzap.Main