Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

also set JAVACMD env var (sometimes ant uses only that and doesn't fallback to JAVA_HOME) 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1405956 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2012-11-05 21:13:08 +00:00
parent f1a67f7cb0
commit b4728370c4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-tools/scripts/smokeTestRelease.py
View File

@ -64,7 +64,7 @@ def javaExe(version):
raise RuntimeError("unknown Java version '%s'" % version)
if cygwin:
path = os.popen('cygpath -u "%s"' % path).read().strip()
return 'export JAVA_HOME="%s" PATH="%s/bin:$PATH"' % (path, path)
return 'export JAVA_HOME="%s" PATH="%s/bin:$PATH" JAVACMD="%s/bin/java"' % (path, path, path)
def verifyJavaVersion(version):
s = os.popen('%s; java -version 2>&1' % javaExe(version)).read()
@ -77,11 +77,13 @@ try:
JAVA6_HOME = env['JAVA6_HOME']
except KeyError:
JAVA6_HOME = '/usr/local/jdk1.6.0_27'
print('JAVA6_HOME is %s' % JAVA6_HOME)
try:
JAVA7_HOME = env['JAVA7_HOME']
except KeyError:
JAVA7_HOME = '/usr/local/jdk1.7.0_01'
print('JAVA7_HOME is %s' % JAVA7_HOME)
verifyJavaVersion('1.6')
verifyJavaVersion('1.7')