To be honest: I also learned about "svn patch" only a few weeks ago... I don't know if it is a new feature or if it was just there since long.
Jacopo On Sep 20, 2014, at 12:23 PM, Jacques Le Roux <[email protected]> wrote: > Thanks Jacopo, > > You know what? I did not notice svn has a patch option :/ > This is indeed an acceptable compromise. I will change for your solution. > > Jacques > > > Le 20/09/2014 05:47, Jacopo Cappellato a écrit : >> Jacques, >> >> why not using the svn command line tool for the application of patches? At >> least it has the same syntax in all the platforms. Requiring the presence of >> the "svn" client in the path is, in my opinion, a decent compromise: >> >> svn patch dev.patch >> >> This will help to remove much of the clutter that I see in these new tasks. >> >> Jacopo >> >> On Sep 19, 2014, at 8:34 PM, [email protected] wrote: >> >>> Author: jleroux >>> Date: Fri Sep 19 18:34:45 2014 >>> New Revision: 1626291 >>> >>> URL: http://svn.apache.org/r1626291 >>> Log: >>> Fixes a typo in previous commit, better indent and place of delete task >>> >>> Modified: >>> ofbiz/trunk/build.xml >>> >>> Modified: ofbiz/trunk/build.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1626291&r1=1626290&r2=1626291&view=diff >>> ============================================================================== >>> --- ofbiz/trunk/build.xml (original) >>> +++ ofbiz/trunk/build.xml Fri Sep 19 18:34:45 2014 >>> @@ -266,42 +266,42 @@ under the License. >>> >>> >>> <target name="build-dev" >>> - description="Patch sources in a dev environment if patch files are >>> present in runtime/patches.> >>> - <!-- patch task can't handle a fileset => create a global patch --> >>> - <concat destfile="${basedir}/runtime/patches/dev.patch" >>> encoding="UTF-8" outputencoding="UTF-8"> >>> - <fileset dir="${basedir}/runtime/patches" casesensitive="no"> >>> - <exclude name="dev.patch"/> <!-- exclude the patch itself in >>> case it's still there --> >>> - <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> >>> - </then> >>> + description="Patch sources in a dev environment if patch files are >>> present in runtime/patches."> >>> + <!-- patch task can't handle a fileset => create a global patch --> >>> + <concat destfile="${basedir}/runtime/patches/dev.patch" >>> encoding="UTF-8" outputencoding="UTF-8"> >>> + <fileset dir="${basedir}/runtime/patches" casesensitive="no"> >>> + <exclude name="dev.patch"/> <!-- exclude the patch itself in >>> case it's still there --> >>> + <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> >>> <delete> >>> <fileset dir="${basedir}/runtime/patches" includes="dev.patch"/> >>> </delete> >>> - </if> >>> + </then> >>> + </if> >>> </target> >>> >>> <target name="build-test" >>> >>> >> >> >
