Author: bodewig
Date: Tue Aug 22 21:35:40 2006
New Revision: 433883
URL: http://svn.apache.org/viewvc?rev=433883&view=rev
Log:
separate directory for site
Added:
ant/site/ (with props)
ant/site/build.xml
- copied, changed from r433876, ant/core/trunk/docs.xml
ant/site/generated/ (with props)
ant/site/lib/
ant/site/lib/antlr-runtime.jar (with props)
ant/site/lib/commons-collections.jar (with props)
ant/site/lib/jdom-b9.jar (with props)
ant/site/lib/logkit-1.0.1.jar (with props)
ant/site/lib/velocity-1.4.jar (with props)
ant/site/lib/werken.xpath.jar (with props)
Propchange: ant/site/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Aug 22 21:35:40 2006
@@ -0,0 +1 @@
+xdocs http://svn.apache.org/repos/asf/ant/core/trunk/xdocs
Copied: ant/site/build.xml (from r433876, ant/core/trunk/docs.xml)
URL:
http://svn.apache.org/viewvc/ant/site/build.xml?p2=ant/site/build.xml&p1=ant/core/trunk/docs.xml&r1=433876&r2=433883&rev=433883&view=diff
==============================================================================
--- ant/core/trunk/docs.xml (original)
+++ ant/site/build.xml Tue Aug 22 21:35:40 2006
@@ -1,82 +1,51 @@
<?xml version="1.0"?>
<!--
- Copyright 2000-2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
-->
<project name="build-site" default="docs" basedir=".">
- <description>
- Build documentation - XDocs and Javadoc.
- For building XDocs, edit xdocs/**/*.xml first.
- If ../jakarta-site2 does not exist, set -Dsite.dir=... for it,
- or just use -Dvelocity.dir=.../velocity-4.x if you have downloaded
Velocity somewhere.
-
- XXX for no apparent reason, your CWD must be the main Ant source dir,
or this will fail:
- .../docs.xml:64:
org.apache.velocity.exception.ResourceNotFoundException: Unable to find
resource './site.vsl'
- </description>
-
<!-- Initialization properties -->
<property name="project.name" value="ant"/>
- <property name="docs.src" location="xdocs"/>
- <property name="docs.dest" location="docs"/>
+ <property name="core.docs.src" location="xdocs"/>
+ <property name="core.docs.dest" location="generated"/>
<property name="project.file" value="stylesheets/project.xml" />
- <property name="templ.path" location="xdocs/stylesheets" />
- <property name="velocity.props"
location="${docs.src}/velocity.properties" />
+ <property name="templ.path" location="${core.docs.src}/stylesheets" />
+ <property name="velocity.props"
location="${core.docs.src}/velocity.properties" />
<property name="include.xml" value="**/*.xml" />
- <target name="setup-explicit-classpath" if="velocity.dir">
- <path id="anakia.classpath">
- <fileset dir="${velocity.dir}">
- <include name="velocity-dep-*.jar"/>
- <!-- XXX why is this needed separately? -->
- <include name="build/lib/jdom-*.jar"/>
- </fileset>
- </path>
- </target>
-
- <target name="setup-implicit-classpath" unless="velocity.dir">
- <property name="site.dir" location="../jakarta-site2"/>
+ <target name="setup-classpath">
<path id="anakia.classpath">
- <fileset dir="${site.dir}/lib">
- <include name="*.jar"/>
- </fileset>
+ <fileset dir="lib"/>
</path>
</target>
- <target name="prepare"
depends="setup-explicit-classpath,setup-implicit-classpath">
- <available classname="org.apache.velocity.anakia.AnakiaTask"
- property="AnakiaTask.present">
- <classpath refid="anakia.classpath"/>
- </available>
+ <target name="prepare" depends="setup-classpath">
<condition property="onwindows">
<os family="windows"/>
</condition>
</target>
- <target depends="prepare" name="prepare-error" unless="AnakiaTask.present">
- <echo>
- AnakiaTask is not present! Please check to make sure that
- velocity.jar is in your classpath.
- </echo>
- </target>
-
- <target name="anakia" if="AnakiaTask.present" depends="prepare-error">
+ <target name="anakia" depends="prepare">
<taskdef name="anakia"
classname="org.apache.velocity.anakia.AnakiaTask">
<classpath refid="anakia.classpath"/>
</taskdef>
- <anakia basedir="${docs.src}" destdir="${docs.dest}/"
+ <anakia basedir="${core.docs.src}" destdir="${core.docs.dest}/"
extension=".html" style="./site.vsl"
projectFile="${project.file}"
excludes="**/stylesheets/**"
@@ -85,21 +54,13 @@
templatePath="${templ.path}"
velocityPropertiesFile="${velocity.props}">
</anakia>
- <fixcrlf srcdir="${docs.dest}" includes="**/*.html"/>
+ <fixcrlf srcdir="${core.docs.dest}" includes="**/*.html"/>
</target>
<target name="fixcrlf" if="onwindows">
- <fixcrlf srcDir="${docs.dest}" eol="dos" includes="*.html"/>
- </target>
-
- <target name="docs" if="AnakiaTask.present" depends="anakia,fixcrlf"
description="Create XDocs.">
- </target>
- <target name="javadocs" description="Create Javadoc.">
- <ant antfile="build.xml" target="dist_javadocs">
- <property name="dist.javadocs" value="${docs.dest}/manual/api" />
- </ant>
+ <fixcrlf srcDir="${core.docs.dest}" eol="dos" includes="*.html"/>
</target>
- <target name="all" depends="docs,javadocs" description="Create both XDocs
and Javadoc."/>
+ <target name="docs" depends="anakia,fixcrlf" description="Create XDocs."/>
</project>
Propchange: ant/site/generated/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Aug 22 21:35:40 2006
@@ -0,0 +1 @@
+manual http://svn.apache.org/repos/asf/ant/core/tags/ANT_165/docs/manual
Added: ant/site/lib/antlr-runtime.jar
URL:
http://svn.apache.org/viewvc/ant/site/lib/antlr-runtime.jar?rev=433883&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/site/lib/antlr-runtime.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/site/lib/commons-collections.jar
URL:
http://svn.apache.org/viewvc/ant/site/lib/commons-collections.jar?rev=433883&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/site/lib/commons-collections.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/site/lib/jdom-b9.jar
URL: http://svn.apache.org/viewvc/ant/site/lib/jdom-b9.jar?rev=433883&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/site/lib/jdom-b9.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/site/lib/logkit-1.0.1.jar
URL:
http://svn.apache.org/viewvc/ant/site/lib/logkit-1.0.1.jar?rev=433883&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/site/lib/logkit-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/site/lib/velocity-1.4.jar
URL:
http://svn.apache.org/viewvc/ant/site/lib/velocity-1.4.jar?rev=433883&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/site/lib/velocity-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/site/lib/werken.xpath.jar
URL:
http://svn.apache.org/viewvc/ant/site/lib/werken.xpath.jar?rev=433883&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/site/lib/werken.xpath.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
