Standardized property name WORKSPACE and fixed cleanall messages.

[mirror_edk2.git] / Tools / Java / Source / Common / build.xml

diff --git a/Tools/Java/Source/Common/build.xml b/Tools/Java/Source/Common/build.xml
index 4fd7285f01b2812983bd1121868b9afcccf08c18..f75db2fb712a3e1a7284fae80f0ba65d063b1c66 100644 (file)
--- a/Tools/Java/Source/Common/build.xml
+++ b/Tools/Java/Source/Common/build.xml
@@ -16,18 +16,35 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>\r
+\r
+  <path id="classpath">\r
+    <fileset dir="${WORKSPACE}/Tools/Jars">\r
+      <include name="SurfaceArea.jar"/>\r
+    </fileset>\r
+    <fileset dir="${env.XMLBEANS_HOME}/lib">\r
+      <include name="*.jar"/>\r
+    </fileset>\r
+    <pathelement path="${env.CLASSPATH}"/>\r
+  </path>\r
+\r
   <target name="Common_Jar" depends="install"/>\r
+\r
   <target name="source">\r
     <mkdir dir="${buildDir}"/>\r
     <javac srcdir="." destdir="${buildDir}">\r
+      <classpath refid="classpath"/>\r
       <compilerarg value="-Xlint"/>\r
     </javac>\r
   </target>\r
+\r
   <target name="clean">\r
-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/Common" includes="${buildDir}"/>\r
+    </delete>\r
   </target>\r
-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+\r
+  <target name="cleanall" depends="clean">\r
+    <echo message="Removing Class Files and the Java Archive: Common.jar"/>\r
     <delete file="${installLocation}/Common.jar"/>\r
     <if>\r
       <available file="${installLocation}/Common.jar"/>\r
@@ -37,6 +54,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </then>\r
     </if>\r
   </target>\r
+\r
   <target name="install" depends="source">\r
     <jar destfile="${installLocation}/Common.jar"\r
       basedir="${buildDir}"\r