diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-09 16:29:14 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-09 16:29:14 +0300 |
| commit | 17fda4abbcc5456e4fca00356455e9c6ea558a37 (patch) | |
| tree | dbb20d5ad9d6715573f5bc4e9a9b3f9a56251340 /scripts | |
| parent | 43a0e91b11bd5b846526eed648127cc417462603 (diff) | |
| download | vaadin-framework-17fda4abbcc5456e4fca00356455e9c6ea558a37.tar.gz vaadin-framework-17fda4abbcc5456e4fca00356455e9c6ea558a37.zip | |
Fix Archetype validation script to use correct path for pom files
Change-Id: I0402807724c8ec911c0af3192f883a49f08d60ac
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/BuildArchetypes.py | 7 | ||||
| -rw-r--r-- | scripts/BuildHelpers.py | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/BuildArchetypes.py b/scripts/BuildArchetypes.py index cc8dfef66c..7fffaa7246 100644 --- a/scripts/BuildArchetypes.py +++ b/scripts/BuildArchetypes.py @@ -13,6 +13,7 @@ import subprocess, sys from BuildHelpers import mavenValidate, copyWarFiles, getLogFile, mavenCmd, updateRepositories, getArgs, removeDir, parser, resultPath from DeployHelpers import deployWar +from os.path import join ## DEFAULT VARIABLES ## @@ -76,7 +77,7 @@ if __name__ == "__main__": try: log = getLogFile(archetype) generateArchetype(archetype, artifactId, args.repo) - updateRepositories(artifactId) + updateRepositories(join(resultPath, artifactId)) mavenValidate(artifactId, logFile=log) warFiles = copyWarFiles(artifactId, name=archetype) for war in warFiles: @@ -86,9 +87,9 @@ if __name__ == "__main__": print("War %s failed to deploy: %s" % (war, e)) archetypesFailed = True except Exception as e: - print("Archetype %s build failed" % (archetype, e)) + print("Archetype %s build failed:" % (archetype), e) archetypesFailed = True - removeDir(artifactId) +# removeDir(artifactId) print("") if archetypesFailed: sys.exit(1) diff --git a/scripts/BuildHelpers.py b/scripts/BuildHelpers.py index b96da1b408..8da0671819 100644 --- a/scripts/BuildHelpers.py +++ b/scripts/BuildHelpers.py @@ -105,7 +105,6 @@ def readPomFile(pomFile): # pom.xml namespace workaround root = ElementTree.parse(pomFile).getroot() nameSpace = root.tag[1:root.tag.index('}')] - print("Using namespace: %s" % (nameSpace)) ElementTree.register_namespace('', nameSpace) # Read the pom.xml correctly |