Updated this files with defaults for debs

the package might be: libhamcrest-java junit4 ant libmysql-java

diff --git a/build.xml b/build.xml
index 458ee4df389285b1d0c7e32c975055dc95677414..278fca971004e8324b42169f09613b7bda9a7a0c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -5,11 +5,11 @@
        <property name="debuglevel" value="source,lines,vars" />
        <property name="target" value="1.8" />
        <property name="source" value="1.8" />
-       <property name="mysqlconnector" value="mysql-connector-java-5.1.31-bin.jar" />
-       <property name="juintexec" value="." />
+       <property name="mysqlconnector" value="/usr/share/java/mysql-connector-java.jar" />
+       <property name="juintexec" value="/usr/share/java" />
        <path id="JUnit 4.libraryclasspath">
-               <pathelement location="${juintexec}/junit.jar" />
-               <pathelement location="${juintexec}/org.hamcrest.core.jar" />
+               <pathelement location="${juintexec}/junit4.jar" />
+               <pathelement location="${juintexec}/hamcrest-core.jar" />
        </path>
        <path id="cacert-gigi.classpath">
                <pathelement location="bin" />
@@ -59,7 +59,10 @@
        <target name="clean">
                <delete dir="bin" />
        </target>
-       <target depends="clean" name="cleanall" />
+       <target name="clean-test">
+               <delete dir="bintest" />
+       </target>
+       <target depends="clean,clean-test" name="cleanall" />
        <target depends="build-project, native" name="build" />
        <target depends="init" name="build-project">
                <echo message="${ant.project.name}: ${ant.file}" />

diff --git a/natives/Makefile b/natives/Makefile
index faf073cd5b28b122db35e7ebf407430354d7a900..f472ab27c56be880d54761b2f6ea698a8f609739 100644 (file)
--- a/natives/Makefile
+++ b/natives/Makefile
@@ -1,3 +1,4 @@
+JAVA_HOME=/usr/lib/jvm/default-java
 SYSTEM= $(shell uname | awk '{print tolower($$0)}')
 JAVAH?=javah
 CC?=gcc