From e3d21cef474c45c1fda0ac7dd37e389b5232a216 Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep-project.org>
Date: Thu, 11 Jun 2015 09:24:31 +0200
Subject: [PATCH] adding Makefile.conf for local configuration

---
 src/Makefile             | 29 +++++++++++++++++------------
 src/Makefile.conf        |  3 +++
 src/gen_java_Engine.ysl2 |  2 +-
 src/pEp.yml2             |  3 +--
 src/types_java.ysl2      |  5 +++++
 5 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 src/Makefile.conf

diff --git a/src/Makefile b/src/Makefile
index aa2b3f3..8705436 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,20 +1,36 @@
 LIBRARY=libpEpJNI.a
 JAR=jniadapter.jar
 
+include Makefile.conf
+
 all: $(JAR) $(LIBRARY)
 
 $(JAR): org/pEp/jniadapter/pEpException.java org/pEp/jniadapter/AbstractEngine.java org/pEp/jniadapter/Engine.java
 	javac org/pEp/jniadapter/*.java
 	jar cf $@ org/pEp/jniadapter/*.class
 
-org_pEp_jniadapter_AbstractEngine.h: org/pEp/jniadapter/Engine.java
+org_pEp_jniadapter_AbstractEngine.h: org/pEp/jniadapter/AbstractEngine.java
 	javah org.pEp.jniadapter.AbstractEngine
 
+org_pEp_jniadapter_Engine.h: org/pEp/jniadapter/Engine.java
+	javah org.pEp.jniadapter.Engine
+
 org_pEp_jniadapter_AbstractEngine.o: org_pEp_jniadapter_AbstractEngine.h org_pEp_jniadapter_AbstractEngine.cc throw_pEp_exception.hh jniutils.hh
 
 $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o throw_pEp_exception.o jniutils.o
 	ar -r $@ *.o
 
+org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
+	yml2proc -y gen_java_exceptions.ysl2 $< -o $@
+
+org/pEp/jniadapter/Engine.java : pEp.yml2 gen_java_Engine.ysl2 types_java.ysl2
+	yml2proc -y gen_java_Engine.ysl2 $< -o $@
+
+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
+
+throw_pEp_exception.o: throw_pEp_exception.cc throw_pEp_exception.hh
+
 .PHONY: clean
 
 clean:
@@ -27,14 +43,3 @@ clean:
 	rm -f org/pEp/jniadapter/Engine.java
 	rm -f throw_pEp_exception.*
 
-org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
-	yml2proc -y gen_java_exceptions.ysl2 $< -o $@
-
-org/pEp/jniadapter/Engine.java : pEp.yml2 gen_java_Engine.ysl2 types_java.ysl2
-	yml2proc -y gen_java_Engine.ysl2 $< -o $@
-
-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
-
-throw_pEp_exception.o: throw_pEp_exception.cc throw_pEp_exception.hh
-
diff --git a/src/Makefile.conf b/src/Makefile.conf
new file mode 100644
index 0000000..3ba32a3
--- /dev/null
+++ b/src/Makefile.conf
@@ -0,0 +1,3 @@
+JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_11.jdk/Contents/Home
+CXXFLAGS=-I$(JAVA_HOME)/include -I/opt/local/include -I$(JAVA_HOME)/include/darwin -I$(HOME)/include
+CLASSPATH=$(HOME)/k-9/src
diff --git a/src/gen_java_Engine.ysl2 b/src/gen_java_Engine.ysl2
index def14e8..c5409be 100644
--- a/src/gen_java_Engine.ysl2
+++ b/src/gen_java_Engine.ysl2
@@ -6,7 +6,7 @@ tstylesheet {
     template "/"
         ||
         package org.pEp.jniadapter;
-        
+
         final public class Engine extends AbstractEngine {
             public Engine() throws pEpException { }
 
diff --git a/src/pEp.yml2 b/src/pEp.yml2
index cb9287b..80a2f9c 100644
--- a/src/pEp.yml2
+++ b/src/pEp.yml2
@@ -34,7 +34,7 @@ namespace pEp {
         pEp_verified_and_trusted                        > 0x0408
         pEp_cannot_decrypt_unknown						> 0x04ff
 
-        pEp_safeword_not_found							> 0x0501
+        pEp_trustword_not_found							> 0x0501
 
         pEp_cannot_create_key                           > 0x0601
         pEp_cannot_send_key                             > 0x0602
@@ -58,7 +58,6 @@ namespace pEp {
         
         method decrypt_message(
                 in message src,
-                in pEp_MIME_format mime,
                 creates message dst
             );
     };
diff --git a/src/types_java.ysl2 b/src/types_java.ysl2
index 311a0db..d98fada 100644
--- a/src/types_java.ysl2
+++ b/src/types_java.ysl2
@@ -6,6 +6,11 @@ function "toJava" {
     choose {
         when "string" > String
         when "stringlist" > String[]
+        when "message" > MimeMessage
+        when "pEp-identity" > Identity
+        when "identity_list" > Identity[]
+        when "timestamp" > Date
+        when "pEp_enc_format" > MimeMessage.EncFormat
         otherwise call "CamelCase" with "text", "$type";
     }
 }