You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/09/23 03:28:16 UTC
svn commit: r1388940 - in /lucene/dev/trunk: ./ dev-tools/
dev-tools/scripts/smokeTestRelease.py lucene/ solr/
Author: sarowe
Date: Sun Sep 23 01:28:16 2012
New Revision: 1388940
URL: http://svn.apache.org/viewvc?rev=1388940&view=rev
Log:
- Enable running under cygwin (windows path -> cygwin path)
- Don't put non-POM-templates into POMtemplates
(merge lucene_solr_4_0 branch r1388937)
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=1388940&r1=1388939&r2=1388940&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py Sun Sep 23 01:28:16 2012
@@ -371,6 +371,8 @@ def getDirEntries(urlString):
path = urlString[7:]
if path.endswith('/'):
path = path[:-1]
+ if cygwin: # Convert Windows path to Cygwin path
+ path = re.sub(r'^/([A-Za-z]):/', r'/cygdrive/\1/', path)
l = []
for ent in os.listdir(path):
entPath = '%s/%s' % (path, ent)
@@ -982,9 +984,6 @@ def verifyArtifactPerPOMtemplate(POMtemp
xpathSkipConfiguration = '{0}configuration/{0}skip'.format(namespace)
for project in ('lucene', 'solr'):
for POMtemplate in POMtemplates[project]:
- if not POMtemplate.endswith('.xml.template'):
- continue
- print(' Checking POM template %s' % POMtemplate)
treeRoot = ET.parse(POMtemplate).getroot()
skipDeploy = False
for plugin in treeRoot.findall(xpathPlugin):
@@ -1016,12 +1015,14 @@ def getPOMtemplates(POMtemplates, tmpDir
targetDir = '%s/dev-tools/maven' % tmpDir
if not os.path.exists(targetDir):
os.makedirs(targetDir)
- crawl(allPOMtemplates, sourceLocation, targetDir, set(['Apache Subversion'])) # Ignore "Apache Subversion" links
+ crawl(allPOMtemplates, sourceLocation, targetDir, set(['Apache Subversion', 'maven.testlogging.properties']))
- POMtemplates['lucene'] = [p for p in allPOMtemplates if '/maven/lucene/' in p]
+ reLucenePOMtemplate = re.compile(r'.*/maven/lucene.*/pom\.xml\.template$')
+ POMtemplates['lucene'] = [p for p in allPOMtemplates if reLucenePOMtemplate.search(p)]
if POMtemplates['lucene'] is None:
raise RuntimeError('No Lucene POMs found at %s' % sourceLocation)
- POMtemplates['solr'] = [p for p in allPOMtemplates if '/maven/solr/' in p]
+ reSolrPOMtemplate = re.compile(r'.*/maven/solr.*/pom\.xml\.template$')
+ POMtemplates['solr'] = [p for p in allPOMtemplates if reSolrPOMtemplate.search(p)]
if POMtemplates['solr'] is None:
raise RuntimeError('No Solr POMs found at %s' % sourceLocation)
POMtemplates['grandfather'] = [p for p in allPOMtemplates if '/maven/pom.xml.template' in p]