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 04:09:55 UTC
svn commit: r158283 - in lenya/trunk: src/targets/ tools/anttasks/org/
tools/anttasks/org/apache/ tools/anttasks/org/apache/lenya/
tools/anttasks/org/apache/lenya/cms/ tools/anttasks/org/apache/lenya/cms/ant/
Author: gregor
Date: Sat Mar 19 19:09:54 2005
New Revision: 158283
URL: http://svn.apache.org/viewcvs?view=rev&rev=158283
Log:
Switched build to precompiled ant tasks. This shaves another unnecessary 3 seconds off the build.
Added:
lenya/trunk/tools/anttasks/org/
lenya/trunk/tools/anttasks/org/apache/
lenya/trunk/tools/anttasks/org/apache/lenya/
lenya/trunk/tools/anttasks/org/apache/lenya/cms/
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/BulkCopyTask.class (with props)
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class (with props)
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyTask.class (with props)
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/JavaFilenameFilter.class (with props)
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/SCMFilenameFilter.class (with props)
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/TwoTuple.class (with props)
Modified:
lenya/trunk/src/targets/ide-build.xml
lenya/trunk/src/targets/init-build.xml
lenya/trunk/src/targets/properties-build.xml
lenya/trunk/src/targets/test-build.xml
Modified: lenya/trunk/src/targets/ide-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/ide-build.xml?view=diff&r1=158282&r2=158283
==============================================================================
--- lenya/trunk/src/targets/ide-build.xml (original)
+++ lenya/trunk/src/targets/ide-build.xml Sat Mar 19 19:09:54 2005
@@ -107,14 +107,8 @@
</target>
<!-- Prepares the webapp to make it directly usable with the eclipse project -->
- <target name="eclipse-webapp-prepare" depends="eclipse-webapp-delete-jars, eclipse-webapp-restore-roles"
+ <target name="eclipse-webapp-prepare" depends="eclipse-webapp-delete-jars"
description="Prepares the webapp directory to make it usable within Eclipse"/>
-
- <target name="eclipse-webapp-restore-roles" depends="prepare">
- <copy file="${build.dest}/org/apache/cocoon/cocoon.roles"
- tofile="${build.webapp}/WEB-INF/classes/org/apache/cocoon/cocoon.roles"
- overwrite="yes"/>
- </target>
<target name="eclipse-webapp-delete-jars" depends="prepare">
<!-- delete all jars and class files, they are already included in the project -->
Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?view=diff&r1=158282&r2=158283
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Sat Mar 19 19:09:54 2005
@@ -38,24 +38,6 @@
<property name="snapshot.src.dir" value="${dist.root}/${snapshot.src.name}"/>
</target>
- <!-- Build ant tasks used during the Lenya build -->
- <target name="build-custom-tasks" depends="init">
- <javac srcdir="${tools.tasks.dest}"
- destdir="${tools.tasks.dest}"
- debug="${debug}"
- optimize="{optimize}"
- deprecation="${deprecation}"
- target="${target.vm}"
- nowarn="${nowarn}"
- classpathref="classpath"
- source="1.4"/>
-
- <taskdef name="copyJavaSources" classpath="${tools.tasks.dest}" classname="org.apache.lenya.cms.ant.CopyJavaSourcesTask"/>
- <taskdef name="bulkCopy" classpath="${tools.tasks.dest}" classname="org.apache.lenya.cms.ant.BulkCopyTask"/>
- <taskdef name="copyPubs" classpath="${tools.tasks.dest}" classname="org.apache.lenya.cms.ant.CopyTask"/>
- <taskdef name="xpatch" classname="XConfToolTask" classpath="${tools.tasks.dest}"/>
- </target>
-
<!-- Prepare the build webapp directory -->
<target name="check-cocoon" depends="init" unless="gump.skipcocoonbuild">
<echo>Check if Cocoon has been built: ${cocoon.src.dir}/build/webapp</echo>
@@ -73,7 +55,6 @@
<!-- Copy the bulk of the cocoon webapp to our destination -->
<target name="prepare-cocoon" depends="check-cocoon" unless="gump.skipcocoonbuild">
- <taskdef name="xpatch" classname="XConfToolTask" classpath="${tools.tasks.dest}"/>
<copy todir="${build.webapp}" filtering="off">
<fileset dir="${cocoon.webapp.dir}">
<exclude name="*.xml"/>
@@ -120,8 +101,8 @@
</target>
<!-- Prepare the source code -->
- <target name="prepare-src" depends="prepare, build-custom-tasks">
- <!-- Copy java source files from ${java.dir} 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"/>
Modified: lenya/trunk/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?view=diff&r1=158282&r2=158283
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Sat Mar 19 19:09:54 2005
@@ -66,8 +66,6 @@
<property name="build.src" value="${build.dir}/src"/>
<!-- Destination for temporary files during the build -->
<property name="build.temp" value="${build.dir}/temp"/>
- <!-- Destination for the class files of the "compile" target -->
- <property name="build.dest" value="${build.dir}/classes"/>
<!-- This is where we assemble the webapp directory in the "webapp" task -->
<property name="build.webapp" value="${build.dir}/webapp"/>
<!-- This is where we do the tests -->
@@ -110,6 +108,12 @@
<property name="src.cocoon.properties.dir" value="src/cocoon"/>
<!-- hsqldb database config files directory -->
<property name="src.database.dir" value="src/webapp/WEB-INF/db"/>
+
+ <!-- Custom Ant tasks used for building Lenya -->
+ <taskdef name="copyJavaSources" classpath="${tools.tasks.dest}" classname="org.apache.lenya.cms.ant.CopyJavaSourcesTask"/>
+ <taskdef name="bulkCopy" classpath="${tools.tasks.dest}" classname="org.apache.lenya.cms.ant.BulkCopyTask"/>
+ <taskdef name="copyPubs" classpath="${tools.tasks.dest}" classname="org.apache.lenya.cms.ant.CopyTask"/>
+ <taskdef name="xpatch" classpath="${tools.tasks.dest}" classname="XConfToolTask"/>
<!-- Set up classpath -->
<path id="classpath">
Modified: lenya/trunk/src/targets/test-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/test-build.xml?view=diff&r1=158282&r2=158283
==============================================================================
--- lenya/trunk/src/targets/test-build.xml (original)
+++ lenya/trunk/src/targets/test-build.xml Sat Mar 19 19:09:54 2005
@@ -57,7 +57,7 @@
</target>
<!-- prepares the tests. -->
- <target name="tests.prepare" depends="build-custom-tasks">
+ <target name="tests.prepare">
<mkdir dir="${build.test}"/>
<!-- Copy test files to build test dir -->
Added: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/BulkCopyTask.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/BulkCopyTask.class?view=auto&rev=158283
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/BulkCopyTask.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class?view=auto&rev=158283
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyTask.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyTask.class?view=auto&rev=158283
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyTask.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/JavaFilenameFilter.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/JavaFilenameFilter.class?view=auto&rev=158283
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/JavaFilenameFilter.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/SCMFilenameFilter.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/SCMFilenameFilter.class?view=auto&rev=158283
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/SCMFilenameFilter.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/TwoTuple.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/TwoTuple.class?view=auto&rev=158283
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/TwoTuple.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org