Author: doogie
Date: Sat Dec 26 22:20:32 2009
New Revision: 894028
URL: http://svn.apache.org/viewvc?rev=894028&view=rev
Log:
Make use of the init target, to set excludes based on available
libraries, so that the common classes target can be used. This also
sets src.exc.set correctly.
Modified:
ofbiz/trunk/applications/accounting/build.xml
ofbiz/trunk/applications/product/build.xml
ofbiz/trunk/applications/securityext/build.xml
ofbiz/trunk/framework/base/build.xml
Modified: ofbiz/trunk/applications/accounting/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/build.xml?rev=894028&r1=894027&r2=894028&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/build.xml (original)
+++ ofbiz/trunk/applications/accounting/build.xml Sat Dec 26 22:20:32 2009
@@ -51,18 +51,14 @@
<fileset dir="lib" includes="*.jar"/>
</path>
- <!-- ================================================================== -->
- <!-- Compilation of the source files
-->
- <!-- ================================================================== -->
-
- <target name="classes" depends="prepare">
- <javac16>
+ <target name="init">
+ <patternset id="src.exc.set">
<!-- exclude the payment processor packages; comment this out to
not exclude if you have libs -->
<exclude name="org/ofbiz/accounting/thirdparty/verisign/**"/>
<exclude name="org/ofbiz/accounting/thirdparty/cybersource/**"/>
<exclude
name="org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java"/>
<exclude name="org/ofbiz/accounting/thirdparty/orbital/**"/>
- </javac16>
+ </patternset>
</target>
<!-- ================================================================== -->
Modified: ofbiz/trunk/applications/product/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/build.xml?rev=894028&r1=894027&r2=894028&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/build.xml (original)
+++ ofbiz/trunk/applications/product/build.xml Sat Dec 26 22:20:32 2009
@@ -49,11 +49,7 @@
<fileset dir="../party/build/lib" includes="*.jar"/>
</path>
- <!-- ================================================================== -->
- <!-- Compilation of the source files
-->
- <!-- ================================================================== -->
-
- <target name="classes" depends="prepare">
+ <target name="init">
<!-- check for applet required classes -->
<condition property="noapplet" value="ShipmentScaleApplet.java">
<not>
@@ -64,9 +60,9 @@
</not>
</condition>
- <javac16>
+ <patternset id="src.exc.set">
<exclude name="${noapplet}"/>
- </javac16>
+ </patternset>
</target>
<!-- ================================================================== -->
Modified: ofbiz/trunk/applications/securityext/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/build.xml?rev=894028&r1=894027&r2=894028&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/build.xml (original)
+++ ofbiz/trunk/applications/securityext/build.xml Sat Dec 26 22:20:32 2009
@@ -48,15 +48,11 @@
<fileset dir="../order/build/lib" includes="*.jar"/>
</path>
- <!-- ================================================================== -->
- <!-- Compilation of the source files
-->
- <!-- ================================================================== -->
-
- <target name="classes" depends="prepare">
- <javac16>
+ <target name="init">
+ <patternset id="src.exc.set">
<!-- exclude the Truition; comment if you have libs -->
<exclude name="org/ofbiz/securityext/thirdparty/truition/**"/>
- </javac16>
+ </patternset>
</target>
<!-- ================================================================== -->
Modified: ofbiz/trunk/framework/base/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=894028&r1=894027&r2=894028&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/base/build.xml Sat Dec 26 22:20:32 2009
@@ -42,11 +42,7 @@
<file name="org/ofbiz/base/util/collections/test/GenericMapTest.java"/>
</filelist>
- <!-- ================================================================== -->
- <!-- Compilation of the source files -->
- <!-- ================================================================== -->
-
- <target name="classes" depends="prepare">
+ <target name="init">
<!-- make sure we have crypto packages available -->
<condition property="exclude.crypto" value="org/ofbiz/base/crypto/**">
<not>
@@ -58,13 +54,11 @@
<available
classname="net.sourceforge.cobertura.instrument.ClassInstrumenter"
classpathref="local.class.path"/>
</not>
</condition>
-
- <!-- compile base -->
- <javac16 destdir="${build.dir}/classes" srcdir="${src.dir}">
+ <patternset id="src.exc.set">
<exclude name="${exclude.cobertura}"/>
<exclude name="${exclude.crypto}"/>
<exclude name="org/ofbiz/base/util/OfbizJsBsfEngine.java"/>
- </javac16>
+ </patternset>
</target>
<target name="jar" depends="classes">
