Fix main site creation

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@377177 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2006-02-12 13:48:06 +00:00
parent 29061271bb
commit 8d720c63aa
2 changed files with 11 additions and 12 deletions

View File

@ -1,6 +1,6 @@
<!-- <!--
/* /*
* Copyright 2001-2004 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -42,20 +42,10 @@
<j:set var="executionDir" value="${basedir}" /> <j:set var="executionDir" value="${basedir}" />
</j:if> </j:if>
<maven:maven <maven:maven
descriptor="${executionDir}/../project.xml" descriptor="${executionDir}/../plugins-site/project.xml"
goals="confirm-and-deploy-site" goals="confirm-and-deploy-site"
ignoreFailures="false" ignoreFailures="false"
/> />
</postGoal> </postGoal>
<goal name="confirm-and-deploy-site">
<j:if test="${(skipQuestion == null) or not (skipQuestion == 'true')}">
<i:ask question="Would you like to regenerate and deploy the main plugins site (y/n)?" answer="ok" default="y"/>
<j:if test="${ok == 'y'}">
<attainGoal name="multiproject:site"/>
<attainGoal name="site:sshdeploy"/>
</j:if>
</j:if>
</goal>
</project> </project>

View File

@ -27,6 +27,15 @@
<attainGoal name="multiproject:site"/> <attainGoal name="multiproject:site"/>
<attainGoal name="site:deploy"/> <attainGoal name="site:deploy"/>
</goal> </goal>
<goal name="confirm-and-deploy-site">
<j:if test="${(skipQuestion == null) or not (skipQuestion == 'true')}">
<i:ask question="Would you like to regenerate and deploy the main plugins site (y/n)?" answer="ok" default="y"/>
<j:if test="${ok == 'y'}">
<attainGoal name="multiproject:site"/>
<attainGoal name="site:sshdeploy"/>
</j:if>
</j:if>
</goal>
<postGoal name="site"> <postGoal name="site">
<ant:move file="${maven.docs.dest}/projects-overview.html" tofile="${maven.docs.dest}/index.html"/> <ant:move file="${maven.docs.dest}/projects-overview.html" tofile="${maven.docs.dest}/index.html"/>
</postGoal> </postGoal>