From: Tomas Wenström <tomas.wenstrom@gmail.com>
Date: Sat, 22 Apr 2017 16:37:25 +0000 (+0200)
Subject: Made separate jar task
X-Git-Url: http://dolda2000.com/gitweb/?p=kaka%2Fcakelight.git;a=commitdiff_plain;h=df46bbde578baf6ef9a88935a65e424175518377

Made separate jar task
---

diff --git a/build.xml b/build.xml
index a0d21ec..3802cff 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,6 @@
   
   
   <property file="config.properties"/>
-  <property name="jdk.home.1.8" value="/usr/lib/jvm/java-8-openjdk-amd64" />
   <!-- Uncomment the following property if no tests compilation is needed -->
   <!-- 
   <property name="skip.tests" value="true"/>
@@ -176,11 +175,14 @@
         <type type="file"/>
       </fileset>
     </copy>
+  </target>
 
+  <target name="jar" description="Builds a jar file">
+    <delete file="${cakelight.output.dir}/cakelight.jar"/>
     <jar destfile="${cakelight.output.dir}/cakelight.jar">
       <fileset dir="${cakelight.output.dir}" />
       <!-- TODO replace hard links -->
-      <zipfileset includes="**/*.class" src="${module.cakelight.basedir}/lib/pi4j/pi4j-core.jar" />
+      <zipfileset includes="**/*.class" src="/opt/pi4j/lib/pi4j-core.jar" />
       <zipfileset includes="**/*.class" src="/usr/share/java/opencv.jar" />
       <manifest>
         <attribute name="Main-Class" value="kaka.cakelight.LedController" />
@@ -201,7 +203,7 @@
   
   <target name="clean" depends="clean.module.cakelight" description="cleanup all"/>
   
-  <target name="build.modules" depends="init, clean, compile.module.cakelight" description="build all modules"/>
+  <target name="build.modules" depends="init, clean, compile.module.cakelight, jar" description="build all modules"/>
   
   <target name="all" depends="build.modules" description="build all"/>
 </project>
\ No newline at end of file