From 6514348da0e3aeaf1f88a88fef06edd7bc8d4deb Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Fri, 1 Dec 2017 11:03:06 -0800 Subject: [PATCH 1/3] #174: Fix folder name for android --- src/main/java/org/xerial/snappy/OSInfo.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/xerial/snappy/OSInfo.java b/src/main/java/org/xerial/snappy/OSInfo.java index ff78257..d8b52a7 100755 --- a/src/main/java/org/xerial/snappy/OSInfo.java +++ b/src/main/java/org/xerial/snappy/OSInfo.java @@ -204,9 +204,10 @@ public class OSInfo { String osArch = System.getProperty("os.arch"); // For Android if(isAndroid()) { - osArch = "android-arm"; + return "android-arm"; } - else if(osArch.startsWith("arm")) { + + if(osArch.startsWith("arm")) { osArch = resolveArmArchType(); } else { From 4eaa9a269c12ed001a86d102a53787b45e41222a Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Fri, 1 Dec 2017 11:04:19 -0800 Subject: [PATCH 2/3] Use 1.1.7.1-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index e672cf0..fca22ef 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.1.8-SNAPSHOT" +version in ThisBuild := "1.1.7.1-SNAPSHOT" From 2f38b2eae6f9bd343243b68379daff444741ae0c Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Fri, 1 Dec 2017 14:10:24 -0800 Subject: [PATCH 3/3] Add makefile for building centos5 docker image --- docker/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 docker/Makefile diff --git a/docker/Makefile b/docker/Makefile new file mode 100644 index 0000000..f07fd9e --- /dev/null +++ b/docker/Makefile @@ -0,0 +1,6 @@ + +centos5-image: + docker build -f Dockerfile.centos5-linux-x86_64-pic -t xerial/centos5-linux-x86_64:latest + # dockerhub login + # docker login --username=xerial + # docker push xerial/centos5-linux-x86_64:latest