From 1cd447ab547cd383153d9edf88dd96a0391ae07e Mon Sep 17 00:00:00 2001
From: Julien Lengrand-Lambert <Julien.Lengrand-Lambert@ing.nl>
Date: Fri, 13 Dec 2019 14:35:07 +0100
Subject: [PATCH] Building library with driver from maven

---
 .gitignore                                    |  4 +-
 .idea/deployment.xml                          |  3 +-
 cellar-driver/pom.xml                         | 53 +++++++++++++++++++
 cellar-driver/src/main/c/Makefile             |  8 ++-
 .../resources/libs/raspberry/.containerFolder |  0
 pom.xml                                       |  4 +-
 6 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 cellar-driver/src/main/resources/libs/raspberry/.containerFolder

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="raspberrypi.local" autoUploadExternalChanges="true">
+  <component name="PublishConfigData" serverName="raspberrypi.local" autoUploadExternalChanges="true">
     <serverData>
       <paths name="raspberrypi.local">
         <serverdata>
@@ -11,6 +11,5 @@
         </serverdata>
       </paths>
     </serverData>
-    <option name="myAutoUpload" value="ALWAYS" />
   </component>
 </project>
\ 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 @@
 
     <artifactId>cellar-driver</artifactId>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-h</arg>
+                        <arg>target/headers</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <workingDirectory>${project.basedir}/src/main/c</workingDirectory>
+                            <executable>make</executable>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>TestLib</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
+                        <phase>package</phase> <!-- bind to the packaging phase -->
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
\ 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 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <modules>