You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by va...@apache.org on 2018/10/01 20:00:20 UTC
commons-crypto git commit: Add OS X to Travis CI matrix.
Repository: commons-crypto
Updated Branches:
refs/heads/master 421d02a11 -> c5c6220c2
Add OS X to Travis CI matrix.
Closes #83
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/c5c6220c
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/c5c6220c
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/c5c6220c
Branch: refs/heads/master
Commit: c5c6220c2509c4d12de3fc08d591f82b89f882a0
Parents: 421d02a
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Mon Oct 1 12:59:54 2018 -0700
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Mon Oct 1 12:59:54 2018 -0700
----------------------------------------------------------------------
.travis.yml | 18 ++++++++++++------
Makefile | 3 +++
Makefile.common | 8 ++++----
pom.xml | 6 ++++++
4 files changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/c5c6220c/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 41d9766..d86e91f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,16 +16,22 @@
#
language: java
+matrix:
+ include:
+ - name: "Linux / Java 8"
+ os: linux
+ before_install:
+ - "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip"
+ after_success:
+ - mvn clean test jacoco:report coveralls:report
+ - name: "OS X / Java 8"
+ os: osx
+ osx_image: xcode9.3
+
jdk:
- oraclejdk8
-before_install:
- - "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip"
-
script:
- mvn apache-rat:check
- mvn site
- mvn clirr:check
-
-after_success:
- - mvn clean test jacoco:report coveralls:report
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/c5c6220c/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index b6e8648..627e01c 100644
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,9 @@ win64:
mac32:
$(MAKE) native OS_NAME=Mac OS_ARCH=x86
+mac64:
+ $(MAKE) native OS_NAME=Mac OS_ARCH=x86_64
+
linux32:
$(MAKE) native OS_NAME=Linux OS_ARCH=x86
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/c5c6220c/Makefile.common
----------------------------------------------------------------------
diff --git a/Makefile.common b/Makefile.common
index 3518f57..f6bd9ff 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -172,8 +172,8 @@ Linux-armhf_COMMONS_CRYPTO_FLAGS:=
Mac-x86_CC := gcc -arch i386
Mac-x86_CXX := g++ -arch i386
Mac-x86_STRIP := strip -x
-Mac-x86_CFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include
-Mac-x86_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include
+Mac-x86_CFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include
+Mac-x86_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include
Mac-x86_LINKFLAGS := -dynamiclib -static-libgcc -L/usr/local/lib
Mac-x86_LIBNAME := libcommons-crypto.jnilib
Mac-x86_COMMONS_CRYPTO_FLAGS :=
@@ -181,8 +181,8 @@ Mac-x86_COMMONS_CRYPTO_FLAGS :=
Mac-x86_64_CC := gcc -arch $(OS_ARCH)
Mac-x86_64_CXX := g++ -arch $(OS_ARCH)
Mac-x86_64_STRIP := strip -x
-Mac-x86_64_CFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.5 -fvisibility=hidden -I/usr/local/include
-Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.5 -fvisibility=hidden -I/usr/local/include
+Mac-x86_64_CFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.5 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include
+Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.5 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include
Mac-x86_64_LINKFLAGS := -dynamiclib -L/usr/local/lib
Mac-x86_64_LIBNAME := libcommons-crypto.jnilib
Mac-x86_64_COMMONS_CRYPTO_FLAGS :=
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/c5c6220c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1277133..4513342 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,6 +260,12 @@ The following provides more details on the included cryptographic software:
</properties>
</profile>
<profile>
+ <id>mac64</id>
+ <properties>
+ <target.name>mac64</target.name>
+ </properties>
+ </profile>
+ <profile>
<id>linux32</id>
<properties>
<target.name>linux32</target.name>