svn commit: r672686 - /ofbiz/trunk/framework/base/build.xml

[do...@apache.org]

Author: doogie
Date: Sun Jun 29 17:52:30 2008
New Revision: 672686

URL: http://svn.apache.org/viewvc?rev=672686&view=rev
Log:
Revert previous change to just this file; some issue with the version
of log4j being compiled against.

Modified:
    ofbiz/trunk/framework/base/build.xml

Modified: ofbiz/trunk/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=672686&r1=672685&r2=672686&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/base/build.xml Sun Jun 29 17:52:30 2008
@@ -19,21 +19,42 @@
 -->
 
 <project name="OFBiz - Base" default="jar" basedir=".">
-    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <property name="name" value="ofbiz-base"/>
-    <property name="ofbiz.home.dir" value="../.."/>
+    <target name="init">                
+        <property environment="env"/>
+        <property name="name" value="ofbiz-base"/>
+        <property name="ofbiz.home.dir" value="../.."/>
+        <property name="src.dir" value="src"/>
+        <property name="dtd.dir" value="dtd"/>
+        <property name="lib.dir" value="lib"/>
+        <property name="build.dir" value="build"/>        
+    </target>
+    
+    <target name="classpath">		        
+        <path id="local.class.path">
+            <fileset dir="${lib.dir}" includes="*.jar"/>
+            <fileset dir="${lib.dir}/commons" includes="*.jar"/>
+            <fileset dir="${lib.dir}/j2eespecs" includes="*.jar"/>
+            <fileset dir="${lib.dir}/scripting" includes="*.jar"/>
+        </path>
+    </target>
+    
+    <!-- ================================================================== -->
+    <!-- Removes all created files and directories                          -->
+    <!-- ================================================================== -->
 
-    <path id="local.class.path">
-        <fileset dir="${lib.dir}" includes="*.jar"/>
-        <fileset dir="${lib.dir}/commons" includes="*.jar"/>
-        <fileset dir="${lib.dir}/j2eespecs" includes="*.jar"/>
-        <fileset dir="${lib.dir}/scripting" includes="*.jar"/>
-    </path>
+    <target name="clean" depends="clean-lib">
+        <delete dir="${build.dir}"/>
+        <delete file="../../ofbiz.jar"/>
+    </target>
+
+    <target name="clean-lib" depends="init">
+        <delete dir="${build.dir}/lib"/>        
+    </target>
     
     <!-- ================================================================== -->
     <!-- Makes sure the needed directory structure is in place              -->
@@ -46,15 +67,20 @@
         <mkdir dir="${build.dir}/lib"/>
     </target>
     
+    <target name="prepare-docs" depends="init">
+        <mkdir dir="${build.dir}/javadocs"/>        
+    </target>
+    
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                    -->
     <!-- ================================================================== -->               
 
-    <target name="classes" depends="prepare">
+    <target name="classes" depends="prepare,classpath">
         <!-- compile start -->
-    	<javac15 destdir="${build.dir}/classes/start" classpathref="local.class.path">
+    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes/start">
+            <compilerarg value="-Xlint:unchecked"/>
             <src path="${src.dir}/start"/>
-        </javac15>
+        </javac>
         <copy todir="${build.dir}/classes/start">
           <fileset dir="${src.dir}/start" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </copy>
@@ -67,7 +93,7 @@
         </condition>
 
         <!-- compile base -->
-    	<javac15 destdir="${build.dir}/classes/base">            
+    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes/base">            
             <classpath>
                 <path refid="local.class.path"/>
                 <pathelement path="${build.dir}/classes/start"/>
@@ -75,7 +101,7 @@
             <src path="${src.dir}/base"/>
             <exclude name="${exclude.crypto}"/>
             <exclude name="org/ofbiz/base/util/OfbizJsBsfEngine.java"/>
-        </javac15>
+        </javac>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes/base">
             <fileset dir="${dtd.dir}" includes="*.dtd"/>
@@ -104,7 +130,7 @@
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs">
+    <target name="docs" depends="prepare-docs,classpath">
         <javadoc packagenames="org.ofbiz.base.*" 
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs" 
@@ -113,4 +139,6 @@
             <sourcepath path="${src.dir}/base"/>            
         </javadoc>
     </target>
+    
+    <target name="all" depends="jar,docs"/>   
 </project>