You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/03/20 07:15:08 UTC
svn commit: r158311 - in lenya/trunk/src/targets: compile-build.xml
init-build.xml webapp-build.xml
Author: gregor
Date: Sat Mar 19 22:15:08 2005
New Revision: 158311
URL: http://svn.apache.org/viewcvs?view=rev&rev=158311
Log:
Don't copy core Java sources to build.src. This saves another 500 unnecessary copies, and maybe 3 seconds.
Modified:
lenya/trunk/src/targets/compile-build.xml
lenya/trunk/src/targets/init-build.xml
lenya/trunk/src/targets/webapp-build.xml
Modified: lenya/trunk/src/targets/compile-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/compile-build.xml?view=diff&r1=158310&r2=158311
==============================================================================
--- lenya/trunk/src/targets/compile-build.xml (original)
+++ lenya/trunk/src/targets/compile-build.xml Sat Mar 19 22:15:08 2005
@@ -24,17 +24,19 @@
</description>
<!-- The main compilation target -->
+ <!-- Compile the core Lenya classes plus the assembled publication classes -->
<target name="compile" depends="prepare-src"
description="Compile the sources">
<mkdir dir="${build.webapp}/WEB-INF/classes"/>
- <javac srcdir="${build.src}"
- destdir="${build.webapp}/WEB-INF/classes"
+ <javac destdir="${build.webapp}/WEB-INF/classes"
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
target="${target.vm}"
nowarn="${nowarn}"
source="1.4">
+ <src path="${java.dir}"/>
+ <src path="${build.src}"/>
<classpath refid="classpath"/>
</javac>
</target>
@@ -43,14 +45,15 @@
<target name="deprecation" depends="prepare-src"
description="Compile the sources with deprecation messages">
<mkdir dir="${build.webapp}/WEB-INF/classes"/>
- <javac srcdir="${build.src}"
- destdir="${build.webapp}/WEB-INF/classes"
+ <javac destdir="${build.webapp}/WEB-INF/classes"
debug="${debug}"
optimize="${optimize}"
deprecation="on"
target="${target.vm}"
nowarn="off"
source="1.4">
+ <src path="${java.dir}"/>
+ <src path="${build.src}"/>
<classpath refid="classpath"/>
</javac>
</target>
Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?view=diff&r1=158310&r2=158311
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Sat Mar 19 22:15:08 2005
@@ -100,14 +100,8 @@
<mkdir dir="${build.webapp}"/>
</target>
- <!-- Prepare the source code -->
+ <!-- Copy publication source code and libraries to ${build.src} -->
<target name="prepare-src" depends="prepare">
- <!-- Copy java source files from ${java.dir} to ${build.src} -->
- <copy todir="${build.src}" filtering="on">
- <fileset dir="${java.dir}">
- <exclude name="log4j-properties.xsl"/>
- </fileset>
- </copy>
<!-- FIXME: Use bulkCopy task in the future; needs regexp mapper which is part of ant optional package. -->
<!-- Copy java source files from ${pubs.root.dirs} to ${build.src} -->
Modified: lenya/trunk/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/webapp-build.xml?view=diff&r1=158310&r2=158311
==============================================================================
--- lenya/trunk/src/targets/webapp-build.xml (original)
+++ lenya/trunk/src/targets/webapp-build.xml Sat Mar 19 22:15:08 2005
@@ -41,13 +41,11 @@
<fileset dir="${src.webapp.dir}">
<exclude name="lenya/pubs/**"/>
<exclude name="WEB-INF/*-xconf.xsl"/>
- <exclude name="WEB-INF/*-xml.xsl"/>
</fileset>
</copy>
<!-- Copy publications -->
- <copyPubs todir="${build.webapp}/lenya/pubs" pubsrootdirs="${pubs.root.dirs}" excludes="CVS,.svn">
- </copyPubs>
+ <copyPubs todir="${build.webapp}/lenya/pubs" pubsrootdirs="${pubs.root.dirs}" excludes="CVS,.svn"/>
<!-- Patch cocoon.xconf -->
<copy file="${build.webapp}/WEB-INF/cocoon.xconf"
@@ -92,6 +90,9 @@
<fileset dir="${build.src}">
<include name="**/*.xsl"/>
</fileset>
+ <fileset dir="${java.dir}">
+ <include name="**/*.roles"/>
+ </fileset>
</copy>
<!-- now copy our properties -->
@@ -99,6 +100,9 @@
<fileset dir="${build.src}">
<include name="**/*.properties"/>
</fileset>
+ <fileset dir="${java.dir}">
+ <include name="**/*.roles"/>
+ </fileset>
</copy>
<!-- now copy our xml configuration files -->
@@ -106,11 +110,17 @@
<fileset dir="${build.src}">
<include name="**/*.xml"/>
</fileset>
+ <fileset dir="${java.dir}">
+ <include name="**/*.roles"/>
+ </fileset>
</copy>
<!-- now copy our roles -->
<copy todir="${build.webapp}/WEB-INF/classes">
<fileset dir="${build.src}">
+ <include name="**/*.roles"/>
+ </fileset>
+ <fileset dir="${java.dir}">
<include name="**/*.roles"/>
</fileset>
</copy>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org