You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general-cvs@xml.apache.org by cr...@apache.org on 2006/03/22 05:30:33 UTC
svn commit: r387711 - /xml/site/publish.xml
Author: crossley
Date: Tue Mar 21 20:30:31 2006
New Revision: 387711
URL: http://svn.apache.org/viewcvs?rev=387711&view=rev
Log:
Don't need special deploy.scp-alt target. Forrest handles it.
Modified:
xml/site/publish.xml
Modified: xml/site/publish.xml
URL: http://svn.apache.org/viewcvs/xml/site/publish.xml?rev=387711&r1=387710&r2=387711&view=diff
==============================================================================
--- xml/site/publish.xml (original)
+++ xml/site/publish.xml Tue Mar 21 20:30:31 2006
@@ -17,11 +17,11 @@
<!--
This is the publishing file for ForrestBot.
-Running "ant -f publish.xml" will build the XML site and deploy it using SCP on xml.apache.org.
+Running "forrest -f publish.xml" will build the XML site and deploy it using SCP on xml.apache.org.
$Id$
-->
-<project name="forrest-docs" default="main">
+<project name="xml-site-docs" default="main">
<property name="build.work-dir" location="./build/forrest/work"/>
<property name="build.log-dir" location="./build/forrest/log"/>
@@ -44,18 +44,7 @@
<property name="deploy.scp.host" value="cvs.apache.org"/>
<property name="deploy.scp.dest" value="${deploy.scp.user}@cvs.apache.org:/www/xml.apache.org"/>
- <target name="deploy.scp-alt" unless="build.failed" description="FB: Deploy to a remote location via scp">
- <if>
- <not><isset property="deploy.scp.passphrase"/></not>
- <then>
- <input addproperty="deploy.scp.passphrase" message="Enter passphrase for your private key for scp to ${deploy.scp.dest}:"/>
- </then>
- </if>
- <scp todir="${deploy.scp.dest}" keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}">
- <fileset dir="${build.site-dir}"/>
- </scp>
- </target>
- <target name="deploy.remote.fix.perms" depends="deploy.scp-alt" unless="build.failed" description="Fixes group permissions on newly uploaded files">
+ <target name="deploy.remote.fix.perms" depends="deploy.scp" unless="build.failed" description="Fixes group permissions on newly uploaded files">
<if>
<not><isset property="deploy.scp.passphrase"/></not>
<then>
@@ -67,7 +56,7 @@
keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}"
command="cd /www/xml.apache.org;chgrp -R xml *;chmod -R g+rw *"/>
</target>
- <target name="deploy" depends="deploy.scp-alt, deploy.remote.fix.perms"/>
+ <target name="deploy" depends="deploy.scp, deploy.remote.fix.perms"/>
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: general-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: general-cvs-help@xml.apache.org