Change-Id: Iaedb612c882240f8b93313a7a5c7d2e610e50869tags/7.6.0.alpha3
@@ -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 |
@@ -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) |