public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Liming Gao" <liming.gao@intel.com>
To: "Fan, ZhijuX" <zhijux.fan@intel.com>,
	"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Feng, Bob C" <bob.c.feng@intel.com>
Subject: Re: [PATCH V2] BaseTools:Add the Judgment Method of "--exclude"
Date: Mon, 8 Jul 2019 00:44:25 +0000	[thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4A35DD@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <FAD0D7E0AE0FA54D987F6E72435CAFD50AF85347@SHSMSX101.ccr.corp.intel.com>

Zhiju:
   Thanks for your fix. Can you list your test case? 

Thanks
Liming
>-----Original Message-----
>From: Fan, ZhijuX
>Sent: Friday, June 28, 2019 3:01 PM
>To: devel@edk2.groups.io
>Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
>Subject: [PATCH V2] BaseTools:Add the Judgment Method of "--exclude"
>
>BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1944
>
>--exclude cannot be used under certain circumstances
>1.The value of the parameter USES an absolute path
>2.The value of Exclude parameters is based on the value
>  of the Path parameter
>Neither of these approaches currently works
>
>This patch is going to fix that issue.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Cc: Bob Feng <bob.c.feng@intel.com>
>Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
>---
>keep original behavior on
>--exclude for the directory name or file name.
>
> BaseTools/Scripts/FormatDosFiles.py | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
>diff --git a/BaseTools/Scripts/FormatDosFiles.py
>b/BaseTools/Scripts/FormatDosFiles.py
>index d9a880f299..3150bef3c2 100644
>--- a/BaseTools/Scripts/FormatDosFiles.py
>+++ b/BaseTools/Scripts/FormatDosFiles.py
>@@ -20,7 +20,7 @@ import copy
>
> __prog__        = 'FormatDosFiles'
> __version__     = '%s Version %s' % (__prog__, '0.10 ')
>-__copyright__   = 'Copyright (c) 2018, Intel Corporation. All rights reserved.'
>+__copyright__   = 'Copyright (c) 2018-2019, Intel Corporation. All rights
>reserved.'
> __description__ = 'Convert source files to meet the EDKII C Coding Standards
>Specification.\n'
> DEFAULT_EXT_LIST = ['.h', '.c', '.nasm', '.nasmb', '.asm', '.S', '.inf', '.dec', '.dsc',
>'.fdf', '.uni', '.asl', '.aslc', '.vfr', '.idf', '.txt', '.bat', '.py']
>
>@@ -46,10 +46,26 @@ def FormatFile(FilePath, Args):
> def FormatFilesInDir(DirPath, ExtList, Args):
>
>     FileList = []
>+    ExcludeDir = DirPath
>     for DirPath, DirNames, FileNames in os.walk(DirPath):
>         if Args.Exclude:
>             DirNames[:] = [d for d in DirNames if d not in Args.Exclude]
>             FileNames[:] = [f for f in FileNames if f not in Args.Exclude]
>+            Continue = False
>+            for Path in Args.Exclude:
>+                if not os.path.isdir(Path) and not os.path.isfile(Path):
>+                    Path = os.path.join(ExcludeDir, Path)
>+                if os.path.isdir(Path) and Path.endswith(DirPath):
>+                    DirNames[:] = []
>+                    Continue = True
>+                elif os.path.isfile(Path):
>+                    FilePaths = FileNames
>+                    for ItemPath in FilePaths:
>+                        FilePath = os.path.join(DirPath, ItemPath)
>+                        if Path.endswith(FilePath):
>+                            FileNames.remove(ItemPath)
>+            if Continue:
>+                continue
>         for FileName in [f for f in FileNames if any(f.endswith(ext) for ext in
>ExtList)]:
>                 FileList.append(os.path.join(DirPath, FileName))
>     for File in FileList:
>--
>2.14.1.windows.1


  reply	other threads:[~2019-07-08  0:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-28  7:01 [PATCH V2] BaseTools:Add the Judgment Method of "--exclude" Fan, ZhijuX
2019-07-08  0:44 ` Liming Gao [this message]
2019-08-07 12:01 ` Liming Gao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14E4A35DD@SHSMSX104.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox