Author: jleroux
Date: Fri Mar 18 21:57:27 2011
New Revision: 1083087
URL:
http://svn.apache.org/viewvc?rev=1083087&view=revLog:
* Remove "ofbiz-" from the component name, not really used anyway
* Allow to apply/reapply patches even when there are more than 3 patches in patches directory (it can be the case when you have other patches than those created with create-ofbiz-patches)
Note: the ant patch task will not work on Windows (diff in svn put Unix EOL into patch files), because there are no way to use the --binary parameter. So to have patches working in Windows you need to change their EOL to CR+LF (Eclipse, Notepad++ or Scite can do the trick)
Modified:
ofbiz/trunk/framework/resources/templates/build.xml
Modified: ofbiz/trunk/framework/resources/templates/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/templates/build.xml?rev=1083087&r1=1083086&r2=1083087&view=diff==============================================================================
--- ofbiz/trunk/framework/resources/templates/build.xml (original)
+++ ofbiz/trunk/framework/resources/templates/build.xml Fri Mar 18 21:57:27 2011
@@ -9,8 +9,8 @@
<property environment="env"/>
<property name="desc" value="@component-resource-name@ Component"/>
- <property name="name" value="ofbiz-@component-name@"/>
- <property name="component-name" value="ofbiz-@component-name@"/>
+ <property name="name" value="@component-name@"/>
+ <property name="component-name" value="@component-name@"/>
<property name="ofbiz.home.dir" value="../.."/>
<property name="src.dir" value="src"/>
<property name="dtd.dir" value="dtd"/>
@@ -76,7 +76,7 @@
<or>
<not><isset property="component-name"/></not>
<not>
- <resourcecount count="3">
+ <resourcecount count="3" when="gt">
<fileset dir="patches" includes="*.patch"/>
</resourcecount>
</not>
@@ -94,7 +94,7 @@
<or>
<not><isset property="component-name"/></not>
<not>
- <resourcecount count="3">
+ <resourcecount count="3" when="gt">
<fileset dir="patches" includes="*.patch"/>
</resourcecount>
</not>