diff options
| -rw-r--r-- | publish.xml | 57 |
1 files changed, 20 insertions, 37 deletions
diff --git a/publish.xml b/publish.xml index bc5e3338f..76a982954 100644 --- a/publish.xml +++ b/publish.xml @@ -18,7 +18,7 @@ <!--
This is the publishing file for ForrestBot.
-Running "ant -f publish.xml" will build the FOP site and deploy it using SCP on xmlgraphics.apache.org/fop.
+Running "ant -f publish.xml" will build the FOP site and upload it to SVN. It has then to be checked out on people.apache.org to be deployed.
$Id$
-->
@@ -31,44 +31,27 @@ $Id$ <!--property name="getsrc.svn.url" value="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk"/-->
<target name="getsrc" depends="getsrc.clean-workdir, getsrc.local"/>
- <!-- create this secret file to be an ant project (not stored in CVS or SVN)
- that sets deploy.scp.user and deploy.scp.keyfile properties.
- See forrest/etc/publishing_our_site.txt
+ <target name="build.fixCRLF" depends="build.forrest">
+ <fixcrlf srcdir="./build/forrest-docs" eol="lf">
+ <include name="**/.htaccess"/>
+ <include name="**/*.htm*"/>
+ <include name="**/*.css"/>
+ <include name="**/*.xsl*"/>
+ <include name="**/*.js"/>
+ <include name="**/*.rdf"/>
+ <include name="**/*.txt"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.fo"/>
+ <include name="**/*.svg"/>
+ </fixcrlf>
+ </target>
+
+ <target name="build" depends="build.forrest, build.fixCRLF"/>
- Here's an example of such a file (place it one directory above the checkout directory):
- <project>
- <property name="deploy.scp.user" value="johndoe"/>
- <property name="deploy.scp.keyfile" value="/path/to/my/private/key"/>
- </project>
- -->
- <import file="../deploy.settings" optional="true"/>
+ <import file="../deploy.svn.settings" optional="true"/>
- <property name="deploy.scp.host" value="people.apache.org"/>
- <property name="deploy.scp.dest" value="${deploy.scp.user}@${deploy.scp.host}:/www/xmlgraphics.apache.org/fop"/>
- <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">
- <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>
- <!-- this is necessary because new files are not group writable -->
- <sshexec host="${deploy.scp.host}" username="${deploy.scp.user}"
- keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}"
- command="cd /www/xmlgraphics.apache.org/fop;chgrp -R xmlgraphics *;chmod -R g+rw *"/>
- </target>
- <target name="deploy" depends="deploy.scp-alt, deploy.remote.fix.perms"/>
+ <property name="deploy.svn.url" value="https://svn.apache.org/repos/asf/xmlgraphics/site/deploy/fop/"/>
+ <target name="deploy" depends="deploy.svn"/>
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
|