Author: hibou
Date: Fri Mar 4 16:07:14 2011
New Revision: 1078033
URL: http://svn.apache.org/viewvc?rev=1078033&view=rev
Log:
get a working build
Added:
ant/site/ant/build.xml
- copied, changed from r1078018, ant/core/trunk/docs.xml
Modified:
ant/site/ant/sources/velocity.properties
Copied: ant/site/ant/build.xml (from r1078018, ant/core/trunk/docs.xml)
URL:
http://svn.apache.org/viewvc/ant/site/ant/build.xml?p2=ant/site/ant/build.xml&p1=ant/core/trunk/docs.xml&r1=1078018&r2=1078033&rev=1078033&view=diff
==============================================================================
--- ant/core/trunk/docs.xml (original)
+++ ant/site/ant/build.xml Fri Mar 4 16:07:14 2011
@@ -20,50 +20,34 @@
<description>
Build documentation - XDocs and Javadoc.
- For building XDocs, edit xdocs/**/*.xml first.
+ For building XDocs, edit sources/**/*.xml first.
If ../jakarta-site2 does not exist, set -Dsite.dir=... for it,
or just use -Dvelocity.dir=.../velocity-1.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'
- After this generation the pages in docs/ should be up-to-date and need
to be committed.
- Since I don't remember whether there is a cron job updating the site I
- usually log in to people.apache.org and run 'svn up' in
/www/ant.apache.org/
- (make sure your umask is 002 before you do that so the pages remain
group writable).
+ After this generation the pages in staging/ should be up-to-date and
need to be committed.
+
+ staging.ant.apache.org will then pickup your changes shortly after
your commit.
</description>
<!-- Initialization properties -->
<property name="project.name" value="ant"/>
- <property name="docs.src" location="xdocs"/>
- <property name="docs.dest" location="docs"/>
+ <property name="docs.src" location="sources"/>
+ <property name="docs.dest" location="staging"/>
<property name="project.file" value="stylesheets/project.xml" />
- <property name="templ.path" location="xdocs/stylesheets" />
+ <property name="templ.path" location="sources/stylesheets" />
<property name="velocity.props"
location="${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"/>
- <include name="velocity-*-dep.jar"/>
- <!-- XXX why is this needed separately? -->
- <include name="build/lib/jdom-*.jar"/>
- <include name="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">
+ <target name="prepare" depends="setup-classpath">
<available classname="org.apache.velocity.anakia.AnakiaTask"
property="AnakiaTask.present">
<classpath refid="anakia.classpath"/>
Modified: ant/site/ant/sources/velocity.properties
URL:
http://svn.apache.org/viewvc/ant/site/ant/sources/velocity.properties?rev=1078033&r1=1078032&r2=1078033&view=diff
==============================================================================
--- ant/site/ant/sources/velocity.properties (original)
+++ ant/site/ant/sources/velocity.properties Fri Mar 4 16:07:14 2011
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-file.resource.loader.path=xdocs/stylesheets
+file.resource.loader.path=sources/stylesheets
velocimacro.library=templates.vm
