You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/09/26 20:17:19 UTC
svn commit: r1390630 - /lucene/dev/trunk/build.xml
Author: uschindler
Date: Wed Sep 26 18:17:18 2012
New Revision: 1390630
URL: http://svn.apache.org/viewvc?rev=1390630&view=rev
Log:
Inherit the JAVA6_HOME and JAVA7_HOME from the process environment
Modified:
lucene/dev/trunk/build.xml
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1390630&r1=1390629&r2=1390630&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Wed Sep 26 18:17:18 2012
@@ -259,10 +259,23 @@
<property name="fakeReleaseTmp" value="lucene/build/fakeReleaseTmp"/>
<property name="fakeReleaseVersion" value="5.0.0"/> <!-- *not* -SNAPSHOT, the real version -->
- <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it" depends="clean">
+ <target name="-load-env">
+ <!-- load the properties only here, so not on every invocation /usr/bin/env is called: -->
+ <property environment="env"/>
+ </target>
+
+ <target name="-env-JAVA6_HOME" depends="-load-env" if="env.JAVA6_HOME">
+ <property name="JAVA6_HOME" location="env.JAVA6_HOME"/>
+ </target>
+
+ <target name="-env-JAVA7_HOME" depends="-load-env" if="env.JAVA7_HOME">
+ <property name="JAVA7_HOME" location="env.JAVA7_HOME"/>
+ </target>
+
+ <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it" depends="clean,-env-JAVA6_HOME,-env-JAVA7_HOME">
<sequential>
- <fail unless="JAVA6_HOME">JAVA6_HOME property is not defined.</fail>
- <fail unless="JAVA7_HOME">JAVA7_HOME property is not defined.</fail>
+ <fail unless="JAVA6_HOME">JAVA6_HOME property or environment variable is not defined.</fail>
+ <fail unless="JAVA7_HOME">JAVA7_HOME property or environment variable is not defined.</fail>
<subant target="prepare-release-no-sign" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
<fileset dir="solr" includes="build.xml" />