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/09 02:03:37 UTC
svn commit: r156590 -
lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
Author: gregor
Date: Tue Mar 8 17:03:37 2005
New Revision: 156590
URL: http://svn.apache.org/viewcvs?view=rev&rev=156590
Log:
Made sure cocoon.xconf is only copied if it has changed. This resolves http://issues.apache.org/bugzilla/show_bug.cgi?id=33847
Modified:
lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
Modified: lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml?view=diff&r1=156589&r2=156590
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml Tue Mar 8 17:03:37 2005
@@ -84,11 +84,11 @@
property="${cocoon.xconf.md5}"
verifyProperty="cocoon.xconf.isEqual"/>
<condition property="cocoon.xconf.copy">
- <istrue value="${cocoon.xconf.isEqual}"/>
+ <isfalse value="${cocoon.xconf.isEqual}"/>
</condition>
<antcall target="copy-cocoon.xconf"/>
- <antcall target="delete-cocoon.xconf.ant_patch"/>
-
+ <delete file="${build.webapp}/WEB-INF/cocoon.xconf.ant_patch"/>
+
<!-- Patch web.xml -->
<!--
<echo>INFO: Patch web.xml</echo>
@@ -193,11 +193,6 @@
<copy
file="${build.webapp}/WEB-INF/cocoon.xconf.ant_patch"
toFile="${build.webapp}/WEB-INF/cocoon.xconf"/>
- </target>
- <!-- ... or delete patch file -->
- <target name="delete-cocoon.xconf.ant_patch" unless="cocoon.xconf.copy">
- <echo>INFO: Discard patched cocoon.xconf.</echo>
- <delete file="${build.webapp}/WEB-INF/cocoon.xconf.ant_patch"/>
</target>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org