Support multiple architectures

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.travis.yml

@@ -1,16 +1,8 @@
+os: linux
+dist: xenial
+
 jobs:
   include:
-    - os: linux
-      language: java
-      dist: xenial
-      jdk: openjdk8
-      script: mvn clean test
-
-    - os: osx
-      language: java
-      osx_image: xcode9
-      script: mvn clean test
-
     - os: windows
       language: shell
       before_install:
@@ -26,7 +18,57 @@ jobs:
           echo $MAVEN_HOME/bin
           ls $MAVEN_HOME/bin
           mvn -version
-
+
+      script: mvn clean test
+
+    - os: linux
+      arch: amd64
+      jdk: openjdk8
+      script: mvn clean test
+
+    - os: linux
+      arch: amd64
+      jdk: openjdk11
+      script: mvn clean test
+
+    - os: linux
+      arch: arm64
+      before_install:
+        - sudo apt-get update
+        - sudo apt-get -y install openjdk-8-jdk maven
+      script: mvn clean test
+
+    # Cannot install JDK 11 on Linux/arm64
+    #    - os: linux
+    #      arch: arm64
+    #      before_install:
+    #        - sudo apt-get update
+    #        - sudo apt-get install -y openjdk-11-jdk maven
+    #      script: mvn clean test
+
+    - os: osx
+      language: java
+      osx_image: xcode7.3
+      script: mvn clean test
+
+    - os: osx
+      language: java
+      osx_image: xcode8.3
+      script: mvn clean test
+
+    - os: osx
+      language: java
+      osx_image: xcode9.3
+      script: mvn clean test
+
+    - os: osx
+      language: java
+      osx_image: xcode10.2
+      script: mvn clean test
+
+    - os: osx
+      language: java
+      osx_image: xcode11.4
       script: mvn clean test
 
-install: true
+install: true

CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required( VERSION 2.8.12 )
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "Minimum OS X deployment version")
 project ( webp-imageio )
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)

compile-all.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+./dockcross/dockcross-linux-armv5 bash -c './compile.sh Linux arm'
+./dockcross/dockcross-linux-armv7 bash -c './compile.sh Linux armv7'
+./dockcross/dockcross-linux-arm64 bash -c './compile.sh Linux aarch64'
+./dockcross/dockcross-linux-x86 bash -c './compile.sh Linux x86'
+./dockcross/dockcross-linux-x64 bash -c './compile.sh Linux x86_64'
+./dockcross/dockcross-linux-ppc64le bash -c './compile.sh Linux ppc64'
+
+./dockcross/dockcross-windows-static-x86 bash -c './compile.sh Windows x86'
+./dockcross/dockcross-windows-static-x64 bash -c './compile.sh Windows x86_64'
+
+docker run --rm -v $(pwd):/workdir -e CROSS_TRIPLE=x86_64-apple-darwin multiarch/crossbuild ./compile.sh Mac x86_64 /workdir/multiarch-darwin.cmake

compile.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+echo Building for OS: $1, Arch: $2, Toolchain: $3
+mkdir -p build/$1/$2
+cd build/$1/$2
+
+if [ -z "$3" ]; then
+  cmake ../../..
+else
+  cmake ../../.. -DCMAKE_TOOLCHAIN_FILE=$3
+fi
+
+cmake --build . --config Release
+
+cd ../../..
+
+LIB="libwebp-imageio.so"
+if [ "$1" == "Windows" ]; then
+  LIB="webp-imageio.dll"
+elif [ "$1" == "Mac" ]; then
+  LIB="libwebp-imageio.dylib"
+fi
+
+mkdir -p src/main/resources/native/$1/$2/
+cp build/$1/$2/src/main/c/${LIB} src/main/resources/native/$1/$2/