diff --git a/.gitignore b/.gitignore
index 3944b09..4331f0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,6 @@ libraries/tools/kotlin-test-js-runner/lib/
libraries/tools/kotlin-source-map-loader/lib/
local.properties
-*.o
\ No newline at end of file
+*.o
+/cellar-app/target/
+/cellar-driver/target/
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 789a642..3d70580 100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,6 @@
-
+
@@ -11,6 +11,5 @@
-
\ No newline at end of file
diff --git a/cellar-driver/pom.xml b/cellar-driver/pom.xml
index 7cd0266..04df2a7 100644
--- a/cellar-driver/pom.xml
+++ b/cellar-driver/pom.xml
@@ -11,5 +11,58 @@
cellar-driver
+
+
+
+ maven-compiler-plugin
+ 3.7.0
+
+
+ -h
+ target/headers
+
+
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.6.0
+
+
+ compile
+
+ exec
+
+
+ ${project.basedir}/src/main/c
+ make
+
+
+
+
+
+ maven-assembly-plugin
+
+
+
+ TestLib
+
+
+
+ jar-with-dependencies
+
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cellar-driver/src/main/c/Makefile b/cellar-driver/src/main/c/Makefile
index fc81dd0..c267680 100644
--- a/cellar-driver/src/main/c/Makefile
+++ b/cellar-driver/src/main/c/Makefile
@@ -1,6 +1,6 @@
JAVA_HOME=/usr/lib/jvm/java-11-openjdk-armhf
INCLUDES = -I. -I../java -Iadafruit/Raspberry_Pi_2 -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-HEADERS = ../java/Dht11Driver.h adafruit/common_dht_read.h adafruit/Raspberry_Pi_2/pi_2_mmio.h adafruit/Raspberry_Pi_2/pi_2_dht_read.h
+HEADERS = ../../target/headers/Dht11Driver.h adafruit/common_dht_read.h adafruit/Raspberry_Pi_2/pi_2_mmio.h adafruit/Raspberry_Pi_2/pi_2_dht_read.h
FILES = adafruit/common_dht_read.c adafruit/Raspberry_Pi_2/pi_2_mmio.c adafruit/Raspberry_Pi_2/pi_2_dht_read.c Dht11Driver.c
OUT = libdht11
@@ -13,10 +13,8 @@ library:
gcc -shared -fPIC -o $(OUT).so $(INCLUDES) $(FILES)
move:
- -cp $(OUT).so
+ -cp $(OUT).so ../resources/libs/raspberry/
clean:
-rm -f $(OUT).so
- -rm -f $(OUT)
-
-# We have to run that at some point javac -h . Dht11Driver.java
\ No newline at end of file
+ -rm -f $(OUT)
\ No newline at end of file
diff --git a/cellar-driver/src/main/resources/libs/raspberry/.containerFolder b/cellar-driver/src/main/resources/libs/raspberry/.containerFolder
new file mode 100644
index 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index 4c297ae..949d1c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
1.0-SNAPSHOT
- 11
- 11
+ 1.8
+ 1.8