From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web12.4283.1570623316085000060 for ; Wed, 09 Oct 2019 05:15:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=G8AuT1Rp; spf=pass (domain: linaro.org, ip: 209.85.128.48, mailfrom: leif.lindholm@linaro.org) Received: by mail-wm1-f48.google.com with SMTP id y21so2348863wmi.0 for ; Wed, 09 Oct 2019 05:15:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=b+nSThfZU1+c11tYdaXCVhwTHQcW8EqBEXt++Wp6rsE=; b=G8AuT1Rp1aCOJVBJxsi/qCelIx9tjWf+eVtV3ikpGvNxdYKrNKKjHFR1y8nS4aUTdC uuxaBnOovDovY0J5efuIFqXHiiaiwDKOSIbPTcr8uvW9vsdjycCjPcAqtWIxhsVCsCtD JeFYT/sjUk9SXAzlmHLHTSWQB1mXfVuskAuL7bZXoOch0apAjN9gXUaZ2SXelu4oIb4l 7Km16xIsijl9MWvSNHf9r60Vq8R3St63OMQXE3tyi02Dx5P3iefLtmOhcfRC1D7J0Cqs 05CYxNS3fdTTksyJZHBvP4axdavzq4lSBibIBIwOY/5jSPY9DrHW0hyAK5WzjC+mT0Y8 bIgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=b+nSThfZU1+c11tYdaXCVhwTHQcW8EqBEXt++Wp6rsE=; b=mvZ+Yd2TholnOYfvKMuDxHVPFHYWx2mqf0HJl3zDakEkn61U/FxTDhWJi9RTi2tuZT 550Vpu5+4GvWr3y3b9vzjZ8p640rPOO0ciTZhVD0AG5tFk21Mz7rLr8u3dd8rXUotSD+ CgUdv2Swd8oxgDnWEN8WtYqaK/LepHk0572j4viUgWcvHhsCa9gCIsoimogb8xkY5SAP 0tJBf+NDtrkdB5MF6jv3LFtzezLI+PWE7U2upsIqbLW3CJvPJs95/DUOKMcIfnD1oewC Yy7mbyaStes/FYKqoT8viTOqT2mAxhTT5uMkici7vYMiG5TPazUFmHYX0jPV0eHOlVWr eqLg== X-Gm-Message-State: APjAAAVcXz13HZ83WV8pqRZLW+dUl4GTYuKun4tzzDdfdf8hJ4Vo7Vyv 2MymMX6Oiq9jzUa8asb87/RiuA== X-Google-Smtp-Source: APXvYqxGxHPEZ5E8YvxmLoD/HxL+OZHEt4xbzFxe1nY9QP4fsOEGnuG08Z6P0AJFTXzNWu7dWHrUyg== X-Received: by 2002:a1c:41c5:: with SMTP id o188mr2429447wma.27.1570623314310; Wed, 09 Oct 2019 05:15:14 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id w9sm3983014wrt.62.2019.10.09.05.15.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 05:15:13 -0700 (PDT) Date: Wed, 9 Oct 2019 13:15:12 +0100 From: "Leif Lindholm" To: "Kinney, Michael D" Cc: "devel@edk2.groups.io" Subject: Re: [edk2-devel] [PATCH v2 3/7] BaseTools: strip trailing whitespace Message-ID: <20191009121512.GK25504@bivouac.eciton.net> References: <20191001124856.13759-1-leif.lindholm@linaro.org> <20191004101942.GW25504@bivouac.eciton.net> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Mike, This one turned out to be a bit trickier, and also it was helpful converting Maintainers.txt in preparation, but now sent out. Regards, Leif On Fri, Oct 04, 2019 at 04:01:09PM +0000, Kinney, Michael D wrote: > Hi Leif, > > Do you want to run the same script on the edk2-platforms > repo? > > Thanks, > > Mike > > > -----Original Message----- > > From: devel@edk2.groups.io On > > Behalf Of Leif Lindholm > > Sent: Friday, October 4, 2019 3:20 AM > > To: Kinney, Michael D > > Cc: devel@edk2.groups.io; Feng, Bob C > > ; Gao, Liming > > > > Subject: Re: [edk2-devel] [PATCH v2 3/7] BaseTools: > > strip trailing whitespace > > > > Mike, others, > > > > Many thanks - series pushed as > > 61af5f249495..d19040804afb > > > > / > > Leif > > > > On Thu, Oct 03, 2019 at 09:05:05PM +0000, Kinney, > > Michael D wrote: > > > 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 > > > > > > > > Cc: Bob Feng > > > > Cc: Liming Gao > > > > Signed-off-by: Leif Lindholm > > > > > > --- > > > > > > > > Resubmitting a v2 with changes to external projects: > > > > - BrotliCompress > > > > - LzmaCompress > > > > - Pccts > > > > backed out for now. > > > > > > > > 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(-) > > > > > > > > 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=) clean > > > > > > > > -$(VFRAUTOGEN): VfrCompile/VfrSyntax.g > > > > +$(VFRAUTOGEN): VfrCompile/VfrSyntax.g > > > > $(MAKE) -C VfrCompile VfrLexer.h > > > > > > > > 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 = $(MAKEROOT)/bin/$(APPNAME) > > > > > > > > .PHONY:all > > > > -all: $(MAKEROOT)/bin $(APPLICATION) > > > > +all: $(MAKEROOT)/bin $(APPLICATION) > > > > > > > > -$(APPLICATION): $(OBJECTS) > > > > +$(APPLICATION): $(OBJECTS) > > > > $(LINKER) -o $(APPLICATION) $(BUILD_LFLAGS) > > > > $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS) > > > > > > > > $(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) > > > > > > > > -$(LIBRARY): $(OBJECTS) > > > > +$(LIBRARY): $(OBJECTS) > > > > $(BUILD_AR) crs $@ $^ > > > > > > > > -%.o : %.c > > > > +%.o : %.c > > > > $(BUILD_CC) -c $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) > > $< -o $@ > > > > > > > > %.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 > > > > > > > > -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) > > > > > > > > # keep EXTRA_OPTFLAGS last > > > > @@ -82,7 +82,7 @@ BUILD_CXXFLAGS = -Wno-unused- > > result > > > > > > > > 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 += $(BUILD_OPTFLAGS) > > > > BUILD_CXXFLAGS += $(BUILD_OPTFLAGS) > > > > - > > > > + > > > > # keep EXTRA_LDFLAGS last > > > > BUILD_LFLAGS += $(EXTRA_LDFLAGS) > > > > > > > > @@ -107,7 +107,7 @@ BUILD_LFLAGS += $(EXTRA_LDFLAGS) > > > > all: > > > > > > > > $(MAKEROOT)/libs: > > > > - mkdir $(MAKEROOT)/libs > > > > + mkdir $(MAKEROOT)/libs > > > > > > > > $(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 > > > > > > > > LIBRARY = $(MAKEROOT)/libs/lib$(LIBNAME).a > > > > > > > > -all: $(MAKEROOT)/libs $(LIBRARY) > > > > +all: $(MAKEROOT)/libs $(LIBRARY) > > > > > > > > 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 = $(LD) > > > > > > > > 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 - CPPFLAGS = > > > > $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /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 > > > > > > > > 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 = $(MAKEROOT)/bin/$(APPNAME) > > > > > > > > .PHONY:all > > > > -all: $(MAKEROOT)/bin $(APPLICATION) > > > > +all: $(MAKEROOT)/bin $(APPLICATION) > > > > > > > > -$(APPLICATION): $(OBJECTS) > > > > +$(APPLICATION): $(OBJECTS) > > > > $(LINKER) -o $(APPLICATION) $(VFR_LFLAGS) > > $(OBJECTS) > > > > -L$(MAKEROOT)/libs $(LIBS) > > > > > > > > VfrCompiler.o: ../Include/Common/BuildVersion.h @@ > > - > > > > 68,7 +68,7 @@ AParser.o: Pccts/h/AParser.cpp > > > > > > > > VfrSyntax.o: VfrSyntax.cpp > > > > $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) > > > > $(VFR_CXXFLAGS) $? -o $@ > > > > - > > > > + > > > > clean: localClean > > > > > > > > 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 > > > > == '1' or > > EccGlobalData.gConfig.CFunctionLayoutCheckAll > > > > == '1' or EccGlobalData.gConfig.CheckAll == '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 = {} > > > > 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: > > > > > > > > clean: > > > > -cleanall: > > > > +cleanall: > > > > @del /f /q $(BASE_TOOLS_PATH)\Source\Python\*.pyc > > > > > > > > -- > > > > 2.20.1 > > > > > > > > > > > > > > > > > > > >