From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=yzwdRJz3; spf=pass (domain: linaro.org, ip: 209.85.221.43, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by groups.io with SMTP; Tue, 01 Oct 2019 05:49:01 -0700 Received: by mail-wr1-f43.google.com with SMTP id r5so15318080wrm.12 for ; Tue, 01 Oct 2019 05:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yYScsYWBa9VApq+LaJseQUWj67D0w0vsA3Mu1/VjbXE=; b=yzwdRJz3Ur8WGbnyPpVLHgKllrl1rhdymYSJbqwa/J7vDvUUwmgRn27GYLTKody4Cl ESi6P1EKqywIHFHwytV73Qbg3ePnTAuE88wZN0sgPdfTYePC/mAaUXATv6qhIBQ637tL VoH+cN8Km5Iudj0eSaSepriWLTGWsecRpE2ifY1VfnjzoU6fE3uMJkLs+k5alXsuE9E5 xFRqLwX8euC3XOA6TGiIRxPdQP8BZWNySJCG2wX9BvGSS/e1+5FfL11Q+J2wjTu+qD4U LkzGjpZsiKYwhgz6CghwWkvf1jt0OmbdciriaeAJDrEVSxXwg15sWATBD0bbHn105rjN gI+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yYScsYWBa9VApq+LaJseQUWj67D0w0vsA3Mu1/VjbXE=; b=R6hA6aMEh/09vulrayIdVNibGkDoaTEKixarBo4M8OjfNpnqCsacGHdN/FaaOjNzFg m4Jl2HjynM76CV1et8MzLZiArxV4HQSxFfBqg7Ojot3bUzVIvzluONNsZoIfGFVUV53T /9vKkzTRdqMVW4gWIRG7Ygg82ymcP0Pe6/8+N4UyKtaenjEURG/aoU/whFdNoJShxCDg yEi0qkt+HrsnAJu9iRg+aj51XnT6okE7OW7AntarP4eKzbV0a7qBS2aco/mm8GoY3bH+ VTXFZF1JQdJ2gJStNPa56ky43yxxU48+VV1HLLaUJkZlFzmdI77TD/lTQAC8CHB4Fn4Z hk0w== X-Gm-Message-State: APjAAAUil9UDfyv69qP6p9woS7PsHe8g6DetTqZRI+crYuJ8bJ9s38c2 SzSRCbB5n1Zcs4yy8UyGPR+LuyMQVopDVw== X-Google-Smtp-Source: APXvYqwgmQzbkD56ffa/pKx+Wb6QABA/fY18X9TejSdX5r8ypYPQlUyuiOnqzwy5w8vl8bDAYvwn9Q== X-Received: by 2002:a05:6000:1184:: with SMTP id g4mr17802725wrx.361.1569934139313; Tue, 01 Oct 2019 05:48:59 -0700 (PDT) Return-Path: Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id e20sm33073168wrc.34.2019.10.01.05.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 05:48:58 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH v2 3/7] BaseTools: strip trailing whitespace Date: Tue, 1 Oct 2019 13:48:56 +0100 Message-Id: <20191001124856.13759-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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