Sync BaseTool trunk (version r2649) into EDKII BaseTools.

Signed-off-by: Gao, Liming <liming.gao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15188 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 164 insertions, 164 deletions

diff --git a/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat b/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat
index 25b8790ac5..fac89bd9ee 100644
--- a/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat
+++ b/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat
@@ -7,7 +7,7 @@
 @REM # http://opensource.org/licenses/bsd-license.php

 @REM #

 @REM # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-@REM # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 

 @echo off

diff --git a/BaseTools/Source/C/Makefiles/app.makefile b/BaseTools/Source/C/Makefiles/app.makefile
index ed2e2fba08..19269a13a9 100644
--- a/BaseTools/Source/C/Makefiles/app.makefile
+++ b/BaseTools/Source/C/Makefiles/app.makefile
@@ -1,27 +1,27 @@
-## @file
-#
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.    The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-
-MAKEROOT ?= ../..
-
-include $(MAKEROOT)/Makefiles/header.makefile
-
-APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
-
-.PHONY:all
-all: $(MAKEROOT)/bin $(APPLICATION) 
-
-$(APPLICATION): $(OBJECTS) 
-	$(LINKER) -o $(APPLICATION) $(LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
-
-$(OBJECTS): ../Include/Common/BuildVersion.h
-
-include $(MAKEROOT)/Makefiles/footer.makefile
+## @file

+#

+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# This program and the accompanying materials

+# are licensed and made available under the terms and conditions of the BSD License

+# which accompanies this distribution.    The full text of the license may be found at

+# http://opensource.org/licenses/bsd-license.php

+#

+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+#

+

+MAKEROOT ?= ../..

+

+include $(MAKEROOT)/Makefiles/header.makefile

+

+APPLICATION = $(MAKEROOT)/bin/$(APPNAME)

+

+.PHONY:all

+all: $(MAKEROOT)/bin $(APPLICATION) 

+

+$(APPLICATION): $(OBJECTS) 

+	$(LINKER) -o $(APPLICATION) $(LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)

+

+$(OBJECTS): ../Include/Common/BuildVersion.h

+

+include $(MAKEROOT)/Makefiles/footer.makefile

diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile
index de7114257d..c10ad7aab4 100644
--- a/BaseTools/Source/C/Makefiles/footer.makefile
+++ b/BaseTools/Source/C/Makefiles/footer.makefile
@@ -7,28 +7,28 @@
 # http://opensource.org/licenses/bsd-license.php

 #

 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-DEPFILES = $(OBJECTS:%.o=%.d)
-
-$(MAKEROOT)/libs-$(ARCH):
-	mkdir -p $(MAKEROOT)/libs-$(ARCH)
-
-.PHONY: install
-install: $(MAKEROOT)/libs-$(ARCH) $(LIBRARY)
-	cp $(LIBRARY) $(MAKEROOT)/libs-$(ARCH)
-
-$(LIBRARY): $(OBJECTS) 
-	$(AR) crs $@ $^
-
-%.o : %.c 
-	$(CC)  -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-
-%.o : %.S
-	$(AS) -c $(ASFLAGS) $< -o $@
-
-.PHONY: clean
-clean:
-	@rm -f $(OBJECTS) $(LIBRARY) $(DEPFILES)
-
--include $(DEPFILES)
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+DEPFILES = $(OBJECTS:%.o=%.d)

+

+$(MAKEROOT)/libs-$(ARCH):

+	mkdir -p $(MAKEROOT)/libs-$(ARCH)

+

+.PHONY: install

+install: $(MAKEROOT)/libs-$(ARCH) $(LIBRARY)

+	cp $(LIBRARY) $(MAKEROOT)/libs-$(ARCH)

+

+$(LIBRARY): $(OBJECTS) 

+	$(AR) crs $@ $^

+

+%.o : %.c 

+	$(CC)  -c $(CFLAGS) $(CPPFLAGS) $< -o $@

+

+%.o : %.S

+	$(AS) -c $(ASFLAGS) $< -o $@

+

+.PHONY: clean

+clean:

+	@rm -f $(OBJECTS) $(LIBRARY) $(DEPFILES)

+

+-include $(DEPFILES)

diff --git a/BaseTools/Source/C/Makefiles/ms.app b/BaseTools/Source/C/Makefiles/ms.app
index 7812175e7f..455549c121 100644
--- a/BaseTools/Source/C/Makefiles/ms.app
+++ b/BaseTools/Source/C/Makefiles/ms.app
@@ -7,28 +7,28 @@
 # http://opensource.org/licenses/bsd-license.php

 #

 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-!INCLUDE ..\Makefiles\ms.common
-
-APPLICATION = $(BIN_PATH)\$(APPNAME).exe
-
-all: $(APPLICATION) 
-
-$(APPLICATION) : $(OBJECTS) 
-	-@if not exist $(BIN_PATH) mkdir $(BIN_PATH)
-	$(LD) /nologo /debug /incremental:no /nodefaultlib:libc.lib /out:$@ $(LIBS) $**
-
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+!INCLUDE ..\Makefiles\ms.common

+

+APPLICATION = $(BIN_PATH)\$(APPNAME).exe

+

+all: $(APPLICATION) 

+

+$(APPLICATION) : $(OBJECTS) 

+	-@if not exist $(BIN_PATH) mkdir $(BIN_PATH)

+	$(LD) /nologo /debug /incremental:no /nodefaultlib:libc.lib /out:$@ $(LIBS) $**

+

 $(OBJECTS) : ..\Include\Common\BuildVersion.h

 

-.PHONY:clean
-.PHONY:cleanall
-
-clean:
-	del /f /q $(OBJECTS) *.pdb > nul
-
-cleanall:
-	del /f /q $(OBJECTS) $(APPLICATION) *.pdb $(BIN_PATH)\*.pdb > nul
-
-!INCLUDE ..\Makefiles\ms.rule
-
+.PHONY:clean

+.PHONY:cleanall

+

+clean:

+	del /f /q $(OBJECTS) *.pdb > nul

+

+cleanall:

+	del /f /q $(OBJECTS) $(APPLICATION) *.pdb $(BIN_PATH)\*.pdb > nul

+

+!INCLUDE ..\Makefiles\ms.rule

+

diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common
index d2fbc453ee..fa9ffba563 100644
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -7,54 +7,54 @@
 # http://opensource.org/licenses/bsd-license.php

 #

 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-!IFNDEF EDK_TOOLS_PATH
-!ERROR "Please set your EDK_TOOLS_PATH!"
-!ENDIF
-
-!IFNDEF BASE_TOOLS_PATH
-!ERROR "BASE_TOOLS_PATH is not set! Please run build_tools.bat at first!"
-!ENDIF
-
-!IFNDEF ARCH
-ARCH = IA32
-!ENDIF
-
-MAKE        = nmake -nologo
-
-SOURCE_PATH = $(BASE_TOOLS_PATH)\Source\C
-BIN_PATH    = $(BASE_TOOLS_PATH)\Bin
-LIB_PATH    = $(BASE_TOOLS_PATH)\Lib
-
-SYS_BIN_PATH=$(EDK_TOOLS_PATH)\Bin
-SYS_LIB_PATH=$(EDK_TOOLS_PATH)\Lib
-
-!IF "$(ARCH)"=="IA32"
-ARCH_INCLUDE = $(SOURCE_PATH)\Include\Ia32
-BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win32
-LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win32
-SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win32
-SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32
-!ENDIF
-
-!IF "$(ARCH)"=="X64"
-ARCH_INCLUDE = $(SOURCE_PATH)\Include\X64
-BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win64
-LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win64
-SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win64
-SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win64
-!ENDIF
-
-CC = cl.exe
-CXX = cl.exe
-AS = ml.exe
-AR = lib.exe
-LD = link.exe
-LINKER = $(LD)
-
-INC = -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common $(INC)
-
-CFLAGS = $(CFLAGS) /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE 
-CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE 
-
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+!IFNDEF EDK_TOOLS_PATH

+!ERROR "Please set your EDK_TOOLS_PATH!"

+!ENDIF

+

+!IFNDEF BASE_TOOLS_PATH

+!ERROR "BASE_TOOLS_PATH is not set! Please run build_tools.bat at first!"

+!ENDIF

+

+!IFNDEF ARCH

+ARCH = IA32

+!ENDIF

+

+MAKE        = nmake -nologo

+

+SOURCE_PATH = $(BASE_TOOLS_PATH)\Source\C

+BIN_PATH    = $(BASE_TOOLS_PATH)\Bin

+LIB_PATH    = $(BASE_TOOLS_PATH)\Lib

+

+SYS_BIN_PATH=$(EDK_TOOLS_PATH)\Bin

+SYS_LIB_PATH=$(EDK_TOOLS_PATH)\Lib

+

+!IF "$(ARCH)"=="IA32"

+ARCH_INCLUDE = $(SOURCE_PATH)\Include\Ia32

+BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win32

+LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win32

+SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win32

+SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32

+!ENDIF

+

+!IF "$(ARCH)"=="X64"

+ARCH_INCLUDE = $(SOURCE_PATH)\Include\X64

+BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win64

+LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win64

+SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win64

+SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win64

+!ENDIF

+

+CC = cl.exe

+CXX = cl.exe

+AS = ml.exe

+AR = lib.exe

+LD = link.exe

+LINKER = $(LD)

+

+INC = -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common $(INC)

+

+CFLAGS = $(CFLAGS) /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE 

+CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE 

+

diff --git a/BaseTools/Source/C/Makefiles/ms.lib b/BaseTools/Source/C/Makefiles/ms.lib
index 0e418f3c8f..55f6a23118 100644
--- a/BaseTools/Source/C/Makefiles/ms.lib
+++ b/BaseTools/Source/C/Makefiles/ms.lib
@@ -7,25 +7,25 @@
 # http://opensource.org/licenses/bsd-license.php

 #

 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-!INCLUDE ..\Makefiles\ms.common
-
-LIBRARY = $(LIB_PATH)\$(LIBNAME).lib
-
-all: $(LIBRARY)
-
-$(LIBRARY) : $(OBJECTS)
-	-@if not exist $(LIB_PATH) mkdir $(LIB_PATH)
-	$(AR) /nologo /out:$@ $**
-
-.PHONY:clean
-clean:
-	del /f /q $(OBJECTS) *.pdb > nul
-
-.PHONY:cleanall
-cleanall:
-	del /f /q $(OBJECTS) $(LIBRARY) *.pdb > nul
-
-!INCLUDE ..\Makefiles\ms.rule
-
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+!INCLUDE ..\Makefiles\ms.common

+

+LIBRARY = $(LIB_PATH)\$(LIBNAME).lib

+

+all: $(LIBRARY)

+

+$(LIBRARY) : $(OBJECTS)

+	-@if not exist $(LIB_PATH) mkdir $(LIB_PATH)

+	$(AR) /nologo /out:$@ $**

+

+.PHONY:clean

+clean:

+	del /f /q $(OBJECTS) *.pdb > nul

+

+.PHONY:cleanall

+cleanall:

+	del /f /q $(OBJECTS) $(LIBRARY) *.pdb > nul

+

+!INCLUDE ..\Makefiles\ms.rule

+

diff --git a/BaseTools/Source/C/Makefiles/ms.rule b/BaseTools/Source/C/Makefiles/ms.rule
index afbd5dcc4b..b73e504b29 100644
--- a/BaseTools/Source/C/Makefiles/ms.rule
+++ b/BaseTools/Source/C/Makefiles/ms.rule
@@ -7,18 +7,18 @@
 # http://opensource.org/licenses/bsd-license.php

 #

 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-#DEPFILES = $(OBJECTS:%.o=%.d)
-
-.c.obj :
-	$(CC) -c $(CFLAGS) $(INC) $< -Fo$@
-
-.S.obj :
-	$(AS) -c $(ASFLAGS) $< -Fo$@
-
-.cpp.obj :
-	$(CXX) -c $(CPPFLAGS) $(INC) $< -Fo$@
-
-#-include $(DEPFILES)
-
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+#DEPFILES = $(OBJECTS:%.o=%.d)

+

+.c.obj :

+	$(CC) -c $(CFLAGS) $(INC) $< -Fo$@

+

+.S.obj :

+	$(AS) -c $(ASFLAGS) $< -Fo$@

+

+.cpp.obj :

+	$(CXX) -c $(CPPFLAGS) $(INC) $< -Fo$@

+

+#-include $(DEPFILES)

+