svn commit: r1389476 - in /lucene/dev/trunk: ./ dev-tools/ dev-tools/scripts/smokeTestRelease.py lucene/ solr/

[sa...@apache.org]

Author: sarowe
Date: Mon Sep 24 16:33:39 2012
New Revision: 1389476

URL: http://svn.apache.org/viewvc?rev=1389476&view=rev
Log:
Make smoke tester work on cygwin when JAVAX_HOME environment variable values are Windows style (X:/blah or X:\blah...) (merge branch lucene_solr_4_0 r1389448)

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/dev-tools/   (props changed)
    lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/solr/   (props changed)

Modified: lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py?rev=1389476&r1=1389475&r2=1389476&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py Mon Sep 24 16:33:39 2012
@@ -38,6 +38,9 @@ import checkJavadocLinks
 # must have a working gpg, tar, unzip in your path.  This has been
 # tested on Linux and on Cygwin under Windows 7.
 
+cygwin = platform.system().lower().startswith('cygwin')
+cygwinWindowsRoot = os.popen('cygpath -w /').read().strip().replace('\\','/') if cygwin else ''
+
 def unshortenURL(url):
   parsed = urllib.parse.urlparse(url)
   if parsed[0] in ('http', 'https'):
@@ -55,6 +58,8 @@ def javaExe(version):
     path = JAVA7_HOME
   else:
     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)
 
 def verifyJavaVersion(version):
@@ -77,9 +82,6 @@ except KeyError:
 verifyJavaVersion('1.6')
 verifyJavaVersion('1.7')
 
-cygwin = platform.system().lower().startswith('cygwin')
-cygwinWindowsRoot = os.popen('cygpath -w /').read().strip().replace('\\','/') if cygwin else ''
-
 # TODO
 #   + verify KEYS contains key that signed the release
 #   + make sure changes HTML looks ok