You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/09/20 12:28:01 UTC
svn commit: r1626413 - in /ofbiz/trunk: build.xml tools/patch.exe
tools/todos.exe
Author: jleroux
Date: Sat Sep 20 10:28:01 2014
New Revision: 1626413
URL: http://svn.apache.org/r1626413
Log:
As suggested by Jacopo on dev ML, uses "svn patch" rather than patch.exe, much simpler and elegant, though needs an svn client installed, which seems a correct compromise.
Removed:
ofbiz/trunk/tools/patch.exe
ofbiz/trunk/tools/todos.exe
Modified:
ofbiz/trunk/build.xml
Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1626413&r1=1626412&r2=1626413&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sat Sep 20 10:28:01 2014
@@ -274,29 +274,13 @@ under the License.
<include name="*.patch"/>
</fileset>
</concat>
- <condition property="isWindows">
- <os family="windows"/>
- </condition>
<if>
<available file="${basedir}/runtime/patches/dev.patch"/>
<then>
- <if>
- <isset property="isWindows"/>
- <then>
- <echo message="Windows todos"/>
- <exec executable="${basedir}/tools/todos.exe" dir="${basedir}/runtime/patches/">
- <arg value="${basedir}/runtime/patches/dev.patch"/>
- </exec>
- <echo message="Windows patch"/>
- <exec executable="${basedir}/tools/patch.exe" dir="${basedir}">
- <arg value="-p0"/>
- <arg value="-i${basedir}\runtime\patches\dev.patch"/>
- </exec>
- </then>
- <else>
- <patch strip="0" patchfile="${basedir}/runtime/patches/dev.patch" dir="${basedir}"/>
- </else>
- </if>
+ <exec executable="svn" dir="${basedir}">
+ <arg value="patch"/>
+ <arg value="${basedir}\runtime\patches\dev.patch"/>
+ </exec>
<delete>
<fileset dir="${basedir}/runtime/patches" includes="dev.patch"/>
</delete>