pass pom.version to upload ant task. Fix prompt problems with sshexec (should handle existing directories better).

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@797637 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Dick 2009-07-24 20:25:33 +00:00
parent e7f9191695
commit b8610366f0
2 changed files with 4 additions and 0 deletions

View File

@ -395,6 +395,7 @@
<property name="nightly.user.name" value="${nightly.user.name}"/>
<property name="nightly.password" value="${nightly.password}"/>
<property name="nightly.version" value="${nightly.version}"/>
<property name="pom.version" value="${pom.version}"/>
</ant>
</tasks>
</configuration>

View File

@ -35,6 +35,9 @@
<include name="docs.zip"/>
</fileset>
</scp>
<!-- remove directories, hopefully this fails silently. mkdir does not and stops the process these exist.-->
<sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${pom.version}/docs" trust="true" />
<sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${pom.version}/downloads" trust="true" />
<sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="unzip -qq -d ${build.dir}/ ${build.dir}/docs.zip" trust="true" />
<sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm ${build.dir}/docs.zip" trust="true" />
<sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="mkdir ${build.dir}/apache-openjpa-${pom.version}/downloads " trust="true" />