[edk2] Add .gitignore

Message ID 20141009144521.GS22224@bivouac.eciton.net
State New
Headers show

Commit Message

Leif Lindholm Oct. 9, 2014, 2:45 p.m.
On Thu, Oct 09, 2014 at 06:23:18AM -0700, Jordan Justen wrote:
> >>> diff --git a/.gitignore b/.gitignore
> >>> new file mode 100644
> >>> index 0000000..8b6147b
> >>> --- /dev/null
> >>> +++ b/.gitignore
> >>> @@ -0,0 +1,20 @@
> >>> +*.d
> >>> +*.o
> >>> +*.pyc
> >>> +BaseTools/Source/C/VfrCompile/EfiVfrParser.cpp
> >>> +BaseTools/Source/C/VfrCompile/EfiVfrParser.h
> >>> +BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr
> >>> +BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg
> >>> +BaseTools/Source/C/VfrCompile/VfrLexer.cpp
> >>> +BaseTools/Source/C/VfrCompile/VfrLexer.h
> >>> +BaseTools/Source/C/VfrCompile/VfrParser.dlg
> >>> +BaseTools/Source/C/VfrCompile/VfrSyntax.cpp
> >>> +BaseTools/Source/C/VfrCompile/VfrTokens.h
> >>> +BaseTools/Source/C/bin/
> >>> +BaseTools/Source/C/libs/
> >>
> >> How about BaseTools/.gitignore for these? (I guess it is possible that
> >> someone might want to use git submodule or repo to compose their
> >> tree.)

I guess that should be in addition to keeping it here?

> >>> +Build/
> >>> +Conf/.cache/
> >>> +Conf/BuildEnv.sh
> >>> +Conf/build_rule.txt
> >>> +Conf/target.txt
> >>> +Conf/tools_def.txt
> >>
> >> What about Conf/.gitignore with '*'?
> >
> > "Conf/ReadMe.txt" should not be ignored.
> 
> This should not prevent git from showing that ReadMe.txt was modified.
> (Not that it ever changes.)

Updated version below, in \r\n format (verified) and wildcard Conf/
(which still displays any modified tracked files).

>From 6739e685e68f482512e946d38e40c542e3434103 Mon Sep 17 00:00:00 2001
From: Ryan Harkin <ryan.harkin@linaro.org>
Date: Wed, 8 May 2013 16:18:34 +0100
Subject: [PATCH] Add .gitignore

While edk2 is still maintained in SVN, Many edk2 developers use git
for their main workflow, using the official mirrors.
This .gitignore file prevents files generated as part of the build
from cluttering up "git status" output.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
[removed Linaro-specific bits, rework for upstream]
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 .gitignore |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .gitignore

Comments

Jordan Justen Oct. 9, 2014, 10:08 p.m. | #1
On Thu, Oct 9, 2014 at 7:45 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Thu, Oct 09, 2014 at 06:23:18AM -0700, Jordan Justen wrote:
>> >>> diff --git a/.gitignore b/.gitignore
>> >>> new file mode 100644
>> >>> index 0000000..8b6147b
>> >>> --- /dev/null
>> >>> +++ b/.gitignore
>> >>> @@ -0,0 +1,20 @@
>> >>> +*.d
>> >>> +*.o
>> >>> +*.pyc
>> >>> +BaseTools/Source/C/VfrCompile/EfiVfrParser.cpp
>> >>> +BaseTools/Source/C/VfrCompile/EfiVfrParser.h
>> >>> +BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr
>> >>> +BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg
>> >>> +BaseTools/Source/C/VfrCompile/VfrLexer.cpp
>> >>> +BaseTools/Source/C/VfrCompile/VfrLexer.h
>> >>> +BaseTools/Source/C/VfrCompile/VfrParser.dlg
>> >>> +BaseTools/Source/C/VfrCompile/VfrSyntax.cpp
>> >>> +BaseTools/Source/C/VfrCompile/VfrTokens.h
>> >>> +BaseTools/Source/C/bin/
>> >>> +BaseTools/Source/C/libs/
>> >>
>> >> How about BaseTools/.gitignore for these? (I guess it is possible that
>> >> someone might want to use git submodule or repo to compose their
>> >> tree.)
>
> I guess that should be in addition to keeping it here?

There is no need for those patterns at the root if they are ignored at
the BaseTools directory level.

-Jordan

>> >>> +Build/
>> >>> +Conf/.cache/
>> >>> +Conf/BuildEnv.sh
>> >>> +Conf/build_rule.txt
>> >>> +Conf/target.txt
>> >>> +Conf/tools_def.txt
>> >>
>> >> What about Conf/.gitignore with '*'?
>> >
>> > "Conf/ReadMe.txt" should not be ignored.
>>
>> This should not prevent git from showing that ReadMe.txt was modified.
>> (Not that it ever changes.)
>
> Updated version below, in \r\n format (verified) and wildcard Conf/
> (which still displays any modified tracked files).
>
> >From 6739e685e68f482512e946d38e40c542e3434103 Mon Sep 17 00:00:00 2001
> From: Ryan Harkin <ryan.harkin@linaro.org>
> Date: Wed, 8 May 2013 16:18:34 +0100
> Subject: [PATCH] Add .gitignore
>
> While edk2 is still maintained in SVN, Many edk2 developers use git
> for their main workflow, using the official mirrors.
> This .gitignore file prevents files generated as part of the build
> from cluttering up "git status" output.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
> [removed Linaro-specific bits, rework for upstream]
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
>  .gitignore |   17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>  create mode 100644 .gitignore
>
> diff --git a/.gitignore b/.gitignore
> new file mode 100644
> index 0000000..f5f7815
> --- /dev/null
> +++ b/.gitignore
> @@ -0,0 +1,17 @@
> +*.d
> +*.o
> +*.pyc
> +BaseTools/Source/C/VfrCompile/EfiVfrParser.cpp
> +BaseTools/Source/C/VfrCompile/EfiVfrParser.h
> +BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr
> +BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg
> +BaseTools/Source/C/VfrCompile/VfrLexer.cpp
> +BaseTools/Source/C/VfrCompile/VfrLexer.h
> +BaseTools/Source/C/VfrCompile/VfrParser.dlg
> +BaseTools/Source/C/VfrCompile/VfrSyntax.cpp
> +BaseTools/Source/C/VfrCompile/VfrTokens.h
> +BaseTools/Source/C/bin/
> +BaseTools/Source/C/libs/
> +Build/
> +Conf/
> +tags/
> --
> 1.7.10.4
>
>
> ------------------------------------------------------------------------------
> Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
> Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
> Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
> Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
> http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/edk2-devel

------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
Leif Lindholm Oct. 10, 2014, 1:24 p.m. | #2
On Thu, Oct 09, 2014 at 03:08:14PM -0700, Jordan Justen wrote:
> On Thu, Oct 9, 2014 at 7:45 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> > On Thu, Oct 09, 2014 at 06:23:18AM -0700, Jordan Justen wrote:
> >> >>> diff --git a/.gitignore b/.gitignore
> >> >>> new file mode 100644
> >> >>> index 0000000..8b6147b
> >> >>> --- /dev/null
> >> >>> +++ b/.gitignore
> >> >>> @@ -0,0 +1,20 @@
> >> >>> +*.d
> >> >>> +*.o
> >> >>> +*.pyc
> >> >>> +BaseTools/Source/C/VfrCompile/EfiVfrParser.cpp
> >> >>> +BaseTools/Source/C/VfrCompile/EfiVfrParser.h
> >> >>> +BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr
> >> >>> +BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg
> >> >>> +BaseTools/Source/C/VfrCompile/VfrLexer.cpp
> >> >>> +BaseTools/Source/C/VfrCompile/VfrLexer.h
> >> >>> +BaseTools/Source/C/VfrCompile/VfrParser.dlg
> >> >>> +BaseTools/Source/C/VfrCompile/VfrSyntax.cpp
> >> >>> +BaseTools/Source/C/VfrCompile/VfrTokens.h
> >> >>> +BaseTools/Source/C/bin/
> >> >>> +BaseTools/Source/C/libs/
> >> >>
> >> >> How about BaseTools/.gitignore for these? (I guess it is possible that
> >> >> someone might want to use git submodule or repo to compose their
> >> >> tree.)
> >
> > I guess that should be in addition to keeping it here?
> 
> There is no need for those patterns at the root if they are ignored at
> the BaseTools directory level.

There is until the next BaseTools sync.

/
    Leif

------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
Jordan Justen Oct. 10, 2014, 2:09 p.m. | #3
On Fri, Oct 10, 2014 at 6:24 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Thu, Oct 09, 2014 at 03:08:14PM -0700, Jordan Justen wrote:
>> On Thu, Oct 9, 2014 at 7:45 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>> > On Thu, Oct 09, 2014 at 06:23:18AM -0700, Jordan Justen wrote:
>> >> >>> diff --git a/.gitignore b/.gitignore
>> >> >>> new file mode 100644
>> >> >>> index 0000000..8b6147b
>> >> >>> --- /dev/null
>> >> >>> +++ b/.gitignore
>> >> >>> @@ -0,0 +1,20 @@
>> >> >>> +*.d
>> >> >>> +*.o
>> >> >>> +*.pyc
>> >> >>> +BaseTools/Source/C/VfrCompile/EfiVfrParser.cpp
>> >> >>> +BaseTools/Source/C/VfrCompile/EfiVfrParser.h
>> >> >>> +BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr
>> >> >>> +BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg
>> >> >>> +BaseTools/Source/C/VfrCompile/VfrLexer.cpp
>> >> >>> +BaseTools/Source/C/VfrCompile/VfrLexer.h
>> >> >>> +BaseTools/Source/C/VfrCompile/VfrParser.dlg
>> >> >>> +BaseTools/Source/C/VfrCompile/VfrSyntax.cpp
>> >> >>> +BaseTools/Source/C/VfrCompile/VfrTokens.h
>> >> >>> +BaseTools/Source/C/bin/
>> >> >>> +BaseTools/Source/C/libs/
>> >> >>
>> >> >> How about BaseTools/.gitignore for these? (I guess it is possible that
>> >> >> someone might want to use git submodule or repo to compose their
>> >> >> tree.)
>> >
>> > I guess that should be in addition to keeping it here?
>>
>> There is no need for those patterns at the root if they are ignored at
>> the BaseTools directory level.
>
> There is until the next BaseTools sync.

BaseTools trunk is now in EDK II, so the sync problem is gone.

-Jordan

------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk

Patch

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f5f7815
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@ 
+*.d
+*.o
+*.pyc
+BaseTools/Source/C/VfrCompile/EfiVfrParser.cpp
+BaseTools/Source/C/VfrCompile/EfiVfrParser.h
+BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr
+BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg
+BaseTools/Source/C/VfrCompile/VfrLexer.cpp
+BaseTools/Source/C/VfrCompile/VfrLexer.h
+BaseTools/Source/C/VfrCompile/VfrParser.dlg
+BaseTools/Source/C/VfrCompile/VfrSyntax.cpp
+BaseTools/Source/C/VfrCompile/VfrTokens.h
+BaseTools/Source/C/bin/
+BaseTools/Source/C/libs/
+Build/
+Conf/
+tags/