gnupg-fpr-java

.classpath

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="examples"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="gnupg-for-java/build"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>

.gitignore

@@ -0,0 +1,11 @@
+*.class
+build/
+dist/
+hs_err_pid*.log
+jni/*.o
+jni/*.orig
+jni/TAGS
+# generated JNI headers
+jni/com_freiheit_gnupg_GnuPG*.h
+lib/libgnupg-for-java.so
+target/

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>gnupg-for-java</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

README.md

@@ -1,16 +1,71 @@
-About GnuPG for Java
-=======================
+GnuPG for Java
+==============
 
-This is a lib I wrote a couple of years ago. It is a native binding to the
-gpgme library from Werner Koch. It uses JNI. 
+GnuPG for Java is a Java wrapper for the gpgme (GnuPG Made Easy) library for
+working with the GnuPG encryption suite. It is a native binding to the gpgme
+using JNI.  It requires gpgme 1.4.3 or newer, and expects to work with GnuPG
+2.x as the "engine" in gpgme.  With GnuPG 2.x, gpg-agent will handle prompting
+the user for the passphrase, as well as passphrase caching.
 
 gpgpme is the standard library for developing third-party apps on top of GnuPG.
 
-I wrote it for 32-Bit Intel GNU/Linux platforms. Some of my colleagues added
-64-Bit Intel GNU/Linux support. It should run on other Unix-platforms, too. But
-this is not tested. Also I am not aware if it runs with the current version
-of gpgme. It should be easy to add Windows support by compiling a DLL, adding
-this to the jar and extend the loading mechanism to load a DLL on a Windows platform
+Stefan Richter originally wrote it for 32-Bit Intel GNU/Linux platforms. Some
+of his colleagues added 64-Bit Intel GNU/Linux support. It should build and
+run on other UNIX platforms too, but that has not been tested.  The Guardian
+Project then ported it to GnuPG 2.x and Android as the basis of Gnu Privacy
+Guard for Android, and added lots of features and fixed lots of bugs in the
+process.
+
+It should be easy to add Windows support by compiling a DLL, adding this to
+the jar and extend the loading mechanism to load a DLL on a Windows platform
 instead of loading a .so lib.
 
 
+## Setup for Building
+
+You will need a JUnit jar to run the tests.  If your system does not provide
+one already, you can download the jar and put it into the build/ directory of
+this project.
+
+### Debian/Ubuntu/Mint/etc
+
+    sudo apt-get install default-jdk make ant build-essential \
+        libgpgme11-dev libgpg-error-dev
+
+
+### Windows
+
+* Install MinGW (for 32-bit): http://mingw.org/
+* Install Gpg4win: http://gpg4win.org/download.html
+** Signing Key Fingerprint: `61AC 3F5E E4BE 593C 13D6  8B1E 7CBD 620B EC70 B1B8`
+
+
+### Mac OS X
+
+You need to install GnuPG2 from one of a couple sources.  You can get
+it from Homebrew, MacPorts, or Fink.  Or you can install
+"GPGTools":https://gpgtools.org and then build gpgme from source.
+
+
+## Building
+
+To build the `gnupg-for-java.jar` and `libgnupg-for-java.so` in build/, run
+this:
+
+    ant clean release
+
+You can run the test suite using `ant` also:
+
+    ant test
+
+If you want the optional javadoc in build/docs/, run:
+
+    ant javadoc
+
+
+## Hacking Notes
+
+Please conform to our code format standard. For C files use
+./format-code.sh. For Java files, use Eclipse with the Android mode from the
+Android project.  The default Eclipse formatting is usually close enough.
+

build.properties

@@ -1,27 +1,15 @@
 # default build.properties
 
-app.name=javagnupg
-app.type=@APP-TYPE@
-app.version=0.1.5-ascii-armor-linux-i386-ia64
+app.name=gnupg-for-java
+app.version=0.2-pre
 app.customer=LGPL
 app.vendor=freiheit.com technologies gmbh
-app.year=2008
-
-lib=./lib
+app.year=2014
 
 build.compiler=modern
 compile.debug=true
 compile.deprecation=false
 compile.optimize=true
 
-#where to put the source code
-src=src
-
-#where to put the generated class files
-build=build
-
-#where to put the generated class files
-dist=dist
-
 #where to put etc stuff :-)
 etc=etc

build.xml

@@ -1,105 +1,100 @@
-<project name="javagnupg" default="full-jar" basedir=".">
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="gnupg-for-java" default="release" basedir=".">
     <property file="build.properties"/>
 
+    <property name="build.dir" location="build" />
+    <property name="classes.dir" location="${build.dir}/classes" />
+    <property name="docs.dir" location="${build.dir}/docs" />
+    <property name="jarfile" value="${build.dir}/${app.name}-${app.version}.jar"/>
+
     <target name="prepare" description="Create the necessary directories and files for the build">
-        <mkdir dir="${build}"/>
-        <mkdir dir="${dist}"/>
+        <mkdir dir="${build.dir}"/>
     </target>
 
     <target name="clean" depends="clean-native" description="Remove all generated dirs and files...">
-        <delete dir="${build}"/>
-        <delete dir="${dist}"/>
+        <delete file="${jarfile}"/>
+        <delete dir="${classes.dir}" includeEmptyDirs="true"/>
     </target>
 
     <target name="compile-java" depends="prepare" description="Compile the Java code for the GnuPG-Library">
-	<javac srcdir="${src}/java" destdir="${build}" deprecation="off" debug="on">
-            <src path="${src}/java"/>
-        </javac>
-    </target>
-
-    <target name="compile-tests" depends="prepare" description="Compile the JUnit test code for the GnuPG-Library">
-	<javac srcdir="${src}/junit" destdir="${build}" deprecation="off" debug="on">
-            <classpath>
-               <pathelement location="${lib}/junit-3.8.1.jar"/>
-            </classpath>
-        </javac>
+      <mkdir dir="${classes.dir}"/>
+      <javac srcdir="src" destdir="${classes.dir}" debug="on">
+        <src path="src"/>
+      </javac>
     </target>
 
-    <target name="test" depends="gen-jni-header, compile-tests, full-jar" description="Test the library functions...">
+    <target name="test" depends="gen-jni-headers, release" description="Test the library functions...">
      	<property name="TestEnv" value="textui"/>
      	<!-- 	"textui" for text-environment
      			"swingui" for swing-environment
      		 	"awtui" for awt-environment	-->
 
+        <delete dir="/tmp/gnupg-for-java-tests"/>
+        <mkdir dir="/tmp/gnupg-for-java-tests"/>
     	<java classname="junit.${TestEnv}.TestRunner" fork ="yes">
             <classpath>
-               <pathelement location ="${basedir}/${dist}/${app.name}-${app.version}.jar"/>
-               <pathelement location="${lib}/junit-3.8.1.jar"/>
+                <fileset dir="${build.dir}" includes="*.jar"/>
+                <fileset dir="${classes.dir}"/>
             </classpath>
-            <!--classpath refid="compile.classpath"/-->
-            <arg value="com.freiheit.gnupg.GnuPGTestSuite"/>
+            <sysproperty key="java.library.path" value="${build.dir}"/>
+            <arg value="com.freiheit.gnupg.tests.GnuPGTestSuite"/>
         </java>
     </target>
 
-
-    <target name="full-jar" depends="gen-jni-library" description="Use this is you want to rebuild everything">
+    <target name="release" depends="gen-jni-library" description="Use this is you want to rebuild everything">
         <antcall target="jar"/>
     </target>
 
     <target name="jar" depends="compile-java" description="Use this, if you only want to recompile changed java code">
-    	<copydir dest="${build}" src="${src}"/>
-    	<delete failonerror="false" file="${build}/c/libjavagnupg.so"/>
-        <jar jarfile="${dist}/${app.name}-${app.version}.jar" basedir="${build}" />
+      <jar jarfile="${jarfile}" basedir="${classes.dir}" />
     </target>
-
+    
     <target name="clean-native" description="calls make clean in the c/ directory">
-        <exec executable="make" dir="${src}/c" failonerror="false">
-            <arg value="-e"/>
-            <arg value="clean"/>
-        </exec>
+      <exec executable="make" dir="jni" failonerror="false">
+        <arg value="BUILD_DIR=${build.dir}"/>
+        <arg value="clean"/>
+      </exec>
     </target>
 
     <!-- I am not using the javah-target, because it must installed additionally. -->
     <!-- Instead I am calling a separate GNUmakefile, that manages all C-related tasks -->
 
     <target name="generate-jni-headers" depends="compile-java" description="Use this, if you want to generate headers without resolving dependencies automatically">
-        <exec executable="make" dir="${src}/c" failonerror="true">
-            <arg value="header"/>
-            <arg value="-e"/>
+        <exec executable="make" dir="jni" failonerror="true">
+            <arg value="BUILD_DIR=${build.dir}"/>
+            <arg value="CLASSES_DIR=${classes.dir}"/>
+            <arg value="headers"/>
         </exec>
     </target>
 
-    <target name="gen-jni-header" depends="compile-java" description="Generate the JNI C-Header Files from the Java-Classes">
+    <target name="gen-jni-headers" depends="compile-java" description="Generate the JNI C-Header Files from the Java-Classes">
         <antcall target="generate-jni-headers"/>
     </target>
 
     <target name="recompile-c-code" description="Use this, if you just want to compile without resolving dependencies automatically">
-        <exec executable="make" dir="${src}/c" failonerror="true">
+        <exec executable="make" dir="jni" failonerror="true">
+            <arg value="BUILD_DIR=${build.dir}"/>
             <arg value="lib"/>
-            <arg value="-e"/>
         </exec>
     </target>
 
-    <target name="gen-jni-library" depends="gen-jni-header" description="Generate the Shared Library with the JNI-Binding Code">
+    <target name="gen-jni-library" depends="gen-jni-headers" description="Generate the Shared Library with the JNI-Binding Code">
         <antcall target="recompile-c-code"/>
     </target>
 
     <target name="javadoc" description="Create Javadoc-API documentation">
-        <mkdir  dir="${build}/docs/api"/>
-        <mkdir  dir="${build}/docs/images"/>
-        <copy todir="${build}/docs/images" file="etc/whitepaper.gif"/>
-        <copy todir="${build}/docs/images" file="etc/fdc.javadoc.png"/>
+        <mkdir  dir="${docs.dir}/images"/>
+        <copy todir="${docs.dir}/images" file="etc/guardianproject-logo.png"/>
+        <copy todir="${docs.dir}/images" file="etc/fdc.javadoc.png"/>
 
-        <javadoc sourcepath="${src}/java"
-                    destdir="${build}/docs/${app.name}-${app.version}"
+        <javadoc sourcepath="src"
+                    destdir="${docs.dir}/${app.name}-${app.version}"
                 windowtitle="${app.name} (Version ${app.version})"
                    doctitle="${app.name} (Version ${app.version})"
                      bottom="&#169; ${app.year} ${app.vendor}"
-                     header="freiheit.com technologies gmbh"
+                     header="freiheit.com technologies gmbh &amp; The Guardian Project"
                packagenames="com.freiheit.*"
-             stylesheetfile="${etc}/stylesheet.css"
                    overview="${etc}/overview.html">
-          <!--classpath refid="compile.classpath"/-->
             <!--
                 !!! relative path for headers does NOT work !!!
                 header="&lt;img src='../images/fdc.javadoc.png'&gt;"
@@ -110,7 +105,7 @@
     </target>
 
     <target name="zip_javadoc" depends="javadoc" description="Create a zip-file for API-Javadoc">
-        <zip zipfile="${build}/${app.name}-${app.version}-javadoc.zip" basedir="${build}/docs/${app.name}-${app.version}"/>
+        <zip zipfile="build/${app.name}-${app.version}-javadoc.zip" basedir="${docs.dir}/${app.name}-${app.version}"/>
     </target>
 
 </project>