DuetPkg: Use 'echo off' in BATCH script files

Instead of putting a '@' at the beginning of every command in BATCH script
files, use 'echo off' at the beginning of each file.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

diff --git a/DuetPkg/CreateBootDisk.bat b/DuetPkg/CreateBootDisk.bat
index 214b5b6925a54e35d14d57d3f287fd7a53f97e75..7265837194cd367c02e9e6efb04b1ae932977af7 100644 (file)
--- a/DuetPkg/CreateBootDisk.bat
+++ b/DuetPkg/CreateBootDisk.bat
@@ -1,3 +1,4 @@
+@echo off\r
 @REM ## @file\r
 @REM #\r
 @REM #  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
@@ -14,133 +15,133 @@
 \r
 @REM Set up environment at first.\r
 \r
-@set BASETOOLS_DIR=%WORKSPACE_TOOLS_PATH%\Bin\Win32\r
-@set BOOTSECTOR_BIN_DIR=%WORKSPACE%\DuetPkg\BootSector\bin\r
-@set DISK_LABEL=DUET\r
-@set PROCESSOR=""\r
-@set STEP=1\r
-@call %WORKSPACE%\DuetPkg\GetVariables.bat\r
-\r
-@echo on\r
-\r
-@if "%1"=="" goto Help\r
-@if "%2"=="" goto Help\r
-@if "%3"=="" goto Help\r
-@if "%4"=="" goto Set_BootDisk\r
-@if "%4"=="step2" (@set STEP=2) else @set TARGET_ARCH=%4\r
-@if "%5"=="step2" @set STEP=2\r
+set BASETOOLS_DIR=%WORKSPACE_TOOLS_PATH%\Bin\Win32\r
+set BOOTSECTOR_BIN_DIR=%WORKSPACE%\DuetPkg\BootSector\bin\r
+set DISK_LABEL=DUET\r
+set PROCESSOR=""\r
+set STEP=1\r
+call %WORKSPACE%\DuetPkg\GetVariables.bat\r
+\r
+echo on\r
+\r
+if "%1"=="" goto Help\r
+if "%2"=="" goto Help\r
+if "%3"=="" goto Help\r
+if "%4"=="" goto Set_BootDisk\r
+if "%4"=="step2" (@set STEP=2) else @set TARGET_ARCH=%4\r
+if "%5"=="step2" @set STEP=2\r
 :Set_BootDisk\r
-@set EFI_BOOT_DISK=%2\r
-@if "%TARGET_ARCH%"=="IA32" set PROCESSOR=IA32\r
-@if "%TARGET_ARCH%"=="X64" set PROCESSOR=X64\r
-@if %PROCESSOR%=="" goto WrongArch\r
-@set BUILD_DIR=%WORKSPACE%\Build\DuetPkg%PROCESSOR%\%TARGET%_%TOOL_CHAIN_TAG%\r
+set EFI_BOOT_DISK=%2\r
+if "%TARGET_ARCH%"=="IA32" set PROCESSOR=IA32\r
+if "%TARGET_ARCH%"=="X64" set PROCESSOR=X64\r
+if %PROCESSOR%=="" goto WrongArch\r
+set BUILD_DIR=%WORKSPACE%\Build\DuetPkg%PROCESSOR%\%TARGET%_%TOOL_CHAIN_TAG%\r
 \r
-@if "%1"=="floppy" goto CreateFloppy\r
-@if "%1"=="file" goto CreateFile\r
-@if "%1"=="usb" goto CreateUsb\r
-@if "%1"=="ide" goto CreateIde\r
+if "%1"=="floppy" goto CreateFloppy\r
+if "%1"=="file" goto CreateFile\r
+if "%1"=="usb" goto CreateUsb\r
+if "%1"=="ide" goto CreateIde\r
 \r
 goto Help\r
 \r
 :CreateFloppy\r
-@if NOT "%3"=="FAT12" goto WrongFATType\r
-@echo Start to create floppy boot disk ...\r
-@echo Format %EFI_BOOT_DISK% ...\r
-@echo.> FormatCommandInput.txt\r
-@echo.n>> FormatCommandInput.txt\r
-@format /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL\r
-@del FormatCommandInput.txt\r
-@echo Create boot sector ...\r
-@%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com\r
-@copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com\r
-@%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f\r
+if NOT "%3"=="FAT12" goto WrongFATType\r
+echo Start to create floppy boot disk ...\r
+echo Format %EFI_BOOT_DISK% ...\r
+echo.> FormatCommandInput.txt\r
+echo.n>> FormatCommandInput.txt\r
+format /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL\r
+del FormatCommandInput.txt\r
+echo Create boot sector ...\r
+%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com\r
+copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com\r
+%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f\r
 @REM @del FDBS.com\r
-@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com\r
-@del FDBs-1.com\r
-@echo Done.\r
-@copy %BUILD_DIR%\FV\EfiLdr %EFI_BOOT_DISK%\r
-@goto CreateBootFile\r
+%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com\r
+del FDBs-1.com\r
+echo Done.\r
+copy %BUILD_DIR%\FV\EfiLdr %EFI_BOOT_DISK%\r
+goto CreateBootFile\r
 \r
 :CreateFile\r
-@if NOT "%3"=="FAT12" goto WrongFATType\r
-@echo Start to create file boot disk ...\r
-@echo Create boot sector ...\r
+if NOT "%3"=="FAT12" goto WrongFATType\r
+echo Start to create file boot disk ...\r
+echo Create boot sector ...\r
 %BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com\r
-@copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com\r
-@%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f\r
-@REM @del FDBS.com\r
-@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com\r
-@del FDBs-1.com\r
-@echo Done.\r
-@goto end\r
+copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com\r
+%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f\r
+REM @del FDBS.com\r
+%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com\r
+del FDBs-1.com\r
+echo Done.\r
+goto end\r
 \r
 :CreateUsb\r
-@echo Start to create usb boot disk ...\r
-@if "%3"=="FAT16" goto CreateUsb_FAT16\r
-@if "%3"=="FAT32" goto CreateUsb_FAT32\r
-@if "%3"=="FAT12" goto WrongFATType\r
+echo Start to create usb boot disk ...\r
+if "%3"=="FAT16" goto CreateUsb_FAT16\r
+if "%3"=="FAT32" goto CreateUsb_FAT32\r
+if "%3"=="FAT12" goto WrongFATType\r
 \r
 :CreateUsb_FAT16\r
-@if "%STEP%"=="2" goto CreateUsb_FAT16_step2\r
-@echo Format %EFI_BOOT_DISK% ...\r
-@echo.> FormatCommandInput.txt\r
-@format /FS:FAT /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL\r
-@del FormatCommandInput.txt\r
-@echo Create boot sector ...\r
-@%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o UsbBs16.com\r
-@copy %BOOTSECTOR_BIN_DIR%\Bs16.com Bs16-1.com\r
-@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs16.com Bs16-1.com -f\r
-@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i Bs16-1.com\r
-@del Bs16-1.com\r
-@%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com\r
-@echo Done.\r
-@echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN!\r
-@goto end\r
+if "%STEP%"=="2" goto CreateUsb_FAT16_step2\r
+echo Format %EFI_BOOT_DISK% ...\r
+echo.> FormatCommandInput.txt\r
+format /FS:FAT /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL\r
+del FormatCommandInput.txt\r
+echo Create boot sector ...\r
+%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o UsbBs16.com\r
+copy %BOOTSECTOR_BIN_DIR%\Bs16.com Bs16-1.com\r
+%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs16.com Bs16-1.com -f\r
+%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i Bs16-1.com\r
+del Bs16-1.com\r
+%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com\r
+echo Done.\r
+echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN!\r
+goto end\r
 \r
 :CreateUsb_FAT16_step2\r
-@copy %BUILD_DIR%\FV\EfiLdr16 %EFI_BOOT_DISK%\r
-@goto CreateBootFile\r
+copy %BUILD_DIR%\FV\EfiLdr16 %EFI_BOOT_DISK%\r
+goto CreateBootFile\r
 \r
 :CreateUsb_FAT32\r
-@if "%STEP%"=="2" goto CreateUsb_FAT32_step2\r
-@echo Format %EFI_BOOT_DISK% ...\r
-@echo.> FormatCommandInput.txt\r
-@format /FS:FAT32 /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL\r
-@del FormatCommandInput.txt\r
-@echo Create boot sector ...\r
-@%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o UsbBs32.com\r
-@copy %BOOTSECTOR_BIN_DIR%\Bs32.com Bs32-1.com\r
-@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs32.com Bs32-1.com -f\r
-@del UsbBs32.com\r
-@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i Bs32-1.com\r
-@del Bs32-1.com\r
-@%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com\r
-@echo Done.\r
-@echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN!\r
-@goto end\r
+if "%STEP%"=="2" goto CreateUsb_FAT32_step2\r
+echo Format %EFI_BOOT_DISK% ...\r
+echo.> FormatCommandInput.txt\r
+format /FS:FAT32 /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL\r
+del FormatCommandInput.txt\r
+echo Create boot sector ...\r
+%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o UsbBs32.com\r
+copy %BOOTSECTOR_BIN_DIR%\Bs32.com Bs32-1.com\r
+%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs32.com Bs32-1.com -f\r
+del UsbBs32.com\r
+%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i Bs32-1.com\r
+del Bs32-1.com\r
+%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com\r
+echo Done.\r
+echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN!\r
+goto end\r
 \r
 :CreateUsb_FAT32_step2\r
-@copy %BUILD_DIR%\FV\EfiLdr20 %EFI_BOOT_DISK%\r
-@goto CreateBootFile\r
+copy %BUILD_DIR%\FV\EfiLdr20 %EFI_BOOT_DISK%\r
+goto CreateBootFile\r
 \r
 :CreateIde\r
-@goto end\r
+goto end\r
 \r
 :CreateBootFile\r
-@mkdir %EFI_BOOT_DISK%\efi\boot\r
+mkdir %EFI_BOOT_DISK%\efi\boot\r
 copy %WORKSPACE%\ShellBinPkg\UefiShell\%PROCESSOR%\Shell.efi %EFI_BOOT_DISK%\efi\boot\boot%PROCESSOR%.efi /y\r
-@goto end\r
+goto end\r
 \r
 :WrongFATType\r
-@echo Wrong FAT type %3 for %1\r
-@goto end\r
+echo Wrong FAT type %3 for %1\r
+goto end\r
 \r
 :WrongArch\r
-@echo Error! Wrong architecture.\r
-@goto Help\r
+echo Error! Wrong architecture.\r
+goto Help\r
 \r
 :Help\r
-@echo "Usage: CreateBootDisk [usb|floppy|ide] DiskNumber [FAT12|FAT16|FAT32] [IA32|X64]"\r
+echo "Usage: CreateBootDisk [usb|floppy|ide] DiskNumber [FAT12|FAT16|FAT32] [IA32|X64]"\r
 :end\r
-@echo on\r
+echo on\r

diff --git a/DuetPkg/GetVariables.bat b/DuetPkg/GetVariables.bat
index c781228854711f8dc9c5fe67bbdbb2464c6c1653..c81d3d1604039aba336dc04856c5620ab9607120 100644 (file)
--- a/DuetPkg/GetVariables.bat
+++ b/DuetPkg/GetVariables.bat
@@ -1,3 +1,4 @@
+@echo off\r
 @REM ## @file\r
 @REM #\r
 @REM #  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
@@ -19,20 +20,20 @@
 @REM the original equal sign for our first assignation. Then we trim any left whitespaces.\r
 @REM NB: default token delimiters for "for /f" are tab and space.\r
 \r
-@set CONFIG_FILE=%WORKSPACE%\Conf\target.txt\r
+set CONFIG_FILE=%WORKSPACE%\Conf\target.txt\r
 \r
-@for /f "tokens=1*" %%i in ('type %CONFIG_FILE% ^| find "TOOL_CHAIN_TAG" ^| find /V "#"') do @set TOOL_CHAIN_TAG%%j\r
-@for /f "tokens=*" %%i in ("%TOOL_CHAIN_TAG%") do @set TOOL_CHAIN_TAG=%%i\r
+for /f "tokens=1*" %%i in ('type %CONFIG_FILE% ^| find "TOOL_CHAIN_TAG" ^| find /V "#"') do @set TOOL_CHAIN_TAG%%j\r
+for /f "tokens=*" %%i in ("%TOOL_CHAIN_TAG%") do @set TOOL_CHAIN_TAG=%%i\r
 \r
-@for /f "tokens=1*" %%i in ('type %CONFIG_FILE% ^| find "TARGET" ^| find /V "#" ^| find /V "TARGET_ARCH"') do @set TARGET%%j\r
-@for /f "tokens=*" %%i in ("%TARGET%") do @set TARGET=%%i\r
+for /f "tokens=1*" %%i in ('type %CONFIG_FILE% ^| find "TARGET" ^| find /V "#" ^| find /V "TARGET_ARCH"') do @set TARGET%%j\r
+for /f "tokens=*" %%i in ("%TARGET%") do @set TARGET=%%i\r
 \r
-@for /f "tokens=1*" %%i in ('type %CONFIG_FILE% ^| find "TARGET_ARCH" ^|find /V "#"') do @set TARGET_ARCH%%j\r
-@for /f "tokens=*" %%i in ("%TARGET_ARCH%") do @set TARGET_ARCH=%%i\r
+for /f "tokens=1*" %%i in ('type %CONFIG_FILE% ^| find "TARGET_ARCH" ^|find /V "#"') do @set TARGET_ARCH%%j\r
+for /f "tokens=*" %%i in ("%TARGET_ARCH%") do @set TARGET_ARCH=%%i\r
 \r
 \r
-@REM Set defaults if above variables are undefined in target.txt\r
+REM Set defaults if above variables are undefined in target.txt\r
 \r
-@if "%TOOL_CHAIN_TAG%%"=="" @set TOOL_CHAIN_TAG=MYTOOLS\r
-@if "%TARGET%"=="" @set TARGET=DEBUG\r
-@if "%TARGET_ARCH%"=="" @set TARGET_ARCH=IA32\r
+if "%TOOL_CHAIN_TAG%%"=="" @set TOOL_CHAIN_TAG=MYTOOLS\r
+if "%TARGET%"=="" @set TARGET=DEBUG\r
+if "%TARGET_ARCH%"=="" @set TARGET_ARCH=IA32\r

diff --git a/DuetPkg/PostBuild.bat b/DuetPkg/PostBuild.bat
index df34fa7f9a2e4fdc8297932230e9dde3216556e3..28cab6b665ac4e5c426df60cebb5e23aa2574420 100644 (file)
--- a/DuetPkg/PostBuild.bat
+++ b/DuetPkg/PostBuild.bat
@@ -1,3 +1,4 @@
+@echo off\r
 @REM ## @file\r
 @REM #\r
 @REM #  Currently, Build system does not provide post build mechanism for module\r
@@ -16,54 +17,54 @@
 @REM #\r
 @REM ##\r
 \r
-@set BASETOOLS_DIR=%WORKSPACE_TOOLS_PATH%\Bin\Win32\r
-@set BOOTSECTOR_BIN_DIR=%WORKSPACE%\DuetPkg\BootSector\bin\r
-@set PROCESSOR=""\r
-@call %WORKSPACE%\DuetPkg\GetVariables.bat\r
+set BASETOOLS_DIR=%WORKSPACE_TOOLS_PATH%\Bin\Win32\r
+set BOOTSECTOR_BIN_DIR=%WORKSPACE%\DuetPkg\BootSector\bin\r
+set PROCESSOR=""\r
+call %WORKSPACE%\DuetPkg\GetVariables.bat\r
 \r
-@if NOT "%1"=="" @set TARGET_ARCH=%1\r
-@if "%TARGET_ARCH%"=="IA32" set PROCESSOR=IA32\r
-@if "%TARGET_ARCH%"=="X64" set PROCESSOR=X64\r
-@if %PROCESSOR%=="" goto WrongArch\r
+if NOT "%1"=="" @set TARGET_ARCH=%1\r
+if "%TARGET_ARCH%"=="IA32" set PROCESSOR=IA32\r
+if "%TARGET_ARCH%"=="X64" set PROCESSOR=X64\r
+if %PROCESSOR%=="" goto WrongArch\r
 \r
-@set BUILD_DIR=%WORKSPACE%\Build\DuetPkg%PROCESSOR%\%TARGET%_%TOOL_CHAIN_TAG%\r
+set BUILD_DIR=%WORKSPACE%\Build\DuetPkg%PROCESSOR%\%TARGET%_%TOOL_CHAIN_TAG%\r
 \r
 \r
-@echo Compressing DUETEFIMainFv.FV ...\r
-@%BASETOOLS_DIR%\LzmaCompress -e -o %BUILD_DIR%\FV\DUETEFIMAINFV.z %BUILD_DIR%\FV\DUETEFIMAINFV.Fv\r
+echo Compressing DUETEFIMainFv.FV ...\r
+%BASETOOLS_DIR%\LzmaCompress -e -o %BUILD_DIR%\FV\DUETEFIMAINFV.z %BUILD_DIR%\FV\DUETEFIMAINFV.Fv\r
 \r
-@echo Compressing DxeMain.efi ...\r
-@%BASETOOLS_DIR%\LzmaCompress -e -o %BUILD_DIR%\FV\DxeMain.z %BUILD_DIR%\%PROCESSOR%\DxeCore.efi\r
+echo Compressing DxeMain.efi ...\r
+%BASETOOLS_DIR%\LzmaCompress -e -o %BUILD_DIR%\FV\DxeMain.z %BUILD_DIR%\%PROCESSOR%\DxeCore.efi\r
 \r
-@echo Compressing DxeIpl.efi ...\r
-@%BASETOOLS_DIR%\LzmaCompress -e -o %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\%PROCESSOR%\DxeIpl.efi\r
+echo Compressing DxeIpl.efi ...\r
+%BASETOOLS_DIR%\LzmaCompress -e -o %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\%PROCESSOR%\DxeIpl.efi\r
 \r
-@echo Generate Loader Image ...\r
-@if "%PROCESSOR%"=="IA32" goto GENERATE_IMAGE_IA32\r
-@if "%PROCESSOR%"=="X64" goto GENERATE_IMAGE_X64\r
+echo Generate Loader Image ...\r
+if "%PROCESSOR%"=="IA32" goto GENERATE_IMAGE_IA32\r
+if "%PROCESSOR%"=="X64" goto GENERATE_IMAGE_X64\r
 \r
 :GENERATE_IMAGE_IA32\r
-@%BASETOOLS_DIR%\EfiLdrImage.exe -o %BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\%PROCESSOR%\EfiLoader.efi %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\FV\DxeMain.z %BUILD_DIR%\FV\DUETEFIMAINFV.z\r
-@copy /b %BOOTSECTOR_BIN_DIR%\Start.com+%BOOTSECTOR_BIN_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr\r
-@copy /b %BOOTSECTOR_BIN_DIR%\Start16.com+%BOOTSECTOR_BIN_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr16\r
-@copy /b %BOOTSECTOR_BIN_DIR%\Start32.com+%BOOTSECTOR_BIN_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr20\r
-@goto end\r
+%BASETOOLS_DIR%\EfiLdrImage.exe -o %BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\%PROCESSOR%\EfiLoader.efi %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\FV\DxeMain.z %BUILD_DIR%\FV\DUETEFIMAINFV.z\r
+copy /b %BOOTSECTOR_BIN_DIR%\Start.com+%BOOTSECTOR_BIN_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr\r
+copy /b %BOOTSECTOR_BIN_DIR%\Start16.com+%BOOTSECTOR_BIN_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr16\r
+copy /b %BOOTSECTOR_BIN_DIR%\Start32.com+%BOOTSECTOR_BIN_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr20\r
+goto end\r
 \r
 :GENERATE_IMAGE_X64\r
-@%BASETOOLS_DIR%\EfiLdrImage.exe -o %BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\%PROCESSOR%\EfiLoader.efi %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\FV\DxeMain.z %BUILD_DIR%\FV\DUETEFIMAINFV.z\r
-@copy /b %BOOTSECTOR_BIN_DIR%\Start64.com+%BOOTSECTOR_BIN_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\EfildrPure\r
-@%BASETOOLS_DIR%\GenPage.exe %BUILD_DIR%\FV\EfildrPure -o %BUILD_DIR%\FV\Efildr\r
-@copy /b %BOOTSECTOR_BIN_DIR%\St16_64.com+%BOOTSECTOR_BIN_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\Efildr16Pure\r
-@%BASETOOLS_DIR%\GenPage.exe %BUILD_DIR%\FV\Efildr16Pure -o %BUILD_DIR%\FV\Efildr16\r
-@copy /b %BOOTSECTOR_BIN_DIR%\St32_64.com+%BOOTSECTOR_BIN_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\Efildr20Pure\r
-@%BASETOOLS_DIR%\GenPage.exe %BUILD_DIR%\FV\Efildr20Pure -o %BUILD_DIR%\FV\Efildr20\r
-@goto end\r
+%BASETOOLS_DIR%\EfiLdrImage.exe -o %BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\%PROCESSOR%\EfiLoader.efi %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\FV\DxeMain.z %BUILD_DIR%\FV\DUETEFIMAINFV.z\r
+copy /b %BOOTSECTOR_BIN_DIR%\Start64.com+%BOOTSECTOR_BIN_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\EfildrPure\r
+%BASETOOLS_DIR%\GenPage.exe %BUILD_DIR%\FV\EfildrPure -o %BUILD_DIR%\FV\Efildr\r
+copy /b %BOOTSECTOR_BIN_DIR%\St16_64.com+%BOOTSECTOR_BIN_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\Efildr16Pure\r
+%BASETOOLS_DIR%\GenPage.exe %BUILD_DIR%\FV\Efildr16Pure -o %BUILD_DIR%\FV\Efildr16\r
+copy /b %BOOTSECTOR_BIN_DIR%\St32_64.com+%BOOTSECTOR_BIN_DIR%\Efi64.com2+%BUILD_DIR%\FV\Efildr64 %BUILD_DIR%\FV\Efildr20Pure\r
+%BASETOOLS_DIR%\GenPage.exe %BUILD_DIR%\FV\Efildr20Pure -o %BUILD_DIR%\FV\Efildr20\r
+goto end\r
 \r
 \r
 :WrongArch\r
-@echo Error! Wrong architecture.\r
-@goto Help\r
+echo Error! Wrong architecture.\r
+goto Help\r
 \r
 :Help\r
-@echo Usage: "PostBuild [IA32|X64]"\r
+echo Usage: "PostBuild [IA32|X64]"\r
 :end
\ No newline at end of file