gnu: java-pep-adapter: Update to 2.1.23.

pEp/nightly.scm

@@ -274,10 +274,10 @@ ENGINE_INC_PATH=~a/include
 (pretty Easy privacy) engine.")
     (license license:gpl3)))
 
-(define-public java-pep-jni-adapter
+(define-public java-pep-adapter
   (package
-    (name "java-pep-jni-adapter")
-    (version "2.1")
+    (name "java-pep-adapter")
+    (version "2.1.23")
     (source
      (origin
        (method git-fetch)
@@ -286,19 +286,18 @@ ENGINE_INC_PATH=~a/include
              (commit (string-append "Release_" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1v56lj305b5mh45l5jz4gmkjlq488si7ndnp2lp9h3zsdlla1rjk"))))
+        (base32 "1sw3a5ggxcrkghvpp0a6h2lz461x55ldgfw5y4pw7c3gk5wynvjk"))))
     (build-system gnu-build-system)
     (outputs '("out" "doc"))
     (arguments
      `(#:test-target "test"
-       #:make-flags (list "doxy-all")
+       #:make-flags '("NDEBUG=1" "all" "doc") ; release build
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'pin-shared-lib-path
            (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "src/foundation/pEp/jniadapter/AbstractEngine.java"
+             (substitute* "src/java/foundation/pEp/jniadapter/AbstractEngine.java"
                (("System.loadLibrary\\(\"pEpJNI\"\\);")
-                                        ;(string-append "System.loadLibrary(\""
                 (string-append "System.load(\""
                                (assoc-ref outputs "out")
                                "/lib/libpEpJNI.so" "\");")))
@@ -310,10 +309,9 @@ ENGINE_INC_PATH=~a/include
              (let ((out (assoc-ref outputs "out"))
                    (engine (assoc-ref inputs "pep-engine"))
                    (libadapter (assoc-ref inputs "libpepadapter"))
-                   (openjdk  (assoc-ref inputs "openjdk"))
-                   )
+                   (openjdk  (assoc-ref inputs "openjdk")))
                (with-output-to-file "local.conf"
-                 (lambda ()
+                 (lambda _
                    (format #t "
 PREFIX=~a
 ENGINE_LIB_PATH=~a/lib
@@ -325,19 +323,21 @@ JAVA_HOME=~a
 "
                            out engine engine libadapter libadapter
                            (which "yml2proc") openjdk)))
-               (substitute* "src/Makefile"
+               (substitute* "src/Makefile"  ;; suppress some warnings
                  (("^\\s+OLD_JAVA=") "    xxx_OLD_JAVA="))
                #t)))
+         (add-before 'build 'build-codegen
+           ;; run codegen first to allow parallel build of other parts
+           (lambda _
+             (invoke "make" "-C" "src" "create-dirs" "codegen")))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (libout (string-append out "/lib/"))
                     (javaout (string-append out "/share/java/")))
-               (mkdir-p libout)
-               (mkdir-p javaout)
-               (copy-file "src/libpEpJNI.so"
-                          (string-append libout "/libpEpJNI.so"))
-               (copy-file "src/pEp.jar" (string-append javaout "/pEp.jar"))
+               (install-file "dist/libpEpJNI.a" libout)
+               (install-file "dist/libpEpJNI.so" libout)
+               (install-file "dist/pEp.jar" javaout)
                #t)))
          (add-after 'install 'install-docs
            (lambda* (#:key outputs #:allow-other-keys)
@@ -352,6 +352,7 @@ JAVA_HOME=~a
                #t))))))
     (native-inputs
      `(("doxygen" ,doxygen)
+       ("graphviz" ,graphviz)
        ("openjdk" ,openjdk9 "jdk")
        ("which" ,which)
        ("yml2" ,yml2)))
@@ -360,9 +361,9 @@ JAVA_HOME=~a
        ("pep-engine" ,pep-engine)
        ("util-linux" ,util-linux "lib"))) ;; uuid.h
     (home-page "https://pep.foundation/")
-    (synopsis "p≡p Python adapter")
-    (description "The p≡p Python adapter is an adaptor interface to the p≡p
- (pretty Easy privacy) Engine.")
+    (synopsis "Java adapter for p≡p (pretty Easy Privacy)")
+    (description "The p≡p JNI adapter is a Java adapter interface to the p≡p
+(pretty Easy privacy) engine.")
     (license license:gpl3)))