You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/04/18 20:03:30 UTC
svn commit: r935379 - /ofbiz/trunk/common.xml
Author: doogie
Date: Sun Apr 18 18:03:30 2010
New Revision: 935379
URL: http://svn.apache.org/viewvc?rev=935379&view=rev
Log:
Don't define a fileset; instead separately define the extra source
selector, and the dir to scan.
Modified:
ofbiz/trunk/common.xml
Modified: ofbiz/trunk/common.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.xml?rev=935379&r1=935378&r2=935379&view=diff
==============================================================================
--- ofbiz/trunk/common.xml (original)
+++ ofbiz/trunk/common.xml Sun Apr 18 18:03:30 2010
@@ -60,8 +60,8 @@ under the License.
<if>
<available file="${src.dir}"/>
<commands>
- <fileset id="src-extra-files" dir="${src.dir}">
- <or id="src-extra-set">
+ <selector id="src-extra-set">
+ <or>
<filename name="**/*.properties"/>
<filename name="**/*.groovy"/>
<filename name="**/*.xml"/>
@@ -73,10 +73,14 @@ under the License.
<filename name="**/*.py"/>
<filename name="META-INF/**"/>
</or>
- </fileset>
+ </selector>
+ <property name="src.extra.dir" value="${src.dir}"/>
</commands>
<else>
- <fileset id="src-extra-files" dir="." excludes="**"/>
+ <selector id="src-extra-set">
+ <filename name="**" negate="true"/>
+ </selector>
+ <property name="src.extra.dir" value="."/>
</else>
</if>
@@ -91,7 +95,9 @@ under the License.
<target name="jar" depends="classes">
<jar jarfile="${build.dir}/lib/${name}.jar">
<fileset dir="${build.dir}/classes"/>
- <fileset refid="src-extra-files"/>
+ <fileset dir="${src.extra.dir}">
+ <selector refid="src-extra-set"/>
+ </fileset>
<!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone -->
<zipfileset dir="${ofbiz.home.dir}" prefix="META-INF" includes="NOTICE,LICENSE"/>
</jar>