diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-08 16:00:14 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-08 16:00:14 +0300 |
| commit | 09b8d081fc6a3b4883e2a7837ac077f092fb4aba (patch) | |
| tree | 83affc750c81c61391b5a942a1bf30462ae2461a /scripts | |
| parent | 96dda655db270069ecd88d3b9340e8a05c17bebc (diff) | |
| download | vaadin-framework-09b8d081fc6a3b4883e2a7837ac077f092fb4aba.tar.gz vaadin-framework-09b8d081fc6a3b4883e2a7837ac077f092fb4aba.zip | |
Fix archetype validation and make report demo listing prettier
Change-Id: Iaedb612c882240f8b93313a7a5c7d2e610e50869
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/BuildArchetypes.py | 4 | ||||
| -rw-r--r-- | scripts/GenerateBuildReport.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/scripts/BuildArchetypes.py b/scripts/BuildArchetypes.py index 82ebe85e43..4242134573 100644 --- a/scripts/BuildArchetypes.py +++ b/scripts/BuildArchetypes.py @@ -11,7 +11,7 @@ # import subprocess -from BuildHelpers import mavenValidate, copyWarFiles, repo, getLogFile, mavenCmd, updateRepositories, getArgs, removeDir, parser +from BuildHelpers import mavenValidate, copyWarFiles, repo, getLogFile, mavenCmd, updateRepositories, getArgs, removeDir, parser, resultPath from DeployHelpers import deployWar ## DEFAULT VARIABLES ## @@ -55,7 +55,7 @@ def generateArchetype(archetype): # Generate pom.xml print("Generating pom.xml for archetype %s" % (archetype)) - subprocess.check_call(cmd, stdout=log) + subprocess.check_call(cmd, cwd=resultPath, stdout=log) # Return the artifactId so we know the name in the future return artifactId diff --git a/scripts/GenerateBuildReport.py b/scripts/GenerateBuildReport.py index 4f0a75e73e..2cf156398d 100644 --- a/scripts/GenerateBuildReport.py +++ b/scripts/GenerateBuildReport.py @@ -20,12 +20,14 @@ content = """<html> <tr><td><a href="https://dev.vaadin.com/query?status=pending-release&milestone=">Pending-release tickets without milestone</a></td></tr> <tr><td><a href="apidiff/changes.html">API Diff</a></td></tr> <tr><td><a href="release-notes/release-notes.html">Release Notes</a></td></tr> +<tr><td>Try demos<ul> """.format(version=args.version) for demo in demos: - content += "<tr><td><a href='{url}/{demoName}-{version}'>{demoName}</a></td></tr>\n".format(url=args.deployUrl, demoName=demo, version=args.version) + content += "<li><a href='{url}/{demoName}-{version}'>{demoName}</a></li>\n".format(url=args.deployUrl, demoName=demo, version=args.version) -content += """<tr><td><a href="{url}">Build result page (See test results, pin and tag build and dependencies)</a></td></tr> +content += """</ul></td></tr> +<tr><td><a href="{url}">Build result page (See test results, pin and tag build and dependencies)</a></td></tr> </table> </body> </html>""".format(url=args.buildResultUrl) |