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/06/22 01:06:54 UTC
svn commit: r416158 - in /lenya/trunk/src/targets: modules-build.xml
webapp-build.xml
Author: andreas
Date: Wed Jun 21 16:06:54 2006
New Revision: 416158
URL: http://svn.apache.org/viewvc?rev=416158&view=rev
Log:
Build process: copy&patch modules separately
Modified:
lenya/trunk/src/targets/modules-build.xml
lenya/trunk/src/targets/webapp-build.xml
Modified: lenya/trunk/src/targets/modules-build.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/modules-build.xml?rev=416158&r1=416157&r2=416158&view=diff
==============================================================================
--- lenya/trunk/src/targets/modules-build.xml (original)
+++ lenya/trunk/src/targets/modules-build.xml Wed Jun 21 16:06:54 2006
@@ -26,7 +26,8 @@
<property name="modules.root.dirs" value=""/>
<property name="build.modules" value="${build.webapp}/lenya/modules"/>
- <target name="compile-modules" depends="init-tasks">
+
+ <target name="deploy-modules" depends="init-tasks">
<generateModuleList
moduleDirs="${modules.root.dirs}"
moduleFile="${build.dir}/temp/modules.xml"/>
@@ -41,6 +42,7 @@
target="compile-modules"/>
</target>
+
<target name="copy-modules">
<!--
<copyPubs todir="${build.webapp}/lenya/modules"
@@ -85,9 +87,6 @@
</bulkCopy>
</target>
- <target name="deploy-modules"
- depends="init, copy-modules">
- </target>
<!-- ================================================ -->
<!-- Module tests -->
Modified: lenya/trunk/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/webapp-build.xml?rev=416158&r1=416157&r2=416158&view=diff
==============================================================================
--- lenya/trunk/src/targets/webapp-build.xml (original)
+++ lenya/trunk/src/targets/webapp-build.xml Wed Jun 21 16:06:54 2006
@@ -138,7 +138,9 @@
<param name="jar.name" value="impl"/>
</antcall>
+ <!--
<antcall target="deploy-modules"/>
+ -->
<!-- Patch sitemap.xmap -->
<xpatch file="${build.webapp}/sitemap.xmap"
@@ -158,7 +160,7 @@
excludes="prepare/*.xconf"
addComments="false"/>
- <antcall target="compile-modules"/>
+ <antcall target="deploy-modules"/>
<path id="classpath.pubs">
<path refid="classpath"/>
@@ -175,10 +177,6 @@
</antcall>
<!-- Patch lenya.roles -->
- <xpatch file="${build.dir}/impl/org/apache/lenya/lenya.roles"
- srcdir="${build.patch}/lenya-roles"
- includes="**/*.xroles"
- addComments="false"/>
<copy todir="${build.webapp}/WEB-INF/classes/org/apache/lenya"
file="${build.dir}/impl/org/apache/lenya/lenya.roles"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org