From eb64c03cdb624765e744f7e0dd0594ed6f45e77f Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Thu, 9 Jan 2014 12:13:19 +0100
Subject: [PATCH] pull M2_HOME into scons env
---
.travis.yml | 2 +-
src/bindings/java/SConscript | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 94eba753..4d335929 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,7 +95,7 @@ install: true
before_script:
- if [ "$BINDINGS" == "php" ]; then phpenv config-add src/bindings/php/hammer.ini; fi
script:
- - if [ "$BINDINGS" == "java" ]; then mvn install -P linux; else scons bindings=$BINDINGS test; fi
+ - scons bindings=$BINDINGS test
notifications:
irc:
channels:
diff --git a/src/bindings/java/SConscript b/src/bindings/java/SConscript
index 7b05b537..b0eff764 100644
--- a/src/bindings/java/SConscript
+++ b/src/bindings/java/SConscript
@@ -19,6 +19,7 @@ javaenv.AppendENVPath('PATH', java_bin)
javaenv['ENV']['JAVA_HOME'] = java_base
javaenv['ENV']['JNI_CPPPATH'] = java_headers
javaenv['ENV']['JNI_LIBPATH'] = java_libs
+javaenv['ENV']['M2_HOME'] = os.environ.get('M2_HOME')
if sys.platform.startswith('linux'):
platform = 'linux'
--
GitLab