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

diff --git a/Tools/CCode/Source/Pccts/antlr/build.xml b/Tools/CCode/Source/Pccts/antlr/build.xml
index 52800858474033bb4dcfc7b45d6725ad588692b0..7ea7458f7b69dec52e30a44b71a25a33bb5e8a0d 100644 (file)
--- a/Tools/CCode/Source/Pccts/antlr/build.xml
+++ b/Tools/CCode/Source/Pccts/antlr/build.xml
@@ -40,6 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="TRUE">\r
+                 <arg line="/NOLOGO"/>\r
                  <arg line="-f AntlrMS.mak"/>\r
                </exec>\r
                  </then>\r
@@ -55,6 +56,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <istrue value="${gcc}"/>\r
         <then>\r
            <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">\r
+                 <arg line="-s"/>\r
                  <arg line="-f makefile BIN_DIR=${BIN_DIR}"/>\r
                </exec>\r
         </then>\r
@@ -69,6 +71,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="TRUE">\r
+                 <arg line="/C"/>\r
+                 <arg line="/NOLOGO"/>\r
                  <arg line="-f AntlrMS.mak clean"/>\r
                </exec>\r
                  </then>\r
@@ -84,6 +88,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <istrue value="${gcc}"/>\r
       <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">\r
+                 <arg line="-s"/>\r
                  <arg line="-f makefile clean"/>\r
                </exec>\r
       </then>\r
@@ -97,7 +102,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="FALSE">\r
-                 <arg line="-f AntlrMS.mak clean"/>\r
+                 <arg line="/C"/>\r
+                 <arg line="/NOLOGO"/>\r
+                 <arg line="/f AntlrMS.mak clean"/>\r
                </exec>\r
                  </then>\r
                <elseif>\r
@@ -105,6 +112,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                        <then>\r
         <echo message="Building antlr with cygwin gcc"/>\r
          <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="FALSE">\r
+               <arg line="-s"/>\r
                  <arg line="-f makefile.cygwin clean"/>\r
                </exec>\r
                  </then>\r
@@ -114,6 +122,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <then>\r
         <echo message="Building antlr with gcc"/>\r
          <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="FALSE">\r
+               <arg line="-s"/>\r
                  <arg line="-f makefile clean"/>\r
                </exec>\r
       </then>\r

diff --git a/Tools/CCode/Source/Pccts/build.xml b/Tools/CCode/Source/Pccts/build.xml
index d6ed0749df49a68e18d35c7c838432b9f347d377..58a82f4c36af4a4ee8ca31b2ec05be86a21ca429 100644 (file)
--- a/Tools/CCode/Source/Pccts/build.xml
+++ b/Tools/CCode/Source/Pccts/build.xml
@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
   <target name="cleanall">\r
+    <echo message="Removing Object Files and the Executables from the package: Pccts"/>  \r
     <ant dir="${PACKAGE_DIR}/Pccts/antlr" target="cleanall" inheritAll="true"/>\r
     <ant dir="${PACKAGE_DIR}/Pccts/dlg" target="cleanall" inheritAll="true"/>\r
   </target>\r

diff --git a/Tools/CCode/Source/Pccts/dlg/build.xml b/Tools/CCode/Source/Pccts/dlg/build.xml
index 3a8a9eec2b0f24f8ecef861e7382c41200a940d3..da5dbd0f59374a99fa77720a4753490296a1d432 100644 (file)
--- a/Tools/CCode/Source/Pccts/dlg/build.xml
+++ b/Tools/CCode/Source/Pccts/dlg/build.xml
@@ -42,6 +42,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">\r
+                 <arg line="/NOLOGO"/>\r
                  <arg line="-f DlgMS.mak"/>\r
                </exec>\r
                  </then>\r
@@ -57,6 +58,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="gcc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">\r
+               <arg line="-s"/>\r
                  <arg line="-f makefile BIN_DIR=${BIN_DIR}"/>\r
                </exec>\r
                  </then>\r
@@ -71,6 +73,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">\r
+                 <arg line="/C"/>\r
+                 <arg line="/NOLOGO"/>\r
                  <arg line="-f DlgMS.mak clean"/>\r
                </exec>\r
                  </then>\r
@@ -86,6 +90,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="gcc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">\r
+               <arg line="-s"/>\r
                  <arg line="-f makefile clean"/>\r
                </exec>\r
                  </then>\r
@@ -99,6 +104,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="FALSE">\r
+                 <arg line="/C"/>\r
+                 <arg line="/NOLOGO"/>\r
                  <arg line="-f DlgMS.mak clean"/>\r
                </exec>\r
                  </then>\r
@@ -106,6 +113,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="gcc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="FALSE">\r
+               <arg line="-s"/>\r
                  <arg line="-f makefile clean"/>\r
                </exec>\r
                  </then>\r

diff --git a/Tools/Java/Source/Common/build.xml b/Tools/Java/Source/Common/build.xml
index 376948c46585aa4da983d06e5a667f81f80e3a41..f75db2fb712a3e1a7284fae80f0ba65d063b1c66 100644 (file)
--- 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>\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

diff --git a/Tools/Java/Source/ContextTool/build.xml b/Tools/Java/Source/ContextTool/build.xml
index 65f75456f7bf927112a3b5237dfdb02db58268e7..3779dbe25784e5aab7b93321fbbfb54a49f85aaa 100644 (file)
--- 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>\r
   </target>\r
   <target name="cleanall" depends="clean">\r
+    <echo message="Removing Class Files and the Java Archive: ContextTool.jar"/>\r
     <delete file="${installLocation}/ContextTool.jar"/>\r
     <if>\r
       <available file="${installLocation}/ContextTool.jar"/>\r

diff --git a/Tools/Java/Source/Cpptasks/build.xml b/Tools/Java/Source/Cpptasks/build.xml
index 971e7e774cf804ca9ab343d5f5e226cea09e5677..ce040e6ac7cab53b05df1110eded2c41d779e46f 100644 (file)
--- 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=".">\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <property environment="env"/>\r
-  <property name="workspace" value="${env.WORKSPACE}"/>\r
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="buildDir" value="build"/>\r
-  <property name="installLocation" value="${workspace}/Tools/Jars"/>\r
+  <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>\r
   <target name="CppTasks" depends="install"/>\r
   <target name="init">\r
     <uptodate property="jar.newer" targetfile="${installLocation}/cpptasks.jar">\r
@@ -25,18 +25,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <mkdir dir="${buildDir}"/>\r
     <javac srcdir="net" destdir="${buildDir}" source="1.4">\r
       <classpath>\r
-        <fileset dir="${workspace}/Tools/Jars">\r
+        <fileset dir="${WORKSPACE}/Tools/Jars">\r
           <include name="*.jar"/>\r
         </fileset>\r
       </classpath>\r
     </javac>\r
   </target>\r
   <target name="clean">\r
-    <delete includeemptydirs="true" failonerror="false">\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
       <fileset dir="${WORKSPACE}/Tools/Java/Source/Cpptasks" includes="${buildDir}"/>\r
     </delete>\r
   </target>\r
   <target name="cleanall" depends="clean">\r
+    <echo message="Removing Class Files and the Java Archive: cpptasks.jar"/>\r
     <delete file="${installLocation}/cpptasks.jar"/>\r
     <if>\r
       <available file="${installLocation}/cpptasks.jar"/>\r

diff --git a/Tools/Java/Source/FrameworkTasks/build.xml b/Tools/Java/Source/FrameworkTasks/build.xml
index ad5d3f0ff9efa9a23fb6abfeee4a053f2fdbf19b..c3c86c987c965e099bbfa1d56fb3bca57494f018 100644 (file)
--- 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">\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <property environment="env"/>\r
-  <property name="workspace" value="${env.WORKSPACE}"/>\r
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="buildDir" value="build"/>\r
-  <property name="installLocation" value="${workspace}/Tools/Jars"/>\r
+  <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>\r
   <target name="FrameworkTasks" depends="install"/>\r
   <target name="source">\r
     <mkdir dir="${buildDir}"/>\r
     <javac srcdir="." destdir="${buildDir}">\r
       <classpath>\r
-        <fileset dir="${workspace}/Tools/Jars">\r
+        <fileset dir="${WORKSPACE}/Tools/Jars">\r
           <include name="*.jar"/>\r
         </fileset>\r
       </classpath>\r
@@ -33,6 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>\r
   </target>\r
   <target name="cleanall" depends="clean">\r
+    <echo message="Removing Class Files and the Java Archive: frameworktasks.jar"/>\r
     <delete file="${installLocation}/frameworktasks.jar"/>\r
     <if>\r
       <available file="${installLocation}/frameworktasks.jar"/>\r

diff --git a/Tools/Java/Source/FrameworkWizard/build.xml b/Tools/Java/Source/FrameworkWizard/build.xml
index c93693025455f69af2f7f667af0033bb48167134..5c71edbd19937d9b605c1c6ef51428743c316331 100644 (file)
--- 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>\r
   </target>\r
   <target name="cleanall" depends="clean">\r
+    <echo message="Removing Class Files and the Java Archive: FrameworkWizard.jar"/>\r
     <delete file="${installLocation}/FrameworkWizard.jar"/>\r
   </target>\r
   <target name="install" depends="source">\r

diff --git a/Tools/Java/Source/GenBuild/build.xml b/Tools/Java/Source/GenBuild/build.xml
index d33cbebde03a75e404e221a6058d5f2e918a1659..2f9476f4bd5358161da0daeedf53e6b590026269 100644 (file)
--- 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>\r
   </target>\r
   <target name="cleanall" depends="clean">\r
+    <echo message="Removing Class Files and the Java Archive: GenBuild.jar"/>\r
     <delete file="${installLocation}/GenBuild.jar"/>\r
     <if>\r
       <available file="${installLocation}/GenBuild.jar"/>\r

diff --git a/Tools/Java/Source/Merge/build.xml b/Tools/Java/Source/Merge/build.xml
index 8b91fad7cd918867bc08bf831ee0f372f47c1dc9..709c9e8fe99f9bf6551bd4a4c99202b696916426 100644 (file)
--- 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>\r
   </target>\r
   <target name="cleanall" depends="clean">\r
+    <echo message="Removing Class Files and the Java Archive: Merge.jar"/>\r
     <delete file="${installLocation}/Merge.jar"/>\r
   </target>\r
   <target name="install" depends="source">\r

diff --git a/Tools/Java/Source/MigrationTools/build.xml b/Tools/Java/Source/MigrationTools/build.xml
index 10ca9215c8fa2791fe63ec1e2feeb5e5bb4a7100..ddb4979ea96c1b0422d8a752b15504deef4dc83c 100644 (file)
--- 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>\r
   </target>\r
   <target name="cleanall" depends="clean">\r
+    <echo message="Removing Class Files and the Java Archive: MigrationTools.jar"/>\r
     <delete file="${installLocation}/MigrationTools.jar"/>\r
     <if>\r
       <available file="${installLocation}/MigrationTools.jar"/>\r

diff --git a/Tools/Java/Source/PcdTools/build.xml b/Tools/Java/Source/PcdTools/build.xml
index a8c7aa959f704b6fe969660214388aa3076f14d9..4db07e0cf45d1bbc727cdd8b3a16c8b5174f61a7 100644 (file)
--- 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>\r
   </target>\r
   <target name="cleanall" depends="clean">\r
+    <echo message="Removing Class Files and the Java Archive: PcdTools.jar"/>\r
     <delete file="${installLocation}/PcdTools.jar"/>\r
     <if>\r
       <available file="${installLocation}/PcdTools.jar"/>\r

diff --git a/Tools/Java/Source/SurfaceArea/build.xml b/Tools/Java/Source/SurfaceArea/build.xml
index 6931d8170656b8a89b1b0dab00d769d24fd18ff5..6dd98cd9d104f13c6de2c1170e5adce40b70dd0c 100644 (file)
--- 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>\r
 \r
   <target name="cleanall" depends="SurfaceArea.jar.clean">\r
+    <echo message="Removing Class Files and the Java Archive: SurfaceArea.jar"/>\r
     <delete file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>\r
     <if>\r
       <available file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>\r

diff --git a/Tools/build.xml b/Tools/build.xml
index 0f746c98e86f44ed3ad610328332f34f6dbc48d9..caef839b504b61d63667032a2a18e4f2b1d5d10a 100644 (file)
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -130,15 +130,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Java/Source/PcdTools/build.xml \r
           Java/Source/Common/build.xml \r
           Java/Source/SurfaceArea/build.xml \r
-          CCode/Source/build.xml\r
           Java/Source/MigrationTools/build.xml\r
           Java/Source/ContextTool/build.xml\r
           Java/Source/Merge/build.xml\r
+          CCode/Source/build.xml\r
         "/>\r
     </subant>\r
   </target>\r
 \r
   <target name="cleanall">\r
+    <echo message="Removing extra ${env.WORKSPACE} history.xml files!"/>\r
+    <if>\r
+      <available file="${env.WORKSPACE}/Tools/bin/history.xml"/>\r
+      <then>\r
+        <delete failonerror="false" quiet="true">\r
+          <fileset file="${env.WORKSPACE}/Tools/bin/history.xml"/>\r
+        </delete>\r
+      </then>\r
+    </if>\r
+    <if>\r
+      <available file="${env.WORKSPACE}/Tools/CCode/Source/Library/history.xml"/>\r
+      <then>\r
+        <delete failonerror="false" quiet="true">\r
+          <fileset file="${env.WORKSPACE}/Tools/CCode/Source/Library/history.xml"/>\r
+        </delete>\r
+      </then>\r
+    </if>\r
     <available classname="org.tianocore.frameworkwizard.FrameworkWizardUI" property="FrameworkWizardUI.available"/>\r
     <available classname="org.tianocore.build.GenBuildTask" property="GenBuildTask.available"/>\r
     <available classname="org.tianocore.framework.tasks.Tool" property="Tool.available"/>\r
@@ -164,10 +181,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Java/Source/PcdTools/build.xml \r
           Java/Source/Common/build.xml \r
           Java/Source/SurfaceArea/build.xml \r
-          CCode/Source/build.xml\r
           Java/Source/MigrationTools/build.xml\r
           Java/Source/ContextTool/build.xml\r
           Java/Source/Merge/build.xml\r
+          CCode/Source/build.xml\r
         "/>\r
     </subant>\r
   </target>\r