From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: michael.d.kinney@intel.com) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by groups.io with SMTP; Thu, 03 Oct 2019 14:05:06 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Oct 2019 14:05:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,253,1566889200"; d="scan'208";a="343782668" Received: from orsmsx101.amr.corp.intel.com ([10.22.225.128]) by orsmga004.jf.intel.com with ESMTP; 03 Oct 2019 14:05:05 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.232]) by ORSMSX101.amr.corp.intel.com ([169.254.8.204]) with mapi id 14.03.0439.000; Thu, 3 Oct 2019 14:05:05 -0700 From: "Michael D Kinney" To: "devel@edk2.groups.io" , "leif.lindholm@linaro.org" , "Kinney, Michael D" CC: "Feng, Bob C" , "Gao, Liming" Subject: Re: [edk2-devel] [PATCH v2 3/7] BaseTools: strip trailing whitespace Thread-Topic: [edk2-devel] [PATCH v2 3/7] BaseTools: strip trailing whitespace Thread-Index: AQHVeFaeEErRB2z0v0aWbp/VJHnkxqdJa2sQ Date: Thu, 3 Oct 2019 21:05:05 +0000 Message-ID: References: <20191001124856.13759-1-leif.lindholm@linaro.org> In-Reply-To: <20191001124856.13759-1-leif.lindholm@linaro.org> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Leif, Reviewed-by: Michael D Kinney I am covering for Liming and Bob this week, so you do not have to wait for a review from them to push these changes. Mike > -----Original Message----- > From: devel@edk2.groups.io On > Behalf Of Leif Lindholm > Sent: Tuesday, October 1, 2019 5:49 AM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Gao, Liming > > Subject: [edk2-devel] [PATCH v2 3/7] BaseTools: strip > trailing whitespace >=20 > Cc: Bob Feng > Cc: Liming Gao > Signed-off-by: Leif Lindholm > --- >=20 > Resubmitting a v2 with changes to external projects: > - BrotliCompress > - LzmaCompress > - Pccts > backed out for now. >=20 > BaseTools/Source/C/GNUmakefile | > 2 +- > BaseTools/Source/C/Makefiles/app.makefile > | 4 ++-- > BaseTools/Source/C/Makefiles/footer.makefile > | 4 ++-- > BaseTools/Source/C/Makefiles/header.makefile > | 8 ++++---- > BaseTools/Source/C/Makefiles/lib.makefile > | 2 +- > BaseTools/Source/C/Makefiles/ms.common > | 4 ++-- > BaseTools/Source/C/VfrCompile/GNUmakefile > | 6 +++--- > BaseTools/Source/Python/Ecc/Check.py > | 2 +- > BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > | 2 +- > BaseTools/Source/Python/Makefile > | 2 +- > 10 files changed, 18 insertions(+), 18 deletions(-) >=20 > diff --git a/BaseTools/Source/C/GNUmakefile > b/BaseTools/Source/C/GNUmakefile index > 37bcce519c7e..df4eb64ea95e 100644 > --- a/BaseTools/Source/C/GNUmakefile > +++ b/BaseTools/Source/C/GNUmakefile > @@ -77,7 +77,7 @@ $(SUBDIRS): > $(patsubst %,%-clean,$(sort $(SUBDIRS))): > -$(MAKE) -C $(@:-clean=3D) clean >=20 > -$(VFRAUTOGEN): VfrCompile/VfrSyntax.g > +$(VFRAUTOGEN): VfrCompile/VfrSyntax.g > $(MAKE) -C VfrCompile VfrLexer.h >=20 > clean: $(patsubst %,%-clean,$(sort $(SUBDIRS))) diff - > -git a/BaseTools/Source/C/Makefiles/app.makefile > b/BaseTools/Source/C/Makefiles/app.makefile > index fcadb4ed2194..6a2a8f5e8a0e 100644 > --- a/BaseTools/Source/C/Makefiles/app.makefile > +++ b/BaseTools/Source/C/Makefiles/app.makefile > @@ -12,9 +12,9 @@ include > $(MAKEROOT)/Makefiles/header.makefile > APPLICATION =3D $(MAKEROOT)/bin/$(APPNAME) >=20 > .PHONY:all > -all: $(MAKEROOT)/bin $(APPLICATION) > +all: $(MAKEROOT)/bin $(APPLICATION) >=20 > -$(APPLICATION): $(OBJECTS) > +$(APPLICATION): $(OBJECTS) > $(LINKER) -o $(APPLICATION) $(BUILD_LFLAGS) > $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS) >=20 > $(OBJECTS): $(MAKEROOT)/Include/Common/BuildVersion.h > diff --git > a/BaseTools/Source/C/Makefiles/footer.makefile > b/BaseTools/Source/C/Makefiles/footer.makefile > index e823246cfbb4..85c3374224f2 100644 > --- a/BaseTools/Source/C/Makefiles/footer.makefile > +++ b/BaseTools/Source/C/Makefiles/footer.makefile > @@ -14,10 +14,10 @@ $(MAKEROOT)/libs-$(HOST_ARCH): > install: $(MAKEROOT)/libs-$(HOST_ARCH) $(LIBRARY) > cp $(LIBRARY) $(MAKEROOT)/libs-$(HOST_ARCH) >=20 > -$(LIBRARY): $(OBJECTS) > +$(LIBRARY): $(OBJECTS) > $(BUILD_AR) crs $@ $^ >=20 > -%.o : %.c > +%.o : %.c > $(BUILD_CC) -c $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) $< > -o $@ >=20 > %.o : %.cpp > diff --git > a/BaseTools/Source/C/Makefiles/header.makefile > b/BaseTools/Source/C/Makefiles/header.makefile > index 52cbffcb4423..4e9b36d98bdb 100644 > --- a/BaseTools/Source/C/Makefiles/header.makefile > +++ b/BaseTools/Source/C/Makefiles/header.makefile > @@ -61,7 +61,7 @@ else > $(error Bad HOST_ARCH) > endif >=20 > -INCLUDE =3D $(TOOL_INCLUDE) -I $(MAKEROOT) -I > $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I > $(MAKEROOT)/Include/IndustryStandard -I > $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) > +INCLUDE =3D $(TOOL_INCLUDE) -I $(MAKEROOT) -I > $(MAKEROOT)/Include/Common > +-I $(MAKEROOT)/Include/ -I > $(MAKEROOT)/Include/IndustryStandard -I > +$(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) > BUILD_CPPFLAGS =3D $(INCLUDE) >=20 > # keep EXTRA_OPTFLAGS last > @@ -82,7 +82,7 @@ BUILD_CXXFLAGS =3D -Wno-unused-result >=20 > 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 # so > only do this is uname -m returns i386. > # > @@ -96,7 +96,7 @@ endif > # keep BUILD_OPTFLAGS last > BUILD_CFLAGS +=3D $(BUILD_OPTFLAGS) > BUILD_CXXFLAGS +=3D $(BUILD_OPTFLAGS) > - > + > # keep EXTRA_LDFLAGS last > BUILD_LFLAGS +=3D $(EXTRA_LDFLAGS) >=20 > @@ -107,7 +107,7 @@ BUILD_LFLAGS +=3D $(EXTRA_LDFLAGS) > all: >=20 > $(MAKEROOT)/libs: > - mkdir $(MAKEROOT)/libs > + mkdir $(MAKEROOT)/libs >=20 > $(MAKEROOT)/bin: > mkdir $(MAKEROOT)/bin > diff --git a/BaseTools/Source/C/Makefiles/lib.makefile > b/BaseTools/Source/C/Makefiles/lib.makefile > index a9965fc628d9..2577c15380a9 100644 > --- a/BaseTools/Source/C/Makefiles/lib.makefile > +++ b/BaseTools/Source/C/Makefiles/lib.makefile > @@ -9,6 +9,6 @@ include > $(MAKEROOT)/Makefiles/header.makefile >=20 > LIBRARY =3D $(MAKEROOT)/libs/lib$(LIBNAME).a >=20 > -all: $(MAKEROOT)/libs $(LIBRARY) > +all: $(MAKEROOT)/libs $(LIBRARY) >=20 > include $(MAKEROOT)/Makefiles/footer.makefile > diff --git a/BaseTools/Source/C/Makefiles/ms.common > b/BaseTools/Source/C/Makefiles/ms.common > index 75c9bb43a32c..f5f77fdc0bc5 100644 > --- a/BaseTools/Source/C/Makefiles/ms.common > +++ b/BaseTools/Source/C/Makefiles/ms.common > @@ -57,6 +57,6 @@ LINKER =3D $(LD) >=20 > INC =3D -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) > -I $(SOURCE_PATH)\Common $(INC) >=20 > -CFLAGS =3D $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D > _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE - > CPPFLAGS =3D $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D > _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE > +CFLAGS =3D $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D > +_CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE > CPPFLAGS =3D > +$(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D > _CRT_SECURE_NO_DEPRECATE /D > +_CRT_NONSTDC_NO_DEPRECATE >=20 > diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile > b/BaseTools/Source/C/VfrCompile/GNUmakefile > index 8b94c73bbefa..42e3d7da020f 100644 > --- a/BaseTools/Source/C/VfrCompile/GNUmakefile > +++ b/BaseTools/Source/C/VfrCompile/GNUmakefile > @@ -36,9 +36,9 @@ include > $(MAKEROOT)/Makefiles/header.makefile > APPLICATION =3D $(MAKEROOT)/bin/$(APPNAME) >=20 > .PHONY:all > -all: $(MAKEROOT)/bin $(APPLICATION) > +all: $(MAKEROOT)/bin $(APPLICATION) >=20 > -$(APPLICATION): $(OBJECTS) > +$(APPLICATION): $(OBJECTS) > $(LINKER) -o $(APPLICATION) $(VFR_LFLAGS) $(OBJECTS) > -L$(MAKEROOT)/libs $(LIBS) >=20 > VfrCompiler.o: ../Include/Common/BuildVersion.h @@ - > 68,7 +68,7 @@ AParser.o: Pccts/h/AParser.cpp >=20 > VfrSyntax.o: VfrSyntax.cpp > $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) > $(VFR_CXXFLAGS) $? -o $@ > - > + > clean: localClean >=20 > localClean: > diff --git a/BaseTools/Source/Python/Ecc/Check.py > b/BaseTools/Source/Python/Ecc/Check.py > index 218081860993..b68cecddfd48 100644 > --- a/BaseTools/Source/Python/Ecc/Check.py > +++ b/BaseTools/Source/Python/Ecc/Check.py > @@ -265,7 +265,7 @@ class Check(object): > self.FunctionLayoutCheckBody() > self.FunctionLayoutCheckLocalVariable() > self.FunctionLayoutCheckDeprecated() > - > + > # To check if the deprecated functions are used > def FunctionLayoutCheckDeprecated(self): > if > EccGlobalData.gConfig.CFunctionLayoutCheckNoDeprecated > =3D=3D '1' or EccGlobalData.gConfig.CFunctionLayoutCheckAll > =3D=3D '1' or EccGlobalData.gConfig.CheckAll =3D=3D '1': > diff --git > a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > index 4d8b2bdee299..b2f3f6a1127a 100644 > --- > a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > +++ > b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > @@ -160,7 +160,7 @@ class GenFdsGlobalVariable: > "OUTPUT_DIR":os.path.join(BuildDir, "OUTPUT"), > "DEBUG_DIR":os.path.join(BuildDir, "DEBUG") > } > - > + > BuildRules =3D {} > for Type in BuildRuleDatabase.FileTypeList: > #first try getting build rule by > BuildRuleFamily diff --git > a/BaseTools/Source/Python/Makefile > b/BaseTools/Source/Python/Makefile > index 0361c5330cfe..6c3bedbadf3a 100644 > --- a/BaseTools/Source/Python/Makefile > +++ b/BaseTools/Source/Python/Makefile > @@ -8,6 +8,6 @@ > all: >=20 > clean: > -cleanall: > +cleanall: > @del /f /q $(BASE_TOOLS_PATH)\Source\Python\*.pyc >=20 > -- > 2.20.1 >=20 >=20 >=20