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

40 files changed, 396 insertions, 396 deletions

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml
index b49ce9027c..dc1058aabd 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Console/ConSplitter/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="Universal\Console\ConSplitter\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="Universal/Console/ConSplitter/Dxe"/>

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

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

    <target name="ConSplitter">

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

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

    </target>

    <target name="ConSplitterLite">

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

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

    </target>

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

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

    <target name="ConSplitter_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="ConSplitterLite_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="ConSplitter_cleanall">

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

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

       <if>

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

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

          <then>

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

+            <ant antfile="${DEST_DIR_OUTPUT}/ConSplitter_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="ConSplitterLite_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml
index 896302767b..852b17b3a4 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/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="Universal\Console\GraphicsConsole\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="Universal/Console/GraphicsConsole/Dxe"/>

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

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

    <target name="GraphicsConsole">

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

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

    </target>

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

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

    <target name="GraphicsConsole_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="GraphicsConsole_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml b/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml
index a3c17133de..e9d06dd7db 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Console/Terminal/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="Universal\Console\Terminal\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="Universal/Console/Terminal/Dxe"/>

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

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

    <target name="Terminal">

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

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

    </target>

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

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

    <target name="Terminal_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="Terminal_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml
index 9d59b30b4b..fcf00f8df1 100644
--- a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/build.xml
+++ b/EdkModulePkg/Universal/DataHub/DataHub/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="Universal\DataHub\DataHub\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="Universal/DataHub/DataHub/Dxe"/>

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

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

    <target name="DataHub">

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

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

    </target>

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

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

    <target name="DataHub_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="DataHub_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml
index 22bea3fd3b..e712520ca3 100644
--- a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/build.xml
+++ b/EdkModulePkg/Universal/DataHub/DataHubStdErr/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="Universal\DataHub\DataHubStdErr\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="Universal/DataHub/DataHubStdErr/Dxe"/>

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

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

    <target name="DataHubStdErr">

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

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

    </target>

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

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

    <target name="DataHubStdErr_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="DataHubStdErr_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index 3cf5e12299..1986c1d835 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -42,14 +42,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>DebugSupport.c</Filename>

     <Filename>DebugSupport.dxs</Filename>

     <Arch ArchType="IA32">

-      <Filename>ia32\AsmFuncs.asm</Filename>

-      <Filename>ia32\plDebugSupport.c</Filename>

+      <Filename>ia32/AsmFuncs.asm</Filename>

+      <Filename>ia32/plDebugSupport.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>ipf\AsmFuncs.s</Filename>

-      <Filename>ipf\common.i</Filename>

-      <Filename>ipf\ds64macros.i</Filename>

-      <Filename>ipf\plDebugSupport.c</Filename>

+      <Filename>ipf/AsmFuncs.s</Filename>

+      <Filename>ipf/common.i</Filename>

+      <Filename>ipf/ds64macros.i</Filename>

+      <Filename>ipf/plDebugSupport.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml b/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml
index b879fc094a..06a7f1de7b 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/build.xml
+++ b/EdkModulePkg/Universal/DebugSupport/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="Universal\DebugSupport\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="Universal/DebugSupport/Dxe"/>

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

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

    <target name="DebugSupport">

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

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

    </target>

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

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

    <target name="DebugSupport_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="DebugSupport_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml
index 89b603c257..4b9c2e45b8 100644
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Debugger/Debugport/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="Universal\Debugger\Debugport\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="Universal/Debugger/Debugport/Dxe"/>

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

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

    <target name="DebugPort">

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

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

    </target>

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

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

    <target name="DebugPort_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="DebugPort_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml
index 8a6ff7b7bc..6c19fe4059 100644
--- a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Disk/DiskIo/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="Universal\Disk\DiskIo\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="Universal/Disk/DiskIo/Dxe"/>

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

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

    <target name="DiskIo">

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

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

    </target>

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

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

    <target name="DiskIo_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="DiskIo_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/DiskIoPartition.msa b/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/DiskIoPartition.msa
index 930f57b96a..55ca6c819c 100644
--- a/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/DiskIoPartition.msa
+++ b/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/DiskIoPartition.msa
@@ -43,18 +43,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

-    <Filename>..\..\DiskIo\Dxe\diskio.c</Filename>

-    <Filename>..\..\DiskIo\Dxe\diskio.h</Filename>

-    <Filename>..\..\DiskIo\Dxe\ComponentName.c</Filename>

-    <Filename>..\..\Partition\Dxe\Partition.h</Filename>

-    <Filename>..\..\Partition\Dxe\ElTorito.h</Filename>

-    <Filename>..\..\Partition\Dxe\Gpt.h</Filename>

-    <Filename>..\..\Partition\Dxe\Mbr.h</Filename>

-    <Filename>..\..\Partition\Dxe\Partition.c</Filename>

-    <Filename>..\..\Partition\Dxe\Eltorito.c</Filename>

-    <Filename>..\..\Partition\Dxe\Gpt.c</Filename>

-    <Filename>..\..\Partition\Dxe\Mbr.c</Filename>

-    <Filename>..\..\Partition\Dxe\ComponentName.c</Filename>

+    <Filename>../../DiskIo/Dxe/diskio.c</Filename>

+    <Filename>../../DiskIo/Dxe/diskio.h</Filename>

+    <Filename>../../DiskIo/Dxe/ComponentName.c</Filename>

+    <Filename>../../Partition/Dxe/Partition.h</Filename>

+    <Filename>../../Partition/Dxe/ElTorito.h</Filename>

+    <Filename>../../Partition/Dxe/Gpt.h</Filename>

+    <Filename>../../Partition/Dxe/Mbr.h</Filename>

+    <Filename>../../Partition/Dxe/Partition.c</Filename>

+    <Filename>../../Partition/Dxe/Eltorito.c</Filename>

+    <Filename>../../Partition/Dxe/Gpt.c</Filename>

+    <Filename>../../Partition/Dxe/Mbr.c</Filename>

+    <Filename>../../Partition/Dxe/ComponentName.c</Filename>

   </SourceFiles>

   <Includes>

     <PackageName>MdePkg</PackageName>

diff --git a/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/build.xml b/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/build.xml
index 4b1c1f88cf..17994d8b04 100644
--- a/EdkModulePkg/Universal/Disk/DiskIoPartition/dxe/build.xml
+++ b/EdkModulePkg/Universal/Disk/DiskIoPartition/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="Universal\Disk\DiskIoPartition\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="Universal/Disk/DiskIoPartition/dxe"/>

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

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

    <target name="DiskIoPartition">

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

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

    </target>

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

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

    <target name="DiskIoPartition_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="DiskIoPartition_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml b/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml
index ea4ea4e1ed..42d5194c4e 100644
--- a/EdkModulePkg/Universal/Disk/Partition/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Disk/Partition/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="Universal\Disk\Partition\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="Universal/Disk/Partition/Dxe"/>

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

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

    <target name="Partition">

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

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

    </target>

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

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

    <target name="Partition_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="Partition_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml
index 81fd524667..ab86d5a16f 100644
--- a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/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="Universal\Disk\UnicodeCollation\English\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="Universal/Disk/UnicodeCollation/English/Dxe"/>

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

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

    <target name="English">

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

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

    </target>

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

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

    <target name="English_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="English_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/Ebc.msa b/EdkModulePkg/Universal/Ebc/Dxe/Ebc.msa
index e736450b39..dcd073f4f9 100644
--- a/EdkModulePkg/Universal/Ebc/Dxe/Ebc.msa
+++ b/EdkModulePkg/Universal/Ebc/Dxe/Ebc.msa
@@ -48,20 +48,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>EbcExecute.h</Filename>

     <Filename>Ebc.dxs</Filename>

     <Arch ArchType="IA32">

-      <Filename>Ia32\EbcLowLevel.asm</Filename>

-      <Filename>Ia32\Ia32Math.asm</Filename>

-      <Filename>Ia32\EbcSupport.c</Filename>

+      <Filename>Ia32/EbcLowLevel.asm</Filename>

+      <Filename>Ia32/Ia32Math.asm</Filename>

+      <Filename>Ia32/EbcSupport.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>x64\EbcLowLevel.asm</Filename>

-      <Filename>x64\x64Math.c</Filename>

-      <Filename>x64\EbcSupport.c</Filename>

+      <Filename>x64/EbcLowLevel.asm</Filename>

+      <Filename>x64/x64Math.c</Filename>

+      <Filename>x64/EbcSupport.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\EbcLowLevel.s</Filename>

-      <Filename>Ipf\IpfMath.c</Filename>

-      <Filename>Ipf\IpfMul.s</Filename>

-      <Filename>Ipf\EbcSupport.c</Filename>

+      <Filename>Ipf/EbcLowLevel.s</Filename>

+      <Filename>Ipf/IpfMath.c</Filename>

+      <Filename>Ipf/IpfMul.s</Filename>

+      <Filename>Ipf/EbcSupport.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/build.xml b/EdkModulePkg/Universal/Ebc/Dxe/build.xml
index 2145923e2a..93f107b3f6 100644
--- a/EdkModulePkg/Universal/Ebc/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Ebc/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="Universal\Ebc\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="Universal/Ebc/Dxe"/>

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

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

    <target name="Ebc">

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

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

    </target>

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

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

    <target name="Ebc_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="Ebc_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
index e5142bed73..937fa617dd 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
@@ -53,7 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>InitVariable.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\InitVariable.c</Filename>

+      <Filename>Ipf/InitVariable.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml
index b2767a2608..11153e69dc 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/EmuVariable/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="Universal\EmuVariable\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="Universal/EmuVariable/RuntimeDxe"/>

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

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

    <target name="EmuVariable">

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

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

    </target>

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

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

    <target name="EmuVariable_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="EmuVariable_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
index 06eb47c2a2..81cd125882 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
@@ -46,16 +46,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>FtwWorkSpace.c</Filename>

     <Filename>FtwLite.dxs</Filename>

     <Arch ArchType="IA32">

-      <Filename>ia32\Ia32FtwMisc.c</Filename>

+      <Filename>ia32/Ia32FtwMisc.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>x64\x64FtwMisc.c</Filename>

+      <Filename>x64/x64FtwMisc.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\IpfFtwMisc.c</Filename>

+      <Filename>Ipf/IpfFtwMisc.c</Filename>

     </Arch>

     <Arch ArchType="EBC">

-      <Filename>ia32\Ia32FtwMisc.c</Filename>

+      <Filename>ia32/Ia32FtwMisc.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml
index 0883c25cba..37d04b5218 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/build.xml
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/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="Universal\FirmwareVolume\FaultTolerantWriteLite\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="Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe"/>

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

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

    <target name="FtwLite">

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

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

    </target>

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

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

    <target name="FtwLite_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="FtwLite_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml
index 7582701719..774e588d9b 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/build.xml
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/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="Universal\FirmwareVolume\GuidedSectionExtraction\Crc32SectionExtract\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="Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe"/>

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

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

    <target name="Crc32SectionExtract">

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

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

    </target>

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

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

    <target name="Crc32SectionExtract_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="Crc32SectionExtract_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml b/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml
index c392081b01..0556891464 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/build.xml
+++ b/EdkModulePkg/Universal/GenericMemoryTest/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="Universal\GenericMemoryTest\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="Universal/GenericMemoryTest/Dxe"/>

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

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

    <target name="NullMemoryTest">

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

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

    </target>

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

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

    <target name="NullMemoryTest_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="NullMemoryTest_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml b/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml
index 4a96b6bda8..cf6dfea127 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/build.xml
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Pei/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="Universal\GenericMemoryTest\Pei"/>

-   <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="Universal/GenericMemoryTest/Pei"/>

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

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

    <target name="PeiBaseMemoryTestInit">

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

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

    </target>

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

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

    <target name="PeiBaseMemoryTestInit_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="PeiBaseMemoryTestInit_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml
index ef6b8c4aa9..88115e453d 100644
--- a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/MonotonicCounter/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="Universal\MonotonicCounter\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="Universal/MonotonicCounter/RuntimeDxe"/>

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

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

    <target name="MonotonicCounter">

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

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

    </target>

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

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

    <target name="MonotonicCounter_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="MonotonicCounter_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml b/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml
index 8ead9eabcc..e0b5ee64b0 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Network/PxeBc/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="Universal\Network\PxeBc\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="Universal/Network/PxeBc/Dxe"/>

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

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

    <target name="BC">

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

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

    </target>

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

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

    <target name="BC_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="BC_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml
index e7afd62b68..086aefce9a 100644
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/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="Universal\Network\PxeDhcp4\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="Universal/Network/PxeDhcp4/Dxe"/>

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

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

    <target name="Dhcp4">

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

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

    </target>

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

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

    <target name="Dhcp4_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="Dhcp4_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml
index 7387603fb3..74b81f4414 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Network/Snp32_64/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="Universal\Network\Snp32_64\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="Universal/Network/Snp32_64/Dxe"/>

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

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

    <target name="SNP">

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

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

    </target>

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

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

    <target name="SNP_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="SNP_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
index 8b918ab205..5d9a92f854 100644
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
+++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
@@ -49,15 +49,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Runtime.h</Filename>

     <Filename>Crc32.c</Filename>

     <Arch ArchType="IA32">

-      <Filename>Ia32\PeHotRelocateEx.c</Filename>

+      <Filename>Ia32/PeHotRelocateEx.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>x64\PeHotRelocateEx.c</Filename>

-      <Filename>x64\PeHotRelocateEx.h</Filename>

+      <Filename>x64/PeHotRelocateEx.c</Filename>

+      <Filename>x64/PeHotRelocateEx.h</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\PeHotRelocateEx.c</Filename>

-      <Filename>Ipf\PeHotRelocateEx.h</Filename>

+      <Filename>Ipf/PeHotRelocateEx.c</Filename>

+      <Filename>Ipf/PeHotRelocateEx.h</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml b/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml
index d11bd8deb4..48f5fe7205 100644
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/Runtime/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="Universal\Runtime\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="Universal/Runtime/RuntimeDxe"/>

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

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

    <target name="Runtime">

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

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

    </target>

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

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

    <target name="Runtime_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="Runtime_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml
index 991db08208..62347a3ba5 100644
--- a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/build.xml
+++ b/EdkModulePkg/Universal/Security/SecurityStub/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="Universal\Security\SecurityStub\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="Universal/Security/SecurityStub/Dxe"/>

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

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

    <target name="SecurityStub">

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

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

    </target>

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

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

    <target name="SecurityStub_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="SecurityStub_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.msa b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.msa
index b0d888b963..79d8695d25 100644
--- a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.msa
@@ -49,16 +49,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>StatusCode.c</Filename>

     <Filename>StatusCode.h</Filename>

     <Arch ArchType="IA32">

-      <Filename>Ia32\Ia32StatusCode.c</Filename>

-      <Filename>Ia32\Ia32StatusCode.dxs</Filename>

+      <Filename>Ia32/Ia32StatusCode.c</Filename>

+      <Filename>Ia32/Ia32StatusCode.dxs</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>x64\x64StatusCode.c</Filename>

-      <Filename>x64\x64StatusCode.dxs</Filename>

+      <Filename>x64/x64StatusCode.c</Filename>

+      <Filename>x64/x64StatusCode.dxs</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\IpfStatusCode.c</Filename>

-      <Filename>Ipf\IpfStatusCode.dxs</Filename>

+      <Filename>Ipf/IpfStatusCode.c</Filename>

+      <Filename>Ipf/IpfStatusCode.dxs</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml
index 994d073598..73760684aa 100644
--- a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/StatusCode/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="Universal\StatusCode\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="Universal/StatusCode/RuntimeDxe"/>

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

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

    <target name="StatusCode">

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

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

    </target>

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

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

    <target name="StatusCode_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="StatusCode_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml
index 7ffdb7c013..f39f754091 100644
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/build.xml
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/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="Universal\UserInterface\HiiDataBase\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="Universal/UserInterface/HiiDataBase/Dxe"/>

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

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

    <target name="HiiDatabase">

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

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

    </target>

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

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

    <target name="HiiDatabase_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="HiiDatabase_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml
index 1263279552..5cc8859f7b 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/build.xml
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/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="Universal\UserInterface\SetupBrowser\Dxe\DriverSample"/>

-   <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="Universal/UserInterface/SetupBrowser/Dxe/DriverSample"/>

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

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

    <target name="DriverSample">

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

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

    </target>

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

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

    <target name="DriverSample_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="DriverSample_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml
index a94cdfa58c..8e3b5c5cec 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/build.xml
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/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="Universal\UserInterface\SetupBrowser\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="Universal/UserInterface/SetupBrowser/Dxe"/>

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

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

    <target name="SetupBrowser">

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

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

    </target>

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

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

    <target name="SetupBrowser_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="SetupBrowser_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Variable/Pei/build.xml b/EdkModulePkg/Universal/Variable/Pei/build.xml
index c6b57f9f77..95255e7613 100644
--- a/EdkModulePkg/Universal/Variable/Pei/build.xml
+++ b/EdkModulePkg/Universal/Variable/Pei/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="Universal\Variable\Pei"/>

-   <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="Universal/Variable/Pei"/>

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

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

    <target name="PeiVariable">

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

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

    </target>

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

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

    <target name="PeiVariable_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="PeiVariable_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.msa
index 5a7a5f8447..6ecc152b59 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.msa
@@ -44,13 +44,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>EmuVariable.c</Filename>

     <Filename>EmuVariable.dxs</Filename>

     <Arch ArchType="IA32">

-      <Filename>..\Ia32\Ia32Variable.c</Filename>

+      <Filename>../Ia32/Ia32Variable.c</Filename>

     </Arch>

     <Arch ArchType="X64">

-      <Filename>..\x64\x64Variable.c</Filename>

+      <Filename>../x64/x64Variable.c</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>..\Ipf\IpfVariable.c</Filename>

+      <Filename>../Ipf/IpfVariable.c</Filename>

     </Arch>

   </SourceFiles>

   <Includes>

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/build.xml b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/build.xml
index 0035ab957b..11ad9af405 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/build.xml
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/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="Universal\Variable\RuntimeDxe\Emu"/>

-   <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="Universal/Variable/RuntimeDxe/Emu"/>

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

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

    <target name="EmuVariable">

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

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

    </target>

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

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

    <target name="EmuVariable_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="EmuVariable_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index a4399bc0d2..a750f2e033 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -60,7 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>x64Variable.dxs</Filename>

     </Arch>

     <Arch ArchType="IPF">

-      <Filename>Ipf\InitVariable.c</Filename>

+      <Filename>Ipf/InitVariable.c</Filename>

       <Filename>IpfVariable.dxs</Filename>

     </Arch>

   </SourceFiles>

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml b/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml
index 4eba6a6933..5e948e35f0 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/build.xml
+++ b/EdkModulePkg/Universal/Variable/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="Universal\Variable\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="Universal/Variable/RuntimeDxe"/>

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

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

    <target name="Variable">

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

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

    </target>

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

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

    <target name="Variable_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="Variable_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

diff --git a/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml b/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml
index 76f67c162e..976ba17b84 100644
--- a/EdkModulePkg/Universal/WatchdogTimer/Dxe/build.xml
+++ b/EdkModulePkg/Universal/WatchdogTimer/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="Universal\WatchdogTimer\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="Universal/WatchdogTimer/Dxe"/>

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

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

    <target name="WatchDogTimer">

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

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

    </target>

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

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

    <target name="WatchDogTimer_clean">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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

    </target>

    <target name="WatchDogTimer_cleanall">

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

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

       <if>

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

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

          <then>

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

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

          </then>

       </if>

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