Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BaseTools: strip trailing whitespace 

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Leif Lindholm 2019-10-01 13:42:32 +01:00
parent df8f8688b8
commit 0deca401f0
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaseTools/Source/C/GNUmakefile
View File

@ -77,7 +77,7 @@ $(SUBDIRS):
$(patsubst %,%-clean,$(sort $(SUBDIRS))): $(patsubst %,%-clean,$(sort $(SUBDIRS))):
-$(MAKE) -C $(@:-clean=) clean -$(MAKE) -C $(@:-clean=) clean
$(VFRAUTOGEN): VfrCompile/VfrSyntax.g $(VFRAUTOGEN): VfrCompile/VfrSyntax.g
$(MAKE) -C VfrCompile VfrLexer.h $(MAKE) -C VfrCompile VfrLexer.h
clean: $(patsubst %,%-clean,$(sort $(SUBDIRS))) clean: $(patsubst %,%-clean,$(sort $(SUBDIRS)))

4
BaseTools/Source/C/Makefiles/app.makefile
View File

@ -12,9 +12,9 @@ include $(MAKEROOT)/Makefiles/header.makefile
APPLICATION = $(MAKEROOT)/bin/$(APPNAME) APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
.PHONY:all .PHONY:all
all: $(MAKEROOT)/bin $(APPLICATION) all: $(MAKEROOT)/bin $(APPLICATION)
$(APPLICATION): $(OBJECTS) $(APPLICATION): $(OBJECTS)
$(LINKER) -o $(APPLICATION) $(BUILD_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS) $(LINKER) -o $(APPLICATION) $(BUILD_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
$(OBJECTS): $(MAKEROOT)/Include/Common/BuildVersion.h $(OBJECTS): $(MAKEROOT)/Include/Common/BuildVersion.h

4
BaseTools/Source/C/Makefiles/footer.makefile
View File

@ -14,10 +14,10 @@ $(MAKEROOT)/libs-$(HOST_ARCH):
install: $(MAKEROOT)/libs-$(HOST_ARCH) $(LIBRARY) install: $(MAKEROOT)/libs-$(HOST_ARCH) $(LIBRARY)
cp $(LIBRARY) $(MAKEROOT)/libs-$(HOST_ARCH) cp $(LIBRARY) $(MAKEROOT)/libs-$(HOST_ARCH)
$(LIBRARY): $(OBJECTS) $(LIBRARY): $(OBJECTS)
$(BUILD_AR) crs $@ $^ $(BUILD_AR) crs $@ $^
%.o : %.c %.o : %.c
$(BUILD_CC) -c $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) $< -o $@ $(BUILD_CC) -c $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) $< -o $@
%.o : %.cpp %.o : %.cpp

8
BaseTools/Source/C/Makefiles/header.makefile
View File

@ -61,7 +61,7 @@ else
$(error Bad HOST_ARCH) $(error Bad HOST_ARCH)
endif endif
INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
BUILD_CPPFLAGS = $(INCLUDE) BUILD_CPPFLAGS = $(INCLUDE)
# keep EXTRA_OPTFLAGS last # keep EXTRA_OPTFLAGS last
@ -82,7 +82,7 @@ BUILD_CXXFLAGS = -Wno-unused-result
ifeq ($(HOST_ARCH), IA32) ifeq ($(HOST_ARCH), IA32)
# #
# Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults
# to x86_64. So make sure tools match uname -m. You can manual have a 64-bit kernal on Snow Leopard # to x86_64. So make sure tools match uname -m. You can manual have a 64-bit kernal on Snow Leopard
# so only do this is uname -m returns i386. # so only do this is uname -m returns i386.
# #
@ -96,7 +96,7 @@ endif
# keep BUILD_OPTFLAGS last # keep BUILD_OPTFLAGS last
BUILD_CFLAGS += $(BUILD_OPTFLAGS) BUILD_CFLAGS += $(BUILD_OPTFLAGS)
BUILD_CXXFLAGS += $(BUILD_OPTFLAGS) BUILD_CXXFLAGS += $(BUILD_OPTFLAGS)
# keep EXTRA_LDFLAGS last # keep EXTRA_LDFLAGS last
BUILD_LFLAGS += $(EXTRA_LDFLAGS) BUILD_LFLAGS += $(EXTRA_LDFLAGS)
@ -107,7 +107,7 @@ BUILD_LFLAGS += $(EXTRA_LDFLAGS)
all: all:
$(MAKEROOT)/libs: $(MAKEROOT)/libs:
mkdir $(MAKEROOT)/libs mkdir $(MAKEROOT)/libs
$(MAKEROOT)/bin: $(MAKEROOT)/bin:
mkdir $(MAKEROOT)/bin mkdir $(MAKEROOT)/bin

2
BaseTools/Source/C/Makefiles/lib.makefile
View File

@ -9,6 +9,6 @@ include $(MAKEROOT)/Makefiles/header.makefile
LIBRARY = $(MAKEROOT)/libs/lib$(LIBNAME).a LIBRARY = $(MAKEROOT)/libs/lib$(LIBNAME).a
all: $(MAKEROOT)/libs $(LIBRARY) all: $(MAKEROOT)/libs $(LIBRARY)
include $(MAKEROOT)/Makefiles/footer.makefile include $(MAKEROOT)/Makefiles/footer.makefile

4
BaseTools/Source/C/Makefiles/ms.common
View File

@ -57,6 +57,6 @@ LINKER = $(LD)
INC = -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common $(INC) INC = -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common $(INC)
CFLAGS = $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE CFLAGS = $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE

6
BaseTools/Source/C/VfrCompile/GNUmakefile
View File

@ -36,9 +36,9 @@ include $(MAKEROOT)/Makefiles/header.makefile
APPLICATION = $(MAKEROOT)/bin/$(APPNAME) APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
.PHONY:all .PHONY:all
all: $(MAKEROOT)/bin $(APPLICATION) all: $(MAKEROOT)/bin $(APPLICATION)
$(APPLICATION): $(OBJECTS) $(APPLICATION): $(OBJECTS)
$(LINKER) -o $(APPLICATION) $(VFR_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS) $(LINKER) -o $(APPLICATION) $(VFR_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
VfrCompiler.o: ../Include/Common/BuildVersion.h VfrCompiler.o: ../Include/Common/BuildVersion.h
@ -68,7 +68,7 @@ AParser.o: Pccts/h/AParser.cpp
VfrSyntax.o: VfrSyntax.cpp VfrSyntax.o: VfrSyntax.cpp
$(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@ $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@
clean: localClean clean: localClean
localClean: localClean:

2
BaseTools/Source/Python/Ecc/Check.py
View File

@ -265,7 +265,7 @@ class Check(object):
self.FunctionLayoutCheckBody() self.FunctionLayoutCheckBody()
self.FunctionLayoutCheckLocalVariable() self.FunctionLayoutCheckLocalVariable()
self.FunctionLayoutCheckDeprecated() self.FunctionLayoutCheckDeprecated()
# To check if the deprecated functions are used # To check if the deprecated functions are used
def FunctionLayoutCheckDeprecated(self): def FunctionLayoutCheckDeprecated(self):
if EccGlobalData.gConfig.CFunctionLayoutCheckNoDeprecated == '1' or EccGlobalData.gConfig.CFunctionLayoutCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1': if EccGlobalData.gConfig.CFunctionLayoutCheckNoDeprecated == '1' or EccGlobalData.gConfig.CFunctionLayoutCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

2
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
View File

@ -160,7 +160,7 @@ class GenFdsGlobalVariable:
"OUTPUT_DIR":os.path.join(BuildDir, "OUTPUT"), "OUTPUT_DIR":os.path.join(BuildDir, "OUTPUT"),
"DEBUG_DIR":os.path.join(BuildDir, "DEBUG") "DEBUG_DIR":os.path.join(BuildDir, "DEBUG")
} }
BuildRules = {} BuildRules = {}
for Type in BuildRuleDatabase.FileTypeList: for Type in BuildRuleDatabase.FileTypeList:
#first try getting build rule by BuildRuleFamily #first try getting build rule by BuildRuleFamily

2
BaseTools/Source/Python/Makefile
View File

@ -8,6 +8,6 @@
all: all:
clean: clean:
cleanall: cleanall:
@del /f /q $(BASE_TOOLS_PATH)\Source\Python\*.pyc @del /f /q $(BASE_TOOLS_PATH)\Source\Python\*.pyc