From 7a860ad61b45b6df9d3f413a25e34e159dd1f3fb Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Tue, 11 Dec 2018 18:37:54 +0100
Subject: [PATCH 01/14] Start make cleanup

---
 src/Makefile      | 109 ++++++++++++++++++++++++++++++----------------
 src/Makefile.conf |  71 ++++++++++++++++++++++++++++--
 2 files changed, 140 insertions(+), 40 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 348c9dd..cf2480a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,44 +1,81 @@
-LIBRARY=libpEpJNI.a
-SHARED=libpEpJNI.so
-JAR=jniadapter.jar
+# Copyright 2018, pEp Foundation
+# This file is part of pEp JNI Adapter
+# This file may be used under the terms of the GNU General Public License version 3
+# see LICENSE.txt
+
 include Makefile.conf
 
-CXXFLAGS+=-std=c++14 -fPIC
+ifneq ($(wildcard local.conf),)
+    $(info ================================================)
+    $(info Overrides in \`local.conf\` are used.)
+    $(info ================================================)
+endif
 
-all: $(JAR) $(SHARED)
+ifdef BUILD_CONFIG
+    $(info ================================================)
+    $(info Overrides in \`$(BUILD_CONFIG)\` are used.)
+    $(info ================================================)
+endif
+
+ifndef JAVA_HOME
+    $(error JAVA_HOME is not set!)
+endif
+
+LIBRARY=libpEpJNI.a
+JAR=jniadapter.jar
+
+ifeq ($(BUILD_FOR),Linux)
+    SHARED=libpEpJNI.so
+else ifeq ($(BUILD_FOR),Darwin)
+    SHARED=libpEpJNI.dylib
+else
+    $(error I don't know how to build for $(BUILD_FOR).)
+endif
 
 JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \
-			 org/pEp/jniadapter/AbstractEngine.java \
-			 org/pEp/jniadapter/Message.java \
-			 org/pEp/jniadapter/Engine.java \
-			 org/pEp/jniadapter/Identity.java \
-			 org/pEp/jniadapter/_Identity.java \
-			 org/pEp/jniadapter/Blob.java \
-			 org/pEp/jniadapter/_Blob.java \
-			 org/pEp/jniadapter/CommType.java
+    org/pEp/jniadapter/AbstractEngine.java \
+    org/pEp/jniadapter/Message.java \
+    org/pEp/jniadapter/Engine.java \
+    org/pEp/jniadapter/Identity.java \
+    org/pEp/jniadapter/_Identity.java \
+    org/pEp/jniadapter/Blob.java \
+    org/pEp/jniadapter/_Blob.java \
+    org/pEp/jniadapter/CommType.java
 
 C_SOURCES=org_pEp_jniadapter_Engine.cc \
-		  org_pEp_jniadapter_Engine.h \
-		  org_pEp_jniadapter_Message.cc \
-		  org_pEp_jniadapter_Message.h \
-		  throw_pEp_exception.cc \
-		  throw_pEp_exception.hh \
-		  org_pEp_jniadapter_AbstractEngine.h
+    org_pEp_jniadapter_Engine.h \
+    org_pEp_jniadapter_Message.cc \
+    org_pEp_jniadapter_Message.h \
+    throw_pEp_exception.cc \
+    throw_pEp_exception.hh \
+    org_pEp_jniadapter_AbstractEngine.h
 
-gensource: $(JAVA_SOURCES) $(C_SOURCES)
+# Old versions of a Java distribution have a `javah` binary, new versions do not. This checks whether or not `javah` can be found in the Java distribution found in the directory `$JAVA_HOME`.
+NOT_USED := $(shell type $(JAVA_HOME)/bin/javah)
+ifeq ($(.SHELLSTATUS),0)
+    NEW_JAVA=placeholder
+endif
 
-$(JAR): $(JAVA_SOURCES)
-	javac org/pEp/jniadapter/*.java
-	jar cf $@ org/pEp/jniadapter/*.class
+JP=$(JAVA_HOME)/bin
 
-org_pEp_jniadapter_AbstractEngine.h: org/pEp/jniadapter/AbstractEngine.java
-	javah $(subst /,.,$(subst .java,,$<))
 
-org_pEp_jniadapter_Engine.h: org/pEp/jniadapter/Engine.java
-	javah $(subst /,.,$(subst .java,,$<))
+.PHONY: all
+all: $(JAR) $(SHARED)
 
-org_pEp_jniadapter_Message.h: org/pEp/jniadapter/Message.java
-	javah $(subst /,.,$(subst .java,,$<))
+.PHONY: gensource
+gensource: $(JAVA_SOURCES) $(C_SOURCES)
+
+$(JAR): $(JAVA_SOURCES)
+	$(JP)/javac org/pEp/jniadapter/*.java
+	$(JP)/jar cf $@ org/pEp/jniadapter/*.class
+
+BLUBB = org_pEp_jniadapter_AbstractEngine.h org_pEp_jniadapter_Engine.h org_pEp_jniadapter_Message.h
+$(BLUBB): org_pEp_jniadapter_%.h: org/pEp/jniadapter/%.java
+ifdef NEW_JAVA
+	$(JP)/javac -h . $<
+else
+	$(JP)/javah $(subst /,.,$(subst .java,,$<))
+endif
 
 org_pEp_jniadapter_AbstractEngine.o: %.o: %.cc %.h throw_pEp_exception.hh jniutils.hh
 	$(CXX) $(CXXFLAGS) -c $< -o $@
@@ -53,29 +90,28 @@ $(SHARED): $(LIBRARY)
 	$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
 
 org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
-	yml2proc -y gen_java_exceptions.ysl2 $< -o $@
+	$(YML2_PROC) -y gen_java_exceptions.ysl2 $< -o $@
 
 org/pEp/jniadapter/Message.java: pEp.yml2 gen_java_Message.ysl2 types_java.ysl2
-	yml2proc -y gen_java_Message.ysl2 $<
+	$(YML2_PROC) -y gen_java_Message.ysl2 $<
 
 org_pEp_jniadapter_Message.cc: pEp.yml2 gen_cpp_Message.ysl2 types_c.ysl2
-	yml2proc -y gen_cpp_Message.ysl2 $<
+	$(YML2_PROC) -y gen_cpp_Message.ysl2 $<
 
 org/pEp/jniadapter/Engine.java: pEp.yml2 gen_java_Engine.ysl2 types_java.ysl2
-	yml2proc -y gen_java_Engine.ysl2 $<
+	$(YML2_PROC) -y gen_java_Engine.ysl2 $<
 
 org_pEp_jniadapter_Engine.cc: pEp.yml2 gen_cpp_Engine.ysl2 types_c.ysl2
-	yml2proc -y gen_cpp_Engine.ysl2 $<
+	$(YML2_PROC) -y gen_cpp_Engine.ysl2 $<
 
 throw_pEp_exception.cc throw_pEp_exception.hh: pEp.yml2 gen_throw_pEp_exception.ysl2 textutils.ysl2
-	yml2proc -y gen_throw_pEp_exception.ysl2 $< -o throw_pEp_exception.cc
+	$(YML2_PROC) -y gen_throw_pEp_exception.ysl2 $< -o throw_pEp_exception.cc
 
 throw_pEp_exception.o: throw_pEp_exception.cc throw_pEp_exception.hh
 
 basic_api.o: basic_api.cc jniutils.hh throw_pEp_exception.hh
 
 .PHONY: clean
-
 clean:
 	rm -f $(JAR) $(LIBRARY) $(SHARED)
 	rm -f *.o
@@ -89,4 +125,3 @@ clean:
 	rm -f org/pEp/jniadapter/Color.java
 	rm -f throw_pEp_exception.*
 	rm -f org_pEp_jniadapter_Message.cc org_pEp_jniadapter_Engine.cc
-
diff --git a/src/Makefile.conf b/src/Makefile.conf
index 567b8ad..f609ceb 100644
--- a/src/Makefile.conf
+++ b/src/Makefile.conf
@@ -1,3 +1,68 @@
-CXXFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -I$(HOME)/include -fpermissive
-LDFLAGS=-L$(HOME)/lib
-SHARED=libpEpJNI.dylib
+# Copyright 2018, pEp Foundation
+# This file is part of pEp JNI Adapter
+# This file may be used under the terms of the GNU General Public License version 3
+# see LICENSE.txt
+
+######### Header #########
+HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
+
+
+######### General #########
+BUILD_FOR:=$(shell uname)
+
+
+######### Java #########
+#JAVA_HOME=
+
+
+######### C and C++ #########
+LDFLAGS=$(AD_INC) $(ENGINE_INC)
+
+
+######### C++ #########
+ifeq ($(BUILD_FOR),Linux)
+    CXX=g++ -std=c++14
+else ifeq ($(BUILD_FOR),Darwin)
+    CXX=clang -std=c++14
+endif
+
+ifeq ($(BUILD_FOR),Linux)
+    CXXFLAGS=-fdiagnostics-color=always -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(AD_INC) $(ENGINE_INC)
+else ifeq ($(BUILD_FOR),Darwin)
+    CXXFLAGS=-fcolor-diagnostics -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin $(AD_INC) $(ENGINE_INC)
+endif
+
+
+######### YML2 #########
+YML2_PATH=$(HOME)/yml2
+
+YML2_PROC=$(YML2_PATH)/yml2proc $(YML2_OPTS)
+
+YML2_OPTS=--encoding=utf8
+
+
+######### Engine #########
+ENGINE_LIB=
+#ENGINE_LIB=-L$(HOME)/local/lib
+
+ENGINE_INC=
+#ENGINE_INC=-I$(HOME)/local/inc
+
+
+######### libAdapter #########
+AD_LIB=
+#AD_LIB=-L$(HOME)/local/lib
+
+AD_INC=
+#AD_INC=-I$(HOME)/local/inc
+
+
+######### Footer #########
+-include $(HERE)/local.conf
+
+ifdef BUILD_CONFIG
+    include $(BUILD_CONFIG)
+endif
+
+# YML_PATH is needed in the environment of every call to a program of the YML2 distribution
+export YML_PATH=$(YML2_PATH)

From bae8b2d5a6ff17d70c948f4b363b0c838b162f42 Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 00:02:47 +0100
Subject: [PATCH 02/14] Add local.conf to ignore

---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgignore b/.hgignore
index b719f52..3b0c400 100644
--- a/.hgignore
+++ b/.hgignore
@@ -68,3 +68,4 @@ src/org.tar.gz
 syntax: regexp
 android/external/[^.]*
 
+src/local.conf

From 07bc19ea4d8fd80a9a54b1ce3dda19abd2f4a592 Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 00:23:54 +0100
Subject: [PATCH 03/14] Use canonical semantics for LD* variables

---
 src/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index cf2480a..56f4f5f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,6 +32,10 @@ else
     $(error I don't know how to build for $(BUILD_FOR).)
 endif
 
+LDFLAGS=-shared $(ENGINE_LIB) $(AD_LIB)
+
+LDLIBS=-lpEpEngine
+
 JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \
     org/pEp/jniadapter/AbstractEngine.java \
     org/pEp/jniadapter/Message.java \
@@ -87,7 +91,7 @@ $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_
 	ar -r $@ *.o
 
 $(SHARED): $(LIBRARY)
-	$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
+	$(CXX) *.o $(LDFLAGS) $(LDLIBS) -o $@
 
 org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
 	$(YML2_PROC) -y gen_java_exceptions.ysl2 $< -o $@

From 69fd89a0ded77a221c50d633f8774744ad4dd1ce Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 00:31:00 +0100
Subject: [PATCH 04/14] Link stdlib

---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 56f4f5f..30638b8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,7 +34,7 @@ endif
 
 LDFLAGS=-shared $(ENGINE_LIB) $(AD_LIB)
 
-LDLIBS=-lpEpEngine
+LDLIBS=-lstdc++ -lpEpEngine
 
 JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \
     org/pEp/jniadapter/AbstractEngine.java \

From 3601ca33bc09a933059d4e44cc23de327e06718b Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 01:18:44 +0100
Subject: [PATCH 05/14] switch 'javah' and 'javac -h' usage

---
 src/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 30638b8..03f2692 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -55,9 +55,9 @@ C_SOURCES=org_pEp_jniadapter_Engine.cc \
     org_pEp_jniadapter_AbstractEngine.h
 
 # Old versions of a Java distribution have a `javah` binary, new versions do not. This checks whether or not `javah` can be found in the Java distribution found in the directory `$JAVA_HOME`.
-NOT_USED := $(shell type $(JAVA_HOME)/bin/javah)
+NOT_USED:=$(shell type $(JAVA_HOME)/bin/javah)
 ifeq ($(.SHELLSTATUS),0)
-    NEW_JAVA=placeholder
+    OLD_JAVA=placeholder
 endif
 
 JP=$(JAVA_HOME)/bin
@@ -75,10 +75,10 @@ $(JAR): $(JAVA_SOURCES)
 
 BLUBB = org_pEp_jniadapter_AbstractEngine.h org_pEp_jniadapter_Engine.h org_pEp_jniadapter_Message.h
 $(BLUBB): org_pEp_jniadapter_%.h: org/pEp/jniadapter/%.java
-ifdef NEW_JAVA
-	$(JP)/javac -h . $<
-else
+ifdef OLD_JAVA
 	$(JP)/javah $(subst /,.,$(subst .java,,$<))
+else
+	$(JP)/javac -h . $<
 endif
 
 org_pEp_jniadapter_AbstractEngine.o: %.o: %.cc %.h throw_pEp_exception.hh jniutils.hh

From 5d86f97dcafb7fcca67ee445ab9c997b44394222 Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 14:05:04 +0100
Subject: [PATCH 06/14] Group java-related vars together in make

---
 src/Makefile      | 20 ++++++++------------
 src/Makefile.conf |  4 +++-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 03f2692..b933a0d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,6 +21,14 @@ ifndef JAVA_HOME
     $(error JAVA_HOME is not set!)
 endif
 
+JP=$(JAVA_HOME)/bin
+
+# Old versions of a Java distribution have a `javah` binary, new versions do not. This checks whether or not `javah` can be found in the Java distribution found in the directory `$JAVA_HOME`.
+NOT_USED:=$(shell type $(JAVA_HOME)/bin/javah)
+ifeq ($(.SHELLSTATUS),0)
+    OLD_JAVA=placeholder
+endif
+
 LIBRARY=libpEpJNI.a
 JAR=jniadapter.jar
 
@@ -32,10 +40,6 @@ else
     $(error I don't know how to build for $(BUILD_FOR).)
 endif
 
-LDFLAGS=-shared $(ENGINE_LIB) $(AD_LIB)
-
-LDLIBS=-lstdc++ -lpEpEngine
-
 JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \
     org/pEp/jniadapter/AbstractEngine.java \
     org/pEp/jniadapter/Message.java \
@@ -54,14 +58,6 @@ C_SOURCES=org_pEp_jniadapter_Engine.cc \
     throw_pEp_exception.hh \
     org_pEp_jniadapter_AbstractEngine.h
 
-# Old versions of a Java distribution have a `javah` binary, new versions do not. This checks whether or not `javah` can be found in the Java distribution found in the directory `$JAVA_HOME`.
-NOT_USED:=$(shell type $(JAVA_HOME)/bin/javah)
-ifeq ($(.SHELLSTATUS),0)
-    OLD_JAVA=placeholder
-endif
-
-JP=$(JAVA_HOME)/bin
-
 
 .PHONY: all
 all: $(JAR) $(SHARED)
diff --git a/src/Makefile.conf b/src/Makefile.conf
index f609ceb..af7cb80 100644
--- a/src/Makefile.conf
+++ b/src/Makefile.conf
@@ -16,7 +16,9 @@ BUILD_FOR:=$(shell uname)
 
 
 ######### C and C++ #########
-LDFLAGS=$(AD_INC) $(ENGINE_INC)
+LDFLAGS=-shared $(ENGINE_LIB) $(AD_LIB)
+
+LDLIBS=-lstdc++ -lpEpEngine
 
 
 ######### C++ #########

From cdd1ae1eb9d2d0c368c286f5df6056ab58b73b86 Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 14:22:58 +0100
Subject: [PATCH 07/14] Reoder things in makefile

---
 src/Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index b933a0d..e25d1d2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -40,15 +40,15 @@ else
     $(error I don't know how to build for $(BUILD_FOR).)
 endif
 
-JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \
-    org/pEp/jniadapter/AbstractEngine.java \
-    org/pEp/jniadapter/Message.java \
-    org/pEp/jniadapter/Engine.java \
-    org/pEp/jniadapter/Identity.java \
-    org/pEp/jniadapter/_Identity.java \
+JAVA_SOURCES=org/pEp/jniadapter/AbstractEngine.java \
     org/pEp/jniadapter/Blob.java \
+    org/pEp/jniadapter/CommType.java \
+    org/pEp/jniadapter/Identity.java \
     org/pEp/jniadapter/_Blob.java \
-    org/pEp/jniadapter/CommType.java
+    org/pEp/jniadapter/_Identity.java \
+    org/pEp/jniadapter/pEpException.java \
+    org/pEp/jniadapter/Message.java \
+    org/pEp/jniadapter/Engine.java \
 
 C_SOURCES=org_pEp_jniadapter_Engine.cc \
     org_pEp_jniadapter_Engine.h \
@@ -95,12 +95,12 @@ org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
 org/pEp/jniadapter/Message.java: pEp.yml2 gen_java_Message.ysl2 types_java.ysl2
 	$(YML2_PROC) -y gen_java_Message.ysl2 $<
 
-org_pEp_jniadapter_Message.cc: pEp.yml2 gen_cpp_Message.ysl2 types_c.ysl2
-	$(YML2_PROC) -y gen_cpp_Message.ysl2 $<
-
 org/pEp/jniadapter/Engine.java: pEp.yml2 gen_java_Engine.ysl2 types_java.ysl2
 	$(YML2_PROC) -y gen_java_Engine.ysl2 $<
 
+org_pEp_jniadapter_Message.cc: pEp.yml2 gen_cpp_Message.ysl2 types_c.ysl2
+	$(YML2_PROC) -y gen_cpp_Message.ysl2 $<
+
 org_pEp_jniadapter_Engine.cc: pEp.yml2 gen_cpp_Engine.ysl2 types_c.ysl2
 	$(YML2_PROC) -y gen_cpp_Engine.ysl2 $<
 

From aaaa307b4ef7e59f69cae96b81455cf12e306d27 Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 14:33:25 +0100
Subject: [PATCH 08/14] Add forgotten java files

---
 src/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index e25d1d2..c61f46b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -44,6 +44,8 @@ JAVA_SOURCES=org/pEp/jniadapter/AbstractEngine.java \
     org/pEp/jniadapter/Blob.java \
     org/pEp/jniadapter/CommType.java \
     org/pEp/jniadapter/Identity.java \
+    org/pEp/jniadapter/Pair.java \
+    org/pEp/jniadapter/Sync.java \
     org/pEp/jniadapter/_Blob.java \
     org/pEp/jniadapter/_Identity.java \
     org/pEp/jniadapter/pEpException.java \
@@ -69,7 +71,7 @@ $(JAR): $(JAVA_SOURCES)
 	$(JP)/javac org/pEp/jniadapter/*.java
 	$(JP)/jar cf $@ org/pEp/jniadapter/*.class
 
-BLUBB = org_pEp_jniadapter_AbstractEngine.h org_pEp_jniadapter_Engine.h org_pEp_jniadapter_Message.h
+BLUBB=org_pEp_jniadapter_AbstractEngine.h org_pEp_jniadapter_Engine.h org_pEp_jniadapter_Message.h
 $(BLUBB): org_pEp_jniadapter_%.h: org/pEp/jniadapter/%.java
 ifdef OLD_JAVA
 	$(JP)/javah $(subst /,.,$(subst .java,,$<))

From 7ddfa79b183292524cc8e744ed7b783dc82c40ca Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 14:35:32 +0100
Subject: [PATCH 09/14] Fix make clean

---
 src/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Makefile b/src/Makefile
index c61f46b..30650e9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -125,5 +125,11 @@ clean:
 	rm -f org/pEp/jniadapter/Engine.java
 	rm -f org/pEp/jniadapter/Message.java
 	rm -f org/pEp/jniadapter/Color.java
+	rm -f org/pEp/jniadapter/DecryptFlags.java
+	rm -f org/pEp/jniadapter/IdentityFlags.java
+	rm -f org/pEp/jniadapter/Rating.java
+	rm -f org/pEp/jniadapter/Status.java
+	rm -f org/pEp/jniadapter/SyncHandshakeResult.java
+	rm -f org/pEp/jniadapter/SyncHandshakeSignal.java
 	rm -f throw_pEp_exception.*
 	rm -f org_pEp_jniadapter_Message.cc org_pEp_jniadapter_Engine.cc

From 007b76541d63f1df20f274c2b1925c39012fd9c5 Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 16:48:55 +0100
Subject: [PATCH 10/14] Update doc

---
 README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..3d4926b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,51 @@
+# p≡p JNI Adapter
+
+## Prerequisites
+
+### yml2
+To set up yml2 properly, consult the documentation of pEp Engine (linked below). yml2 is a build dependency of pEp Engine.
+
+### C and C++ compiler
+Any gcc or clang distribution offered by your OS is fine.
+
+### pEp Engine
+Instructions for obtaining the pEp Engine can be found on [https://pep.foundation/dev/repos/pEpEngine/file/]().
+
+### libpEpAdapter
+Instructions for obtaining libpEpAdapter can be found on [https://pep.foundation/dev/repos/libpEpAdapter/file/]().
+
+### Java 8 (or newer) JDK
+Download Oracle Java from [https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html]().
+
+OpenJDK can be installed from macports on macOS with one of the following commands:
+
+~~~
+sudo port install openjdk8
+sudo port install openjdk11
+~~~
+
+## Building
+Customization of the build can be done in `src/Makefile.conf`, or in a file `src/local.conf` which is not part of the source code distribution.
+
+An example `src/local.conf` looks like this:
+
+~~~
+JAVA_HOME=/Library/Java/JavaVirtualMachines/openjdk8/Contents/Home
+
+YML2_PATH=$(HOME)/code/yml2
+
+ENGINE_INC=-I$(HOME)/code/engine/build/include
+ENGINE_LIB=-L$(HOME)/code/engine/build/lib
+
+AD_INC=-L$(HOME)/code/libad/build/include
+AD_LIB=-L$(HOME)/code/libad/build/lib
+~~~
+
+Depending on what is already set in your environment, or can be found in your default include/library paths, setting any of these variables may be optional on your platform.
+
+Now, build the Adapter with
+
+~~~
+cd src
+make
+~~~

From 570cf7e9a1a8be9cfeebf3b3b104da23228b8914 Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 16:49:14 +0100
Subject: [PATCH 11/14] Remove doc txt

---
 README.txt | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 README.txt

diff --git a/README.txt b/README.txt
deleted file mode 100644
index aca8ed9..0000000
--- a/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-p≡p JNI Adapter
-===============
-
-

From 571e0d67886acb918322ac5e2343c4766f3c9f5a Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Thu, 13 Dec 2018 16:47:32 +0100
Subject: [PATCH 12/14] Document macOS make version issue

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 3d4926b..2e86527 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,18 @@ Depending on what is already set in your environment, or can be found in your de
 
 Now, build the Adapter with
 
+On Linux:
+
 ~~~
 cd src
 make
 ~~~
+
+On macOS:
+
+~~~
+cd src
+gmake
+~~~
+
+(The GNU Make distributed with macOS is too old, install GNU Make "gmake" from macPorts).

From 379e500b0acec10d71b65a9ecf41f4242d4fdfda Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Thu, 17 Jan 2019 16:34:51 +0100
Subject: [PATCH 13/14] Fix capitalziation of includes

---
 src/basic_api.cc                         | 2 +-
 src/org_pEp_jniadapter_AbstractEngine.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/basic_api.cc b/src/basic_api.cc
index b79a007..433408c 100644
--- a/src/basic_api.cc
+++ b/src/basic_api.cc
@@ -1,6 +1,6 @@
 #include <pEp/keymanagement.h>
 #include <pEp/blacklist.h>
-#include <pEp/sync.h>
+#include <pEp/Sync.h>
 
 #ifndef ANDROID
 #include <string.h>
diff --git a/src/org_pEp_jniadapter_AbstractEngine.cc b/src/org_pEp_jniadapter_AbstractEngine.cc
index 149aa14..a358c1b 100644
--- a/src/org_pEp_jniadapter_AbstractEngine.cc
+++ b/src/org_pEp_jniadapter_AbstractEngine.cc
@@ -6,7 +6,7 @@
 #include <pthread.h>
 #include <pEp/keymanagement.h>
 #include <pEp/message_api.h>
-#include <pEp/sync.h>
+#include <pEp/Sync.h>
 
 #include "throw_pEp_exception.hh"
 #include "jniutils.hh"

From 5f39445b18a457e894380e3cd24460033fc8da22 Mon Sep 17 00:00:00 2001
From: Hussein Kasem <huss@pep-project.org>
Date: Fri, 8 Feb 2019 13:13:52 +0100
Subject: [PATCH 14/14] Chage type by which as type was failing

---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 30650e9..bb3ad5c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -24,7 +24,7 @@ endif
 JP=$(JAVA_HOME)/bin
 
 # Old versions of a Java distribution have a `javah` binary, new versions do not. This checks whether or not `javah` can be found in the Java distribution found in the directory `$JAVA_HOME`.
-NOT_USED:=$(shell type $(JAVA_HOME)/bin/javah)
+NOT_USED:=$(shell which $(JAVA_HOME)/bin/javah)
 ifeq ($(.SHELLSTATUS),0)
     OLD_JAVA=placeholder
 endif