You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/03/09 23:53:30 UTC
svn commit: r156702 - in lenya/branches/BRANCH_1_2_X/src/targets:
compile-build.xml dist-build.xml init-build.xml
Author: michi
Date: Wed Mar 9 14:53:25 2005
New Revision: 156702
URL: http://svn.apache.org/viewcvs?view=rev&rev=156702
Log:
separated the anttasks building from the rest of the source such that patches can be applied without breaking the build process during the anttask target
Modified:
lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml
lenya/branches/BRANCH_1_2_X/src/targets/dist-build.xml
lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
Modified: lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml?view=diff&r1=156701&r2=156702
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml Wed Mar 9 14:53:25 2005
@@ -26,8 +26,7 @@
<!-- ============================================================ -->
<!-- The main compilation target -->
<!-- ============================================================ -->
- <target name="compile" depends="prepare-src"
- description="Compile the sources">
+ <target name="compile" depends="prepare-src" description="Compile the sources">
<mkdir dir="${build.dest}"/>
<javac srcdir="${build.src}"
destdir="${build.dest}"
@@ -47,8 +46,7 @@
<!-- ============================================================ -->
<!-- The compilation target with deprecation on -->
<!-- ============================================================ -->
- <target name="deprecation" depends="prepare-src"
- description="Compile the sources with deprecation messages">
+ <target name="deprecation" depends="prepare-src" description="Compile the sources with deprecation messages">
<delete dir="${build.dest}"/>
<mkdir dir="${build.dest}"/>
<javac srcdir="${build.src}"
Modified: lenya/branches/BRANCH_1_2_X/src/targets/dist-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/dist-build.xml?view=diff&r1=156701&r2=156702
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/dist-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/dist-build.xml Wed Mar 9 14:53:25 2005
@@ -52,7 +52,7 @@
</copy>
<delete dir="${dist.bin.dir}/tools/anttasks"/>
- <!-- Make executable -->
+ <!-- Make executable -->
<chmod file="${dist.bin.dir}/*.sh" perm="ugo+rx"/>
</target>
Modified: lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml?view=diff&r1=156701&r2=156702
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml Wed Mar 9 14:53:25 2005
@@ -60,21 +60,25 @@
<target name="build-custom-tasks" depends="init">
<echo>INFO: Building Custom Tasks</echo>
- <mkdir dir="${build.dir}/tools/anttasks"/>
- <javac srcdir="src/java"
- destdir="${build.dir}/tools/anttasks"
+ <echo>INFO: Copy java source files from ${java.dir} to ${build.src}</echo>
+ <copy todir="${build.src}-tools" filtering="on">
+ <fileset dir="${java.dir}" includes="org/apache/lenya/cms/ant/CopyJavaSourcesTask.java, org/apache/lenya/cms/ant/BulkCopyTask.java, org/apache/lenya/cms/ant/CopyTask.java, org/apache/lenya/cms/ant/TwoTuple.java, org/apache/lenya/cms/ant/SCMFilenameFilter.java, org/apache/lenya/cms/ant/JavaFilenameFilter.java"/>
+ </copy>
+
+ <mkdir dir="${build.dir}/${tools.tasks.dest}"/>
+ <javac srcdir="${build.src}-tools"
+ destdir="${build.dir}/${tools.tasks.dest}"
debug="${debug}"
optimize="{optimize}"
deprecation="${deprecation}"
target="${target.vm}"
nowarn="${nowarn}"
- includes="org/apache/lenya/cms/ant/**"
classpathref="classpath"
source="${target.vm}"/>
- <taskdef name="copyJavaSources" classpath="${build.dir}/tools/anttasks" classname="org.apache.lenya.cms.ant.CopyJavaSourcesTask"/>
- <taskdef name="bulkCopy" classpath="${build.dir}/tools/anttasks" classname="org.apache.lenya.cms.ant.BulkCopyTask"/>
- <taskdef name="copyPubs" classpath="${build.dir}/tools/anttasks" classname="org.apache.lenya.cms.ant.CopyTask"/>
+ <taskdef name="copyJavaSources" classpath="${build.dir}/${tools.tasks.dest}" classname="org.apache.lenya.cms.ant.CopyJavaSourcesTask"/>
+ <taskdef name="bulkCopy" classpath="${build.dir}/${tools.tasks.dest}" classname="org.apache.lenya.cms.ant.BulkCopyTask"/>
+ <taskdef name="copyPubs" classpath="${build.dir}/${tools.tasks.dest}" classname="org.apache.lenya.cms.ant.CopyTask"/>
<taskdef name="xpatch" classname="XConfToolTask" classpath="${cocoon.src.dir}/tools/anttasks"/>
</target>
@@ -146,7 +150,7 @@
<!-- patch lucene -->
<available file="${src.webapp.dir}/WEB-INF/lib/lucene-1.4.1.jar" type="file" property="lenya.lucene.patch.exists"/>
- <echo>${src.webapp.dir}/WEB-INF/lib/lucene**.jar</echo>
+ <echo>INFO: Check if Lucene shall be patched: ${src.webapp.dir}/WEB-INF/lib/lucene**.jar</echo>
<antcall target="patch-lucene"/>
<antcall target="do-not-patch-lucene"/>
@@ -161,7 +165,10 @@
<!-- copy the bulk of the cocoon webapp to our destination -->
<!-- ============================================================ -->
<target name="prepare" depends="prepare-cocoon">
+ <echo>INFO: Create build directory ${build.dir}</echo>
<mkdir dir="${build.dir}"/>
+
+ <echo>INFO: Create webapp directory ${build.webapp}</echo>
<mkdir dir="${build.webapp}"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org