Author: mikedd
Date: Fri Jul 24 20:25:33 2009
New Revision: 797637
URL: http://svn.apache.org/viewvc?rev=797637&view=rev
Log:
pass pom.version to upload ant task. Fix prompt problems with sshexec (should
handle existing directories better).
Modified:
openjpa/trunk/openjpa-project/pom.xml
openjpa/trunk/openjpa-project/upload.xml
Modified: openjpa/trunk/openjpa-project/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=797637&r1=797636&r2=797637&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Fri Jul 24 20:25:33 2009
@@ -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>
Modified: openjpa/trunk/openjpa-project/upload.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/upload.xml?rev=797637&r1=797636&r2=797637&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/upload.xml (original)
+++ openjpa/trunk/openjpa-project/upload.xml Fri Jul 24 20:25:33 2009
@@ -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" />
