BaseTools: Update nmake Makefile to handle the file path with “:\\”.

DOS del command doesn’t handle “:\\” in the file path. This patch converts “:\\” to “:\”.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: lhauch <larry.hauch@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16160 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common
index d2f0b598cc3c0e62e0b5242d3f39c14a9749ca8d..9e50b217fc86a1001f9c644ad513570fd00add50 100644 (file)
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -25,6 +25,10 @@ ARCH = IA32
 \r
 MAKE        = nmake -nologo\r
 \r
+# DOS del command doesn't support ":\\" in the file path, such as j:\\BaseTools. Convert ":\\" to ":\"\r
+BASE_TOOLS_PATH = $(BASE_TOOLS_PATH::\\=:\)\r
+EDK_TOOLS_PATH  = $(EDK_TOOLS_PATH::\\=:\)\r
+\r
 SOURCE_PATH = $(BASE_TOOLS_PATH)\Source\C\r
 BIN_PATH    = $(BASE_TOOLS_PATH)\Bin\r
 LIB_PATH    = $(BASE_TOOLS_PATH)\Lib\r

diff --git a/BaseTools/Source/Python/Makefile b/BaseTools/Source/Python/Makefile
index fb88cebbf7b51b557f953938193b4fea6104988d..d72e8789b650a0f2a360077c7dbbcff51e4741c5 100644 (file)
--- a/BaseTools/Source/Python/Makefile
+++ b/BaseTools/Source/Python/Makefile
@@ -25,6 +25,10 @@ FREEZE=$(PYTHON_FREEZER_PATH)\FreezePython.exe
 \r
 MODULES=encodings.cp437,encodings.gbk,encodings.utf_16,encodings.utf_8,encodings.utf_16_le,encodings.latin_1,encodings.ascii\r
 \r
+# DOS del command doesn't support ":\\" in the file path, such as j:\\BaseTools. Convert ":\\" to ":\"\r
+BASE_TOOLS_PATH = $(BASE_TOOLS_PATH::\\=:\)\r
+EDK_TOOLS_PATH  = $(EDK_TOOLS_PATH::\\=:\)\r
+\r
 BIN_DIR=$(EDK_TOOLS_PATH)\Bin\Win32\r
 \r
 APPLICATIONS=$(BIN_DIR)\build.exe $(BIN_DIR)\GenFds.exe $(BIN_DIR)\Trim.exe $(BIN_DIR)\TargetTool.exe $(BIN_DIR)\GenDepex.exe $(BIN_DIR)\GenPatchPcdTable.exe $(BIN_DIR)\PatchPcdValue.exe $(BIN_DIR)\BPDG.exe $(BIN_DIR)\UPT.exe $(BIN_DIR)\Rsa2048Sha256Sign.exe $(BIN_DIR)\Rsa2048Sha256GenerateKeys.exe\r