Convert backslashes to forward slashes in many build files. This is necessary for Linux support.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@55 6f19259b-4bc3-4df7-8a09-765794883524

15 files changed, 186 insertions, 186 deletions

diff --git a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/build.xml b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/build.xml
index d9b2b66..3d80c2c 100644
--- a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Pci\AtapiPassThru\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/AtapiPassThru/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="AtapiPassThru">

-      <GenBuild baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}\AtapiPassThru.mbd" msaFilename="${MODULE_DIR}\AtapiPassThru.msa"/>

+      <GenBuild baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}/AtapiPassThru.mbd" msaFilename="${MODULE_DIR}/AtapiPassThru.msa"/>

    </target>

    <target depends="AtapiPassThru_clean" name="clean"/>

    <target depends="AtapiPassThru_cleanall" name="cleanall"/>

    <target name="AtapiPassThru_clean">

-      <OutputDirSetup baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}\AtapiPassThru.mbd" msaFilename="${MODULE_DIR}\AtapiPassThru.msa"/>

+      <OutputDirSetup baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}/AtapiPassThru.mbd" msaFilename="${MODULE_DIR}/AtapiPassThru.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\AtapiPassThru_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/AtapiPassThru_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\AtapiPassThru_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/AtapiPassThru_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="AtapiPassThru_cleanall">

-      <OutputDirSetup baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}\AtapiPassThru.mbd" msaFilename="${MODULE_DIR}\AtapiPassThru.msa"/>

+      <OutputDirSetup baseName="AtapiPassThru" mbdFilename="${MODULE_DIR}/AtapiPassThru.mbd" msaFilename="${MODULE_DIR}/AtapiPassThru.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\AtapiPassThru_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/AtapiPassThru_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\AtapiPassThru_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/AtapiPassThru_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/build.xml b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/build.xml
index c8e44b1..fb6ce8c 100644
--- a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Pci\CirrusLogic\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/CirrusLogic/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="CirrusLogic5430UgaDraw">

-      <GenBuild baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}\CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}\CirrusLogic5430.msa"/>

+      <GenBuild baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}/CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}/CirrusLogic5430.msa"/>

    </target>

    <target depends="CirrusLogic5430UgaDraw_clean" name="clean"/>

    <target depends="CirrusLogic5430UgaDraw_cleanall" name="cleanall"/>

    <target name="CirrusLogic5430UgaDraw_clean">

-      <OutputDirSetup baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}\CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}\CirrusLogic5430.msa"/>

+      <OutputDirSetup baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}/CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}/CirrusLogic5430.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\CirrusLogic5430UgaDraw_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/CirrusLogic5430UgaDraw_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\CirrusLogic5430UgaDraw_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/CirrusLogic5430UgaDraw_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="CirrusLogic5430UgaDraw_cleanall">

-      <OutputDirSetup baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}\CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}\CirrusLogic5430.msa"/>

+      <OutputDirSetup baseName="CirrusLogic5430UgaDraw" mbdFilename="${MODULE_DIR}/CirrusLogic5430.mbd" msaFilename="${MODULE_DIR}/CirrusLogic5430.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\CirrusLogic5430UgaDraw_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/CirrusLogic5430UgaDraw_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\CirrusLogic5430UgaDraw_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/CirrusLogic5430UgaDraw_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/build.xml b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/build.xml
index 3a33a2b..5f6d829 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/build.xml
@@ -11,44 +11,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Pci\IdeBus\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/IdeBus/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="IdeBusLite">

-      <GenBuild baseName="IdeBusLite" mbdFilename="${MODULE_DIR}\idebusLite.mbd" msaFilename="${MODULE_DIR}\idebusLite.msa"/>

+      <GenBuild baseName="IdeBusLite" mbdFilename="${MODULE_DIR}/idebusLite.mbd" msaFilename="${MODULE_DIR}/idebusLite.msa"/>

    </target>

    <target name="IdeBus">

-      <GenBuild baseName="IdeBus" mbdFilename="${MODULE_DIR}\idebus.mbd" msaFilename="${MODULE_DIR}\idebus.msa"/>

+      <GenBuild baseName="IdeBus" mbdFilename="${MODULE_DIR}/idebus.mbd" msaFilename="${MODULE_DIR}/idebus.msa"/>

    </target>

    <target depends="IdeBus_clean" name="clean"/>

    <target depends="IdeBus_cleanall" name="cleanall"/>

    <target name="IdeBusLite_clean">

-      <OutputDirSetup baseName="IdeBusLite" mbdFilename="${MODULE_DIR}\idebusLite.mbd" msaFilename="${MODULE_DIR}\idebusLite.msa"/>

+      <OutputDirSetup baseName="IdeBusLite" mbdFilename="${MODULE_DIR}/idebusLite.mbd" msaFilename="${MODULE_DIR}/idebusLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\IdeBusLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/IdeBusLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\IdeBusLite_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/IdeBusLite_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="IdeBus_clean">

-      <OutputDirSetup baseName="IdeBus" mbdFilename="${MODULE_DIR}\idebus.mbd" msaFilename="${MODULE_DIR}\idebus.msa"/>

+      <OutputDirSetup baseName="IdeBus" mbdFilename="${MODULE_DIR}/idebus.mbd" msaFilename="${MODULE_DIR}/idebus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\IdeBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/IdeBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\IdeBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/IdeBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="IdeBusLite_cleanall">

-      <OutputDirSetup baseName="IdeBusLite" mbdFilename="${MODULE_DIR}\idebusLite.mbd" msaFilename="${MODULE_DIR}\idebusLite.msa"/>

+      <OutputDirSetup baseName="IdeBusLite" mbdFilename="${MODULE_DIR}/idebusLite.mbd" msaFilename="${MODULE_DIR}/idebusLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\IdeBusLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/IdeBusLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\IdeBusLite_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/IdeBusLite_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

@@ -58,11 +58,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       </delete>

    </target>

    <target name="IdeBus_cleanall">

-      <OutputDirSetup baseName="IdeBus" mbdFilename="${MODULE_DIR}\idebus.mbd" msaFilename="${MODULE_DIR}\idebus.msa"/>

+      <OutputDirSetup baseName="IdeBus" mbdFilename="${MODULE_DIR}/idebus.mbd" msaFilename="${MODULE_DIR}/idebus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\IdeBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/IdeBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\IdeBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/IdeBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/build.xml b/EdkModulePkg/Bus/Pci/PciBus/Dxe/build.xml
index ee051c7..579dc7f 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/build.xml
@@ -11,57 +11,57 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Pci\PciBus\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/PciBus/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="PciBus">

-      <GenBuild baseName="PciBus" mbdFilename="${MODULE_DIR}\PciBus.mbd" msaFilename="${MODULE_DIR}\PciBus.msa"/>

+      <GenBuild baseName="PciBus" mbdFilename="${MODULE_DIR}/PciBus.mbd" msaFilename="${MODULE_DIR}/PciBus.msa"/>

    </target>

    <target name="LightPciBusPciBus">

-      <GenBuild baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}\LightPciBus.mbd" msaFilename="${MODULE_DIR}\LightPciBus.msa"/>

+      <GenBuild baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}/LightPciBus.mbd" msaFilename="${MODULE_DIR}/LightPciBus.msa"/>

    </target>

    <target name="PciBusPciBusLite">

-      <GenBuild baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}\PciBusLite.mbd" msaFilename="${MODULE_DIR}\PciBusLite.msa"/>

+      <GenBuild baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}/PciBusLite.mbd" msaFilename="${MODULE_DIR}/PciBusLite.msa"/>

    </target>

    <target depends="PciBus_clean" name="clean"/>

    <target depends="PciBus_cleanall" name="cleanall"/>

    <target name="PciBus_clean">

-      <OutputDirSetup baseName="PciBus" mbdFilename="${MODULE_DIR}\PciBus.mbd" msaFilename="${MODULE_DIR}\PciBus.msa"/>

+      <OutputDirSetup baseName="PciBus" mbdFilename="${MODULE_DIR}/PciBus.mbd" msaFilename="${MODULE_DIR}/PciBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PciBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PciBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PciBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PciBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="LightPciBusPciBus_clean">

-      <OutputDirSetup baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}\LightPciBus.mbd" msaFilename="${MODULE_DIR}\LightPciBus.msa"/>

+      <OutputDirSetup baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}/LightPciBus.mbd" msaFilename="${MODULE_DIR}/LightPciBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\LightPciBusPciBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/LightPciBusPciBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\LightPciBusPciBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/LightPciBusPciBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PciBusPciBusLite_clean">

-      <OutputDirSetup baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}\PciBusLite.mbd" msaFilename="${MODULE_DIR}\PciBusLite.msa"/>

+      <OutputDirSetup baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}/PciBusLite.mbd" msaFilename="${MODULE_DIR}/PciBusLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PciBusPciBusLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PciBusPciBusLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PciBusPciBusLite_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PciBusPciBusLite_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="PciBus_cleanall">

-      <OutputDirSetup baseName="PciBus" mbdFilename="${MODULE_DIR}\PciBus.mbd" msaFilename="${MODULE_DIR}\PciBus.msa"/>

+      <OutputDirSetup baseName="PciBus" mbdFilename="${MODULE_DIR}/PciBus.mbd" msaFilename="${MODULE_DIR}/PciBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PciBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PciBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PciBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PciBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

@@ -71,11 +71,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       </delete>

    </target>

    <target name="LightPciBusPciBus_cleanall">

-      <OutputDirSetup baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}\LightPciBus.mbd" msaFilename="${MODULE_DIR}\LightPciBus.msa"/>

+      <OutputDirSetup baseName="LightPciBusPciBus" mbdFilename="${MODULE_DIR}/LightPciBus.mbd" msaFilename="${MODULE_DIR}/LightPciBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\LightPciBusPciBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/LightPciBusPciBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\LightPciBusPciBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/LightPciBusPciBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

@@ -85,11 +85,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       </delete>

    </target>

    <target name="PciBusPciBusLite_cleanall">

-      <OutputDirSetup baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}\PciBusLite.mbd" msaFilename="${MODULE_DIR}\PciBusLite.msa"/>

+      <OutputDirSetup baseName="PciBusPciBusLite" mbdFilename="${MODULE_DIR}/PciBusLite.mbd" msaFilename="${MODULE_DIR}/PciBusLite.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\PciBusPciBusLite_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/PciBusPciBusLite_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\PciBusPciBusLite_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/PciBusPciBusLite_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/Uhci/Dxe/build.xml b/EdkModulePkg/Bus/Pci/Uhci/Dxe/build.xml
index 37bb3c3..dca737f 100644
--- a/EdkModulePkg/Bus/Pci/Uhci/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/Uhci/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Pci\Uhci\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/Uhci/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Uhci">

-      <GenBuild baseName="Uhci" mbdFilename="${MODULE_DIR}\Uhci.mbd" msaFilename="${MODULE_DIR}\Uhci.msa"/>

+      <GenBuild baseName="Uhci" mbdFilename="${MODULE_DIR}/Uhci.mbd" msaFilename="${MODULE_DIR}/Uhci.msa"/>

    </target>

    <target depends="Uhci_clean" name="clean"/>

    <target depends="Uhci_cleanall" name="cleanall"/>

    <target name="Uhci_clean">

-      <OutputDirSetup baseName="Uhci" mbdFilename="${MODULE_DIR}\Uhci.mbd" msaFilename="${MODULE_DIR}\Uhci.msa"/>

+      <OutputDirSetup baseName="Uhci" mbdFilename="${MODULE_DIR}/Uhci.mbd" msaFilename="${MODULE_DIR}/Uhci.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Uhci_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Uhci_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Uhci_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Uhci_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Uhci_cleanall">

-      <OutputDirSetup baseName="Uhci" mbdFilename="${MODULE_DIR}\Uhci.mbd" msaFilename="${MODULE_DIR}\Uhci.msa"/>

+      <OutputDirSetup baseName="Uhci" mbdFilename="${MODULE_DIR}/Uhci.mbd" msaFilename="${MODULE_DIR}/Uhci.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Uhci_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Uhci_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Uhci_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Uhci_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/build.xml b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/build.xml
index 2375cd7..9f34e44 100644
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Pci\Undi\RuntimeDxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Pci/Undi/RuntimeDxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="Undi">

-      <GenBuild baseName="Undi" mbdFilename="${MODULE_DIR}\Undi.mbd" msaFilename="${MODULE_DIR}\Undi.msa"/>

+      <GenBuild baseName="Undi" mbdFilename="${MODULE_DIR}/Undi.mbd" msaFilename="${MODULE_DIR}/Undi.msa"/>

    </target>

    <target depends="Undi_clean" name="clean"/>

    <target depends="Undi_cleanall" name="cleanall"/>

    <target name="Undi_clean">

-      <OutputDirSetup baseName="Undi" mbdFilename="${MODULE_DIR}\Undi.mbd" msaFilename="${MODULE_DIR}\Undi.msa"/>

+      <OutputDirSetup baseName="Undi" mbdFilename="${MODULE_DIR}/Undi.mbd" msaFilename="${MODULE_DIR}/Undi.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Undi_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Undi_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Undi_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Undi_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="Undi_cleanall">

-      <OutputDirSetup baseName="Undi" mbdFilename="${MODULE_DIR}\Undi.mbd" msaFilename="${MODULE_DIR}\Undi.msa"/>

+      <OutputDirSetup baseName="Undi" mbdFilename="${MODULE_DIR}/Undi.mbd" msaFilename="${MODULE_DIR}/Undi.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\Undi_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/Undi_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\Undi_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/Undi_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/build.xml b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/build.xml
index 9942471..a132025 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Scsi\ScsiBus\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Scsi/ScsiBus/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="ScsiBus">

-      <GenBuild baseName="ScsiBus" mbdFilename="${MODULE_DIR}\ScsiBus.mbd" msaFilename="${MODULE_DIR}\ScsiBus.msa"/>

+      <GenBuild baseName="ScsiBus" mbdFilename="${MODULE_DIR}/ScsiBus.mbd" msaFilename="${MODULE_DIR}/ScsiBus.msa"/>

    </target>

    <target depends="ScsiBus_clean" name="clean"/>

    <target depends="ScsiBus_cleanall" name="cleanall"/>

    <target name="ScsiBus_clean">

-      <OutputDirSetup baseName="ScsiBus" mbdFilename="${MODULE_DIR}\ScsiBus.mbd" msaFilename="${MODULE_DIR}\ScsiBus.msa"/>

+      <OutputDirSetup baseName="ScsiBus" mbdFilename="${MODULE_DIR}/ScsiBus.mbd" msaFilename="${MODULE_DIR}/ScsiBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ScsiBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ScsiBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ScsiBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ScsiBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="ScsiBus_cleanall">

-      <OutputDirSetup baseName="ScsiBus" mbdFilename="${MODULE_DIR}\ScsiBus.mbd" msaFilename="${MODULE_DIR}\ScsiBus.msa"/>

+      <OutputDirSetup baseName="ScsiBus" mbdFilename="${MODULE_DIR}/ScsiBus.mbd" msaFilename="${MODULE_DIR}/ScsiBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ScsiBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ScsiBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ScsiBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ScsiBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/build.xml b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/build.xml
index 5d5f4d8..4117857 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Scsi\ScsiDisk\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Scsi/ScsiDisk/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="ScsiDisk">

-      <GenBuild baseName="ScsiDisk" mbdFilename="${MODULE_DIR}\ScsiDisk.mbd" msaFilename="${MODULE_DIR}\ScsiDisk.msa"/>

+      <GenBuild baseName="ScsiDisk" mbdFilename="${MODULE_DIR}/ScsiDisk.mbd" msaFilename="${MODULE_DIR}/ScsiDisk.msa"/>

    </target>

    <target depends="ScsiDisk_clean" name="clean"/>

    <target depends="ScsiDisk_cleanall" name="cleanall"/>

    <target name="ScsiDisk_clean">

-      <OutputDirSetup baseName="ScsiDisk" mbdFilename="${MODULE_DIR}\ScsiDisk.mbd" msaFilename="${MODULE_DIR}\ScsiDisk.msa"/>

+      <OutputDirSetup baseName="ScsiDisk" mbdFilename="${MODULE_DIR}/ScsiDisk.mbd" msaFilename="${MODULE_DIR}/ScsiDisk.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ScsiDisk_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ScsiDisk_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ScsiDisk_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ScsiDisk_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="ScsiDisk_cleanall">

-      <OutputDirSetup baseName="ScsiDisk" mbdFilename="${MODULE_DIR}\ScsiDisk.mbd" msaFilename="${MODULE_DIR}\ScsiDisk.msa"/>

+      <OutputDirSetup baseName="ScsiDisk" mbdFilename="${MODULE_DIR}/ScsiDisk.mbd" msaFilename="${MODULE_DIR}/ScsiDisk.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\ScsiDisk_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/ScsiDisk_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\ScsiDisk_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/ScsiDisk_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/build.xml
index aab054b..905ca30 100644
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Usb\UsbBot\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbBot/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbBot">

-      <GenBuild baseName="UsbBot" mbdFilename="${MODULE_DIR}\UsbBot.mbd" msaFilename="${MODULE_DIR}\UsbBot.msa"/>

+      <GenBuild baseName="UsbBot" mbdFilename="${MODULE_DIR}/UsbBot.mbd" msaFilename="${MODULE_DIR}/UsbBot.msa"/>

    </target>

    <target depends="UsbBot_clean" name="clean"/>

    <target depends="UsbBot_cleanall" name="cleanall"/>

    <target name="UsbBot_clean">

-      <OutputDirSetup baseName="UsbBot" mbdFilename="${MODULE_DIR}\UsbBot.mbd" msaFilename="${MODULE_DIR}\UsbBot.msa"/>

+      <OutputDirSetup baseName="UsbBot" mbdFilename="${MODULE_DIR}/UsbBot.mbd" msaFilename="${MODULE_DIR}/UsbBot.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbBot_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbBot_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbBot_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbBot_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbBot_cleanall">

-      <OutputDirSetup baseName="UsbBot" mbdFilename="${MODULE_DIR}\UsbBot.mbd" msaFilename="${MODULE_DIR}\UsbBot.msa"/>

+      <OutputDirSetup baseName="UsbBot" mbdFilename="${MODULE_DIR}/UsbBot.mbd" msaFilename="${MODULE_DIR}/UsbBot.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbBot_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbBot_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbBot_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbBot_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/build.xml
index 508c758..e979dab 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Usb\UsbBus\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbBus/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbBus">

-      <GenBuild baseName="UsbBus" mbdFilename="${MODULE_DIR}\UsbBus.mbd" msaFilename="${MODULE_DIR}\UsbBus.msa"/>

+      <GenBuild baseName="UsbBus" mbdFilename="${MODULE_DIR}/UsbBus.mbd" msaFilename="${MODULE_DIR}/UsbBus.msa"/>

    </target>

    <target depends="UsbBus_clean" name="clean"/>

    <target depends="UsbBus_cleanall" name="cleanall"/>

    <target name="UsbBus_clean">

-      <OutputDirSetup baseName="UsbBus" mbdFilename="${MODULE_DIR}\UsbBus.mbd" msaFilename="${MODULE_DIR}\UsbBus.msa"/>

+      <OutputDirSetup baseName="UsbBus" mbdFilename="${MODULE_DIR}/UsbBus.mbd" msaFilename="${MODULE_DIR}/UsbBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbBus_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbBus_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbBus_cleanall">

-      <OutputDirSetup baseName="UsbBus" mbdFilename="${MODULE_DIR}\UsbBus.mbd" msaFilename="${MODULE_DIR}\UsbBus.msa"/>

+      <OutputDirSetup baseName="UsbBus" mbdFilename="${MODULE_DIR}/UsbBus.mbd" msaFilename="${MODULE_DIR}/UsbBus.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbBus_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbBus_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbBus_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbBus_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/build.xml b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/build.xml
index e406abe..7ffd6f1 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Usb\UsbCbi\Dxe\Cbi0"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbCbi/Dxe/Cbi0"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbCbi0">

-      <GenBuild baseName="UsbCbi0" mbdFilename="${MODULE_DIR}\UsbCbi0.mbd" msaFilename="${MODULE_DIR}\UsbCbi0.msa"/>

+      <GenBuild baseName="UsbCbi0" mbdFilename="${MODULE_DIR}/UsbCbi0.mbd" msaFilename="${MODULE_DIR}/UsbCbi0.msa"/>

    </target>

    <target depends="UsbCbi0_clean" name="clean"/>

    <target depends="UsbCbi0_cleanall" name="cleanall"/>

    <target name="UsbCbi0_clean">

-      <OutputDirSetup baseName="UsbCbi0" mbdFilename="${MODULE_DIR}\UsbCbi0.mbd" msaFilename="${MODULE_DIR}\UsbCbi0.msa"/>

+      <OutputDirSetup baseName="UsbCbi0" mbdFilename="${MODULE_DIR}/UsbCbi0.mbd" msaFilename="${MODULE_DIR}/UsbCbi0.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbCbi0_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbCbi0_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbCbi0_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbCbi0_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbCbi0_cleanall">

-      <OutputDirSetup baseName="UsbCbi0" mbdFilename="${MODULE_DIR}\UsbCbi0.mbd" msaFilename="${MODULE_DIR}\UsbCbi0.msa"/>

+      <OutputDirSetup baseName="UsbCbi0" mbdFilename="${MODULE_DIR}/UsbCbi0.mbd" msaFilename="${MODULE_DIR}/UsbCbi0.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbCbi0_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbCbi0_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbCbi0_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbCbi0_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/build.xml b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/build.xml
index 132e522..129dab1 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Usb\UsbCbi\Dxe\Cbi1"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbCbi/Dxe/Cbi1"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbCbi1">

-      <GenBuild baseName="UsbCbi1" mbdFilename="${MODULE_DIR}\UsbCbi1.mbd" msaFilename="${MODULE_DIR}\UsbCbi1.msa"/>

+      <GenBuild baseName="UsbCbi1" mbdFilename="${MODULE_DIR}/UsbCbi1.mbd" msaFilename="${MODULE_DIR}/UsbCbi1.msa"/>

    </target>

    <target depends="UsbCbi1_clean" name="clean"/>

    <target depends="UsbCbi1_cleanall" name="cleanall"/>

    <target name="UsbCbi1_clean">

-      <OutputDirSetup baseName="UsbCbi1" mbdFilename="${MODULE_DIR}\UsbCbi1.mbd" msaFilename="${MODULE_DIR}\UsbCbi1.msa"/>

+      <OutputDirSetup baseName="UsbCbi1" mbdFilename="${MODULE_DIR}/UsbCbi1.mbd" msaFilename="${MODULE_DIR}/UsbCbi1.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbCbi1_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbCbi1_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbCbi1_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbCbi1_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbCbi1_cleanall">

-      <OutputDirSetup baseName="UsbCbi1" mbdFilename="${MODULE_DIR}\UsbCbi1.mbd" msaFilename="${MODULE_DIR}\UsbCbi1.msa"/>

+      <OutputDirSetup baseName="UsbCbi1" mbdFilename="${MODULE_DIR}/UsbCbi1.mbd" msaFilename="${MODULE_DIR}/UsbCbi1.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbCbi1_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbCbi1_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbCbi1_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbCbi1_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/build.xml
index 2608381..fda7667 100644
--- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Usb\UsbKb\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbKb/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbKb">

-      <GenBuild baseName="UsbKb" mbdFilename="${MODULE_DIR}\UsbKb.mbd" msaFilename="${MODULE_DIR}\UsbKb.msa"/>

+      <GenBuild baseName="UsbKb" mbdFilename="${MODULE_DIR}/UsbKb.mbd" msaFilename="${MODULE_DIR}/UsbKb.msa"/>

    </target>

    <target depends="UsbKb_clean" name="clean"/>

    <target depends="UsbKb_cleanall" name="cleanall"/>

    <target name="UsbKb_clean">

-      <OutputDirSetup baseName="UsbKb" mbdFilename="${MODULE_DIR}\UsbKb.mbd" msaFilename="${MODULE_DIR}\UsbKb.msa"/>

+      <OutputDirSetup baseName="UsbKb" mbdFilename="${MODULE_DIR}/UsbKb.mbd" msaFilename="${MODULE_DIR}/UsbKb.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbKb_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbKb_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbKb_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbKb_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbKb_cleanall">

-      <OutputDirSetup baseName="UsbKb" mbdFilename="${MODULE_DIR}\UsbKb.mbd" msaFilename="${MODULE_DIR}\UsbKb.msa"/>

+      <OutputDirSetup baseName="UsbKb" mbdFilename="${MODULE_DIR}/UsbKb.mbd" msaFilename="${MODULE_DIR}/UsbKb.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbKb_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbKb_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbKb_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbKb_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/build.xml
index d2e48d3..3d98316 100644
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Usb\UsbMassStorage\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbMassStorage/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbMassStorage">

-      <GenBuild baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}\UsbMassStorage.mbd" msaFilename="${MODULE_DIR}\UsbMassStorage.msa"/>

+      <GenBuild baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}/UsbMassStorage.mbd" msaFilename="${MODULE_DIR}/UsbMassStorage.msa"/>

    </target>

    <target depends="UsbMassStorage_clean" name="clean"/>

    <target depends="UsbMassStorage_cleanall" name="cleanall"/>

    <target name="UsbMassStorage_clean">

-      <OutputDirSetup baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}\UsbMassStorage.mbd" msaFilename="${MODULE_DIR}\UsbMassStorage.msa"/>

+      <OutputDirSetup baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}/UsbMassStorage.mbd" msaFilename="${MODULE_DIR}/UsbMassStorage.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbMassStorage_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbMassStorage_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbMassStorage_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbMassStorage_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbMassStorage_cleanall">

-      <OutputDirSetup baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}\UsbMassStorage.mbd" msaFilename="${MODULE_DIR}\UsbMassStorage.msa"/>

+      <OutputDirSetup baseName="UsbMassStorage" mbdFilename="${MODULE_DIR}/UsbMassStorage.mbd" msaFilename="${MODULE_DIR}/UsbMassStorage.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbMassStorage_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbMassStorage_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbMassStorage_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbMassStorage_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/build.xml b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/build.xml
index 081a9e0..3ce60ca 100644
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/build.xml
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/build.xml
@@ -11,31 +11,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
    <taskdef resource="net/sf/antcontrib/antlib.xml"/>

    <property environment="env"/>

    <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

-   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

-   <property name="MODULE_RELATIVE_PATH" value="Bus\Usb\UsbMouse\Dxe"/>

-   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>

-   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Bus/Usb/UsbMouse/Dxe"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

    <target name="UsbMouse">

-      <GenBuild baseName="UsbMouse" mbdFilename="${MODULE_DIR}\UsbMouse.mbd" msaFilename="${MODULE_DIR}\UsbMouse.msa"/>

+      <GenBuild baseName="UsbMouse" mbdFilename="${MODULE_DIR}/UsbMouse.mbd" msaFilename="${MODULE_DIR}/UsbMouse.msa"/>

    </target>

    <target depends="UsbMouse_clean" name="clean"/>

    <target depends="UsbMouse_cleanall" name="cleanall"/>

    <target name="UsbMouse_clean">

-      <OutputDirSetup baseName="UsbMouse" mbdFilename="${MODULE_DIR}\UsbMouse.mbd" msaFilename="${MODULE_DIR}\UsbMouse.msa"/>

+      <OutputDirSetup baseName="UsbMouse" mbdFilename="${MODULE_DIR}/UsbMouse.mbd" msaFilename="${MODULE_DIR}/UsbMouse.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbMouse_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbMouse_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbMouse_build.xml" target="clean"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbMouse_build.xml" target="clean"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

    </target>

    <target name="UsbMouse_cleanall">

-      <OutputDirSetup baseName="UsbMouse" mbdFilename="${MODULE_DIR}\UsbMouse.mbd" msaFilename="${MODULE_DIR}\UsbMouse.msa"/>

+      <OutputDirSetup baseName="UsbMouse" mbdFilename="${MODULE_DIR}/UsbMouse.mbd" msaFilename="${MODULE_DIR}/UsbMouse.msa"/>

       <if>

-         <available file="${DEST_DIR_OUTPUT}\UsbMouse_build.xml"/>

+         <available file="${DEST_DIR_OUTPUT}/UsbMouse_build.xml"/>

          <then>

-            <ant antfile="${DEST_DIR_OUTPUT}\UsbMouse_build.xml" target="cleanall"/>

+            <ant antfile="${DEST_DIR_OUTPUT}/UsbMouse_build.xml" target="cleanall"/>

          </then>

       </if>

       <delete dir="${DEST_DIR_OUTPUT}"/>