[PATCH 0/5]: gitignore cleanup

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 0/5]: gitignore cleanup

Carlo Marcelo Arenas Belon
The following series changes .gitignore files on the tree to reduce
complexity, include all relevant files and correct issues introduced
by the migration from cvs.

  [PATCH 1/5] build: remove duplicated entries in .gitignore
  [PATCH 2/5] build: add searchpath test to .gitignore
  [PATCH 3/5] build: ignore obsoleted translation files
  [PATCH 4/5] build: ignore macros by using a wildcard entry
  [PATCH 5/5] build: keep track of windows specific config.h

Carlo

_______________________________________________
Confuse-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/confuse-devel
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/5] build: remove duplicated entries in .gitignore

Carlo Marcelo Arenas Belon
gitignore from the parent dir applies recursively and so to avoid
complexity keep only the more relevant one.

Signed-off-by: Carlo Marcelo Arenas Belon <[hidden email]>
---
 .gitignore          |    1 -
 doc/.gitignore      |    3 ---
 examples/.gitignore |    3 ---
 m4/.gitignore       |    2 --
 po/.gitignore       |    2 --
 src/.gitignore      |    2 --
 tests/.gitignore    |    3 ---
 7 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7cf816f..bd01cda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ config.log
 config.status
 configure
 confuse-config
-Doxyfile
 libconfuse.pc
 libconfuse.spec
 libtool
diff --git a/doc/.gitignore b/doc/.gitignore
index d183a98..fd28446 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,4 +1,3 @@
-.gdb_history
 conf.d
 html
 listing1.xml
@@ -9,8 +8,6 @@ listing5.xml
 listing6.xml
 listing7.xml
 listing8.xml
-Makefile
-Makefile.in
 man
 tutorial
 tutorial-html
diff --git a/examples/.gitignore b/examples/.gitignore
index 65982c2..f9d9b50 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -1,9 +1,6 @@
 .deps
-.gdb_history
 .libs
 cfgtest
-Makefile
-Makefile.in
 reread
 simple
 simple.conf.out
diff --git a/m4/.gitignore b/m4/.gitignore
index 29de8b7..6e6c301 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
 codeset.m4
 gettext.m4
 glibc2.m4
diff --git a/po/.gitignore b/po/.gitignore
index d892ef0..51fb607 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
 Makevars.template
 POTFILES
 stamp-po
diff --git a/src/.gitignore b/src/.gitignore
index ad3146d..9c792fa 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -4,6 +4,4 @@
 lexer.c
 *lexer*.lo
 *libconfuse*.la
-Makefile
-Makefile.in
 *.o
diff --git a/tests/.gitignore b/tests/.gitignore
index ca96b66..6646b36 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,9 +1,6 @@
 .deps
-.gdb_history
 .libs
 check_confuse
-Makefile
-Makefile.in
 malloc.log
 list_plus_syntax
 section_title_dupes
--
1.7.1.1


_______________________________________________
Confuse-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/confuse-devel
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/5] build: add searchpath test to .gitignore

Carlo Marcelo Arenas Belon
In reply to this post by Carlo Marcelo Arenas Belon
test added with d46dfe1a6eda97b4ca29575eff34f4bc1bc5fef1 but generated
binary missed from gitignore.

Signed-off-by: Carlo Marcelo Arenas Belon <[hidden email]>
---
 tests/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tests/.gitignore b/tests/.gitignore
index 6646b36..516816d 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -12,4 +12,5 @@ suite_validate
 include
 quote_before_print
 single_title_sections
+searchpath
 *.o
--
1.7.1.1


_______________________________________________
Confuse-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/confuse-devel
Reply | Threaded
Open this post in threaded view
|

[PATCH 3/5] build: ignore obsoleted translation files

Carlo Marcelo Arenas Belon
In reply to this post by Carlo Marcelo Arenas Belon
if the language "po" are updated during bootstrapping the original
files will be backed up with a "po~" extension.

Signed-off-by: Carlo Marcelo Arenas Belon <[hidden email]>
---
 po/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/po/.gitignore b/po/.gitignore
index 51fb607..74f281c 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -14,3 +14,4 @@ [hidden email]
 insert-header.sin
 quot.sed
 remove-potcdate.sin
+*.po~
--
1.7.1.1


_______________________________________________
Confuse-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/confuse-devel
Reply | Threaded
Open this post in threaded view
|

[PATCH 4/5] build: ignore macros by using a wildcard entry

Carlo Marcelo Arenas Belon
In reply to this post by Carlo Marcelo Arenas Belon
all macros are imported here at bootstrap time, so avoid keeping track
of each specific one.

Signed-off-by: Carlo Marcelo Arenas Belon <[hidden email]>
---
 m4/.gitignore |   36 +-----------------------------------
 1 files changed, 1 insertions(+), 35 deletions(-)

diff --git a/m4/.gitignore b/m4/.gitignore
index 6e6c301..0f4126c 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,35 +1 @@
-codeset.m4
-gettext.m4
-glibc2.m4
-glibc21.m4
-iconv.m4
-intdiv0.m4
-intl.m4
-intldir.m4
-intmax.m4
-inttypes-pri.m4
-inttypes_h.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-libtool.m4
-lock.m4
-longdouble.m4
-longlong.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
-nls.m4
-po.m4
-printf-posix.m4
-progtest.m4
-size_max.m4
-stdint_h.m4
-uintmax_t.m4
-ulonglong.m4
-visibility.m4
-wchar_t.m4
-wint_t.m4
-xsize.m4
+*.m4
--
1.7.1.1


_______________________________________________
Confuse-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/confuse-devel
Reply | Threaded
Open this post in threaded view
|

[PATCH 5/5] build: keep track of windows specific config.h

Carlo Marcelo Arenas Belon
In reply to this post by Carlo Marcelo Arenas Belon
avoid ignoring on git changes to the config.h files that are being
maintained manually to build on windows.

Signed-off-by: Carlo Marcelo Arenas Belon <[hidden email]>
---
 windows/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 windows/.gitignore

diff --git a/windows/.gitignore b/windows/.gitignore
new file mode 100644
index 0000000..120fe77
--- /dev/null
+++ b/windows/.gitignore
@@ -0,0 +1 @@
+!config.h
--
1.7.1.1


_______________________________________________
Confuse-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/confuse-devel