From d7bb51136bec52eb92898b15891e2499dfa6821b Mon Sep 17 00:00:00 2001
From: lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 11 Oct 2006 16:40:33 +0000
Subject: Standardized property name WORKSPACE and fixed cleanall messages.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1725 6f19259b-4bc3-4df7-8a09-765794883524
---
 Tools/Java/Source/Common/build.xml          | 1 +
 Tools/Java/Source/ContextTool/build.xml     | 1 +
 Tools/Java/Source/Cpptasks/build.xml        | 9 +++++----
 Tools/Java/Source/FrameworkTasks/build.xml  | 7 ++++---
 Tools/Java/Source/FrameworkWizard/build.xml | 1 +
 Tools/Java/Source/GenBuild/build.xml        | 1 +
 Tools/Java/Source/Merge/build.xml           | 1 +
 Tools/Java/Source/MigrationTools/build.xml  | 1 +
 Tools/Java/Source/PcdTools/build.xml        | 1 +
 Tools/Java/Source/SurfaceArea/build.xml     | 1 +
 10 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'Tools/Java')

diff --git a/Tools/Java/Source/Common/build.xml b/Tools/Java/Source/Common/build.xml
index 376948c465..f75db2fb71 100644
--- a/Tools/Java/Source/Common/build.xml
+++ b/Tools/Java/Source/Common/build.xml
@@ -44,6 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>
 
   <target name="cleanall" depends="clean">
+    <echo message="Removing Class Files and the Java Archive: Common.jar"/>
     <delete file="${installLocation}/Common.jar"/>
     <if>
       <available file="${installLocation}/Common.jar"/>
diff --git a/Tools/Java/Source/ContextTool/build.xml b/Tools/Java/Source/ContextTool/build.xml
index 65f75456f7..3779dbe257 100644
--- a/Tools/Java/Source/ContextTool/build.xml
+++ b/Tools/Java/Source/ContextTool/build.xml
@@ -35,6 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>
   </target>
   <target name="cleanall" depends="clean">
+    <echo message="Removing Class Files and the Java Archive: ContextTool.jar"/>
     <delete file="${installLocation}/ContextTool.jar"/>
     <if>
       <available file="${installLocation}/ContextTool.jar"/>
diff --git a/Tools/Java/Source/Cpptasks/build.xml b/Tools/Java/Source/Cpptasks/build.xml
index 971e7e774c..ce040e6ac7 100644
--- a/Tools/Java/Source/Cpptasks/build.xml
+++ b/Tools/Java/Source/Cpptasks/build.xml
@@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 <project name="CppTasks" default="CppTasks" basedir=".">
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
   <property environment="env"/>
-  <property name="workspace" value="${env.WORKSPACE}"/>
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>
   <property name="buildDir" value="build"/>
-  <property name="installLocation" value="${workspace}/Tools/Jars"/>
+  <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>
   <target name="CppTasks" depends="install"/>
   <target name="init">
     <uptodate property="jar.newer" targetfile="${installLocation}/cpptasks.jar">
@@ -25,18 +25,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <mkdir dir="${buildDir}"/>
     <javac srcdir="net" destdir="${buildDir}" source="1.4">
       <classpath>
-        <fileset dir="${workspace}/Tools/Jars">
+        <fileset dir="${WORKSPACE}/Tools/Jars">
           <include name="*.jar"/>
         </fileset>
       </classpath>
     </javac>
   </target>
   <target name="clean">
-    <delete includeemptydirs="true" failonerror="false">
+    <delete includeemptydirs="true" failonerror="false" quiet="true">
       <fileset dir="${WORKSPACE}/Tools/Java/Source/Cpptasks" includes="${buildDir}"/>
     </delete>
   </target>
   <target name="cleanall" depends="clean">
+    <echo message="Removing Class Files and the Java Archive: cpptasks.jar"/>
     <delete file="${installLocation}/cpptasks.jar"/>
     <if>
       <available file="${installLocation}/cpptasks.jar"/>
diff --git a/Tools/Java/Source/FrameworkTasks/build.xml b/Tools/Java/Source/FrameworkTasks/build.xml
index ad5d3f0ff9..c3c86c987c 100644
--- a/Tools/Java/Source/FrameworkTasks/build.xml
+++ b/Tools/Java/Source/FrameworkTasks/build.xml
@@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 <project name="FrameworkTasks" default="FrameworkTasks">
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
   <property environment="env"/>
-  <property name="workspace" value="${env.WORKSPACE}"/>
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>
   <property name="buildDir" value="build"/>
-  <property name="installLocation" value="${workspace}/Tools/Jars"/>
+  <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>
   <target name="FrameworkTasks" depends="install"/>
   <target name="source">
     <mkdir dir="${buildDir}"/>
     <javac srcdir="." destdir="${buildDir}">
       <classpath>
-        <fileset dir="${workspace}/Tools/Jars">
+        <fileset dir="${WORKSPACE}/Tools/Jars">
           <include name="*.jar"/>
         </fileset>
       </classpath>
@@ -33,6 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>
   </target>
   <target name="cleanall" depends="clean">
+    <echo message="Removing Class Files and the Java Archive: frameworktasks.jar"/>
     <delete file="${installLocation}/frameworktasks.jar"/>
     <if>
       <available file="${installLocation}/frameworktasks.jar"/>
diff --git a/Tools/Java/Source/FrameworkWizard/build.xml b/Tools/Java/Source/FrameworkWizard/build.xml
index c936930254..5c71edbd19 100644
--- a/Tools/Java/Source/FrameworkWizard/build.xml
+++ b/Tools/Java/Source/FrameworkWizard/build.xml
@@ -34,6 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>
   </target>
   <target name="cleanall" depends="clean">
+    <echo message="Removing Class Files and the Java Archive: FrameworkWizard.jar"/>
     <delete file="${installLocation}/FrameworkWizard.jar"/>
   </target>
   <target name="install" depends="source">
diff --git a/Tools/Java/Source/GenBuild/build.xml b/Tools/Java/Source/GenBuild/build.xml
index d33cbebde0..2f9476f4bd 100644
--- a/Tools/Java/Source/GenBuild/build.xml
+++ b/Tools/Java/Source/GenBuild/build.xml
@@ -36,6 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>
   </target>
   <target name="cleanall" depends="clean">
+    <echo message="Removing Class Files and the Java Archive: GenBuild.jar"/>
     <delete file="${installLocation}/GenBuild.jar"/>
     <if>
       <available file="${installLocation}/GenBuild.jar"/>
diff --git a/Tools/Java/Source/Merge/build.xml b/Tools/Java/Source/Merge/build.xml
index 8b91fad7cd..709c9e8fe9 100644
--- a/Tools/Java/Source/Merge/build.xml
+++ b/Tools/Java/Source/Merge/build.xml
@@ -33,6 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>
   </target>
   <target name="cleanall" depends="clean">
+    <echo message="Removing Class Files and the Java Archive: Merge.jar"/>
     <delete file="${installLocation}/Merge.jar"/>
   </target>
   <target name="install" depends="source">
diff --git a/Tools/Java/Source/MigrationTools/build.xml b/Tools/Java/Source/MigrationTools/build.xml
index 10ca9215c8..ddb4979ea9 100644
--- a/Tools/Java/Source/MigrationTools/build.xml
+++ b/Tools/Java/Source/MigrationTools/build.xml
@@ -34,6 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>
   </target>
   <target name="cleanall" depends="clean">
+    <echo message="Removing Class Files and the Java Archive: MigrationTools.jar"/>
     <delete file="${installLocation}/MigrationTools.jar"/>
     <if>
       <available file="${installLocation}/MigrationTools.jar"/>
diff --git a/Tools/Java/Source/PcdTools/build.xml b/Tools/Java/Source/PcdTools/build.xml
index a8c7aa959f..4db07e0cf4 100644
--- a/Tools/Java/Source/PcdTools/build.xml
+++ b/Tools/Java/Source/PcdTools/build.xml
@@ -35,6 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>
   </target>
   <target name="cleanall" depends="clean">
+    <echo message="Removing Class Files and the Java Archive: PcdTools.jar"/>
     <delete file="${installLocation}/PcdTools.jar"/>
     <if>
       <available file="${installLocation}/PcdTools.jar"/>
diff --git a/Tools/Java/Source/SurfaceArea/build.xml b/Tools/Java/Source/SurfaceArea/build.xml
index 6931d81706..6dd98cd9d1 100644
--- a/Tools/Java/Source/SurfaceArea/build.xml
+++ b/Tools/Java/Source/SurfaceArea/build.xml
@@ -200,6 +200,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>
 
   <target name="cleanall" depends="SurfaceArea.jar.clean">
+    <echo message="Removing Class Files and the Java Archive: SurfaceArea.jar"/>
     <delete file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
     <if>
       <available file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
-- 
cgit v1.2.3