From: Felix Dörre <felix@dogcraft.de>
Date: Sun, 7 Sep 2014 14:40:37 +0000 (+0200)
Subject: Updated this files with defaults for debs
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=4d9616027ef98e887552807fd398578c1cc4a737

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 458ee4df..278fca97 100644
--- 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 faf073cd..f472ab27 100644
--- 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