2.7-java-4

Dockerfile

@@ -1,9 +1,12 @@
-FROM alpine
+FROM debian:stable-slim
 
 # For i386
-#FROM i386/alpine
+#FROM i386/debian:stable-slim
 #ENTRYPOINT ["linux32", "--"]
 
-RUN apk add --no-cache git libtool automake autoconf make g++ bash openjdk8
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
+RUN mkdir -p /usr/share/man/man1
+
+RUN apt-get update && apt-get install -y default-jdk-headless git-core bash libtool automake autoconf make g++
 RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules https://gitlab.com/MasterPassword/MasterPassword.git /mpw
 RUN cd /mpw/gradle && ./gradlew -i clean build

gradle/build.gradle

@@ -2,7 +2,7 @@ allprojects {
     apply plugin: 'findbugs'
 
     group = 'com.lyndir.masterpassword'
-    version = '2.7.2'
+    version = '2.7.4'
 
     tasks.withType( JavaCompile ) {
         options.encoding = 'UTF-8'

lib/bin/build_lib

@@ -32,8 +32,15 @@ PATH+=:/usr/local/bin
 needs() { _needs "$@"; }
 _needs() {
     local failed=0
-    for tool; do
-        hash "$tool" || { echo >&2 "Missing: $tool.  Please install this tool."; (( failed++ )); }
+    for spec; do
+        IFS=: read pkg tools <<< "$spec"
+        IFS=, read -a tools <<< "${tools:-$pkg}"
+        for tool in "${tools[@]}"; do
+            hash "$tool" && continue 2
+        done
+
+        echo >&2 "Missing: $pkg.  Please install this package."
+        (( failed++ ))
     done
 
     return $failed
@@ -51,7 +58,7 @@ _initialize() {
 #
 # Check if all tools needed for the default implementations are available.
 #
-# By default, this will check for `libtool` (for libtoolize), `automake` (for aclocal) and `autoconf` (for autoreconf).
+# By default, this will check for `libtool` (for libtoolize), `automake` (for aclocal), `autoconf` (for autoreconf) and make.
 initialize_needs() { _initialize_needs "$@"; }
 _initialize_needs() {
     if [[ $platform = windows ]]; then
@@ -59,7 +66,7 @@ _initialize_needs() {
         export VSINSTALLDIR="${VSINSTALLDIR:-$(cd "$(cygpath -F 0x002a)/Microsoft Visual Studio"/*/*/Common7/.. && pwd)}"
         [[ -e "$VSINSTALLDIR/Common7/Tools/VsMSBuildCmd.bat" ]] || { echo >&2 "Missing: msbuild.  Please install 'Build Tools for Visual Studio'."; return 1; }
     else
-        needs libtool automake autoconf
+        needs libtool:libtoolize,glibtoolize automake autoconf make
     fi
 }
 

lib/bin/build_libsodium-windows

@@ -1,4 +1,13 @@
 #!/usr/bin/env bash
 source "${BASH_SOURCE%/*}/build_lib"
 
+finalize_merge() {
+    local prefix=$1 platform=$2; shift 2
+    local archs=( "$@" )
+
+    cp -a "src/libsodium/include" "$prefix/out"
+    
+    _finalize_merge "$prefix" "$platform" "${archs[@]}"
+}
+
 build libsodium windows

platform-independent/c/core/build.gradle

@@ -35,7 +35,7 @@ library {
         }
         withType( GccCompatibleToolChain ) {
             eachPlatform {
-                cppCompiler.withArguments { addAll( ['-x', 'c', '-O3', '-std=c11', '-Werror', '-DMPW_SODIUM=1'] ) }
+                cppCompiler.withArguments { addAll( ['-x', 'c', '-O3', '-Werror', '-DMPW_SODIUM=1'] ) }
             }
         }
     }
@@ -69,14 +69,14 @@ library {
                 }
 
                 // libjson-c
-                archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec ).configure {
+                /*archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec ).configure {
                     commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${system}"
                     privateHeaders.from "$rootDir/../lib/libjson-c/build-${system}~/out/include"
                     add( linkLibraries.name, fileTree( "$rootDir/../lib/libjson-c/build-${system}~/out/lib" ) )
                 }
                 clean.dependsOn project.tasks.maybeCreate( "clean_libjson-c-${system}", Exec ).configure {
                     commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${system}", 'clean'
-                }
+                }*/
             }
         }
     }

platform-independent/c/core/src/mpw-jni.c

@@ -7,7 +7,7 @@
 
 // TODO: We may need to zero the jbytes safely.
 
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
     JNIEnv* env;
     if ((*vm)->GetEnv( vm, (void **)&env, JNI_VERSION_1_6 ) != JNI_OK)
         return -1;