Fixed the build.xml files so that clean and cleanall actually removes the temporary...
authorlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Tue, 10 Oct 2006 23:01:42 +0000 (23:01 +0000)
committerlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Tue, 10 Oct 2006 23:01:42 +0000 (23:01 +0000)
git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@1715 de2fecce-e211-0410-80a6-f3fac2684e05

edk2/Tools/Java/Source/Common/build.xml
edk2/Tools/Java/Source/ContextTool/build.xml
edk2/Tools/Java/Source/Cpptasks/build.xml
edk2/Tools/Java/Source/FrameworkTasks/build.xml
edk2/Tools/Java/Source/FrameworkWizard/build.xml
edk2/Tools/Java/Source/GenBuild/build.xml
edk2/Tools/Java/Source/Merge/build.xml
edk2/Tools/Java/Source/MigrationTools/build.xml
edk2/Tools/Java/Source/PcdTools/build.xml
edk2/Tools/Java/Source/SurfaceArea/build.xml

index 4fd7285..376948c 100644 (file)
@@ -16,18 +16,34 @@ 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
     <delete file="${installLocation}/Common.jar"/>\r
     <if>\r
       <available file="${installLocation}/Common.jar"/>\r
@@ -37,6 +53,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
index 1356779..65f7545 100644 (file)
@@ -30,10 +30,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/ContextTool" includes="${buildDir}"/>\r
+    </delete>\r
   </target>\r
-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r
     <delete file="${installLocation}/ContextTool.jar"/>\r
     <if>\r
       <available file="${installLocation}/ContextTool.jar"/>\r
index 15eb959..971e7e7 100644 (file)
@@ -32,10 +32,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/Cpptasks" includes="${buildDir}"/>\r
+    </delete>\r
   </target>\r
-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r
     <delete file="${installLocation}/cpptasks.jar"/>\r
     <if>\r
       <available file="${installLocation}/cpptasks.jar"/>\r
index ac3639c..ad5d3f0 100644 (file)
@@ -28,10 +28,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/FrameworkTasks" includes="${buildDir}"/>\r
+    </delete>\r
   </target>\r
-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r
     <delete file="${installLocation}/frameworktasks.jar"/>\r
     <if>\r
       <available file="${installLocation}/frameworktasks.jar"/>\r
index b9fc0b4..c936930 100644 (file)
@@ -29,10 +29,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/FrameworkWizard" includes="${buildDir}"/>\r
+    </delete>\r
   </target>\r
-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r
     <delete file="${installLocation}/FrameworkWizard.jar"/>\r
   </target>\r
   <target name="install" depends="source">\r
index b61e251..d33cbeb 100644 (file)
@@ -31,10 +31,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/GenBuild" includes="${buildDir}"/>\r
+    </delete>\r
   </target>\r
-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r
     <delete file="${installLocation}/GenBuild.jar"/>\r
     <if>\r
       <available file="${installLocation}/GenBuild.jar"/>\r
index e6e8aa6..8b91fad 100644 (file)
@@ -28,10 +28,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/Merge" includes="${buildDir}"/>\r
+    </delete>\r
   </target>\r
-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r
     <delete file="${installLocation}/Merge.jar"/>\r
   </target>\r
   <target name="install" depends="source">\r
index 2406c03..10ca921 100644 (file)
@@ -29,10 +29,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/MigrationTools" includes="${buildDir}"/>\r
+    </delete>\r
   </target>\r
-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r
     <delete file="${installLocation}/MigrationTools.jar"/>\r
     <if>\r
       <available file="${installLocation}/MigrationTools.jar"/>\r
index c47032e..a8c7aa9 100644 (file)
@@ -30,10 +30,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+    <fileset dir="${WORKSPACE}/Tools/Java/Source/PcdTools" includes="${buildDir}"/>\r
+    </delete>\r
   </target>\r
-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r
     <delete file="${installLocation}/PcdTools.jar"/>\r
     <if>\r
       <available file="${installLocation}/PcdTools.jar"/>\r
index 5b0efdb..6931d81 100644 (file)
@@ -83,7 +83,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   \r
   <target name="SurfaceArea.java.clean">\r
     <delete includeemptydirs="true" failonerror="false">\r
-      <fileset dir="${WORKSPACE}/Tools/Java/Source/SurfaceArea/org" includes="**/*"/>\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/SurfaceArea" includes="org"/>\r
     </delete>\r
   </target>\r
 \r