You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/05/17 15:50:51 UTC
svn commit: r407257 - in /lenya/trunk/src/targets: compile-build.xml
properties-build.xml webapp-build.xml
Author: andreas
Date: Wed May 17 06:50:50 2006
New Revision: 407257
URL: http://svn.apache.org/viewcvs?rev=407257&view=rev
Log:
Improved build process: use specific classpath when compiling modules, pubs, and core implementation
Modified:
lenya/trunk/src/targets/compile-build.xml
lenya/trunk/src/targets/properties-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?rev=407257&r1=407256&r2=407257&view=diff
==============================================================================
--- lenya/trunk/src/targets/compile-build.xml (original)
+++ lenya/trunk/src/targets/compile-build.xml Wed May 17 06:50:50 2006
@@ -23,11 +23,14 @@
Compilation Targets
</description>
+ <!-- compile and package a specific source directory -->
<target name="compile-src">
<property name="compile.src.dir" value=""/>
<property name="compile.dest.dir" value=""/>
-
+ <property name="compile.classpath" value=""/>
+ <property name="jar.name" value=""/>
+
<!-- DEBUG classpath -->
<!--
<property name="classpath.compile" refid="classpath"/>
@@ -54,15 +57,9 @@
nowarn="${nowarn}"
source="1.4">
<src path="${compile.src.dir}"/>
- <classpath refid="classpath"/>
+ <classpath refid="${compile.classpath}"/>
</javac>
- </target>
-
- <!-- Generate and deploy JAR file -->
- <target name="package">
- <property name="compile.dest.dir" value=""/>
- <property name="jar.name" value=""/>
<jar jarfile="${build.webapp}/WEB-INF/lib/${fullname}-${jar.name}.jar" index="true">
<fileset dir="${compile.dest.dir}">
<exclude name="**/Manifest.mf"/>
Modified: lenya/trunk/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?rev=407257&r1=407256&r2=407257&view=diff
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Wed May 17 06:50:50 2006
@@ -133,7 +133,12 @@
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
+ <!--
<fileset dir="${build.webapp}/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ -->
+ <fileset dir="${cocoon.webapp.dir}/WEB-INF/lib">
<include name="*.jar"/>
</fileset>
<fileset dir="tools/jetty/lib">
Modified: lenya/trunk/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/webapp-build.xml?rev=407257&r1=407256&r2=407257&view=diff
==============================================================================
--- lenya/trunk/src/targets/webapp-build.xml (original)
+++ lenya/trunk/src/targets/webapp-build.xml Wed May 17 06:50:50 2006
@@ -119,15 +119,25 @@
<!-- compile and deploy API -->
<antcall target="compile-src">
- <param name="compile.name" value="api"/>
<param name="compile.src.dir" value="${src.java.api.dir}"/>
<param name="compile.dest.dir" value="${build.dir}/api"/>
- </antcall>
- <antcall target="package">
- <param name="compile.dest.dir" value="${build.dir}/api"/>
+ <param name="compile.classpath" refid="classpath"/>
<param name="jar.name" value="api"/>
</antcall>
+ <path id="classpath.impl">
+ <path refid="classpath"/>
+ <fileset dir="${build.webapp}/WEB-INF/lib" includes="lenya-*-api.jar"/>
+ </path>
+
+ <!-- compile core implementation -->
+ <antcall target="compile-src">
+ <param name="compile.src.dir" value="${src.java.impl.dir}"/>
+ <param name="compile.dest.dir" value="${build.dir}/impl"/>
+ <param name="compile.classpath" value="classpath.impl"/>
+ <param name="jar.name" value="impl"/>
+ </antcall>
+
<antcall target="deploy-modules"/>
<!-- Patch sitemap.xmap -->
@@ -147,33 +157,34 @@
includes="**/*.xconf"
excludes="prepare/*.xconf"
addComments="false"/>
+
+ <path id="classpath.modules">
+ <path refid="classpath"/>
+ <fileset dir="${build.webapp}/WEB-INF/lib" includes="lenya-*-api.jar"/>
+ </path>
<!-- compile and package modules -->
<antcall target="compile-src">
<param name="compile.src.dir" value="${build.dir}/java/modules"/>
<param name="compile.dest.dir" value="${build.dir}/modules"/>
- </antcall>
- <antcall target="package">
- <param name="compile.dest.dir" value="${build.dir}/modules"/>
+ <param name="compile.classpath" value="classpath.modules"/>
<param name="jar.name" value="modules"/>
</antcall>
+ <path id="classpath.pubs">
+ <path refid="classpath"/>
+ <fileset dir="${build.webapp}/WEB-INF/lib" includes="lenya-*-api.jar"/>
+ <fileset dir="${build.webapp}/WEB-INF/lib" includes="lenya-*-modules.jar"/>
+ </path>
+
<!-- compile and package publications -->
<antcall target="compile-src">
<param name="compile.src.dir" value="${build.dir}/java/pubs"/>
<param name="compile.dest.dir" value="${build.dir}/pubs"/>
- </antcall>
- <antcall target="package">
- <param name="compile.dest.dir" value="${build.dir}/pubs"/>
+ <param name="compile.classpath" value="classpath.pubs"/>
<param name="jar.name" value="pubs"/>
</antcall>
- <!-- compile core implementation -->
- <antcall target="compile-src">
- <param name="compile.src.dir" value="${src.java.impl.dir}"/>
- <param name="compile.dest.dir" value="${build.dir}/impl"/>
- </antcall>
-
<!-- Patch lenya.roles -->
<xpatch file="${build.dir}/impl/org/apache/lenya/lenya.roles"
srcdir="${build.patch}/lenya-roles"
@@ -182,12 +193,6 @@
<copy todir="${build.webapp}/WEB-INF/classes/org/apache/lenya"
file="${build.dir}/impl/org/apache/lenya/lenya.roles"/>
- <!-- deploy implementation -->
- <antcall target="package">
- <param name="compile.dest.dir" value="${build.dir}/impl"/>
- <param name="jar.name" value="impl"/>
- </antcall>
-
<!-- Copy database files to ${build.webapp}/WEB-INF/db -->
<copy todir="${build.webapp}/WEB-INF/db">
<fileset dir="${src.database.dir}">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org