[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.10-41-ga00ff64
|
From: |
Paolo Bonzini |
|
Subject: |
grep branch, master, updated. v2.10-41-ga00ff64 |
|
Date: |
Tue, 03 Jan 2012 08:28:19 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via a00ff6423cab863c05f18cbac38abc51afe9d657 (commit)
via 9871ae65430b46710f6bccf732672d4b439aa60c (commit)
via 3f99160691ffee1356ff3757d91a389564270578 (commit)
from bda9087261b3c9b2fcea68d7bf195b8a3d85d736 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=a00ff6423cab863c05f18cbac38abc51afe9d657
commit a00ff6423cab863c05f18cbac38abc51afe9d657
Author: Paolo Bonzini <address@hidden>
Date: Tue Jan 3 09:10:05 2012 +0100
remove lib/ms/
* configure.ac: Create lib/colorize.c as a symbolic link.
* lib/colorize-posix.c: New name of lib/colorize-impl.c.
* lib/colorize-w32.c: New name of lib/ms/colorize-impl.c.
* lib/colorize.c: Delete.
* lib/Makefile.am (EXTRA_DIST): Adjust.
* .gitignore: Adjust.
* cfg.mk: Adjust syntax-check exclusions.
diff --git a/.gitignore b/.gitignore
index e4c7b47..35f5d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,5 +61,8 @@ Makefile.in
TAGS
!/gnulib-tests/Makefile.am
!/lib/Makefile.am
+!/lib/colorize-posix.c
+!/lib/colorize-w32.c
+!/lib/colorize.h
!/lib/savedir.c
!/lib/savedir.h
diff --git a/cfg.mk b/cfg.mk
index 204727d..5040199 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -63,10 +63,8 @@ update-copyright-env = \
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
exclude_file_name_regexp--sc_bindtextdomain = ^tests/get-mb-cur-max\.c$$
-exclude_file_name_regexp--sc_prohibit_strcmp = /colorize-impl\.c$$
+exclude_file_name_regexp--sc_prohibit_strcmp = /colorize-.*\.c$$
exclude_file_name_regexp--sc_prohibit_xalloc_without_use = ^src/kwset\.c$$
exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
(Makefile|\.(am|mk)$$|^gl/lib/.*\.c\.diff$$)
-exclude_file_name_regexp--sc_require_config_h = ^lib/colorize\.c$$
-exclude_file_name_regexp--sc_require_config_h_first = ^lib/colorize\.c$$
exclude_file_name_regexp--sc_space_tab = ^gl/lib/.*\.c\.diff$$
diff --git a/configure.ac b/configure.ac
index 0cfeb62..d681dc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,10 +201,10 @@ fi
gl_FUNC_PCRE
case $host_os in
- mingw*) GREP_SRC_INCLUDES='-I$(top_srcdir)/lib/ms' ;;
- *) GREP_SRC_INCLUDES= ;;
+ mingw*) suffix=w32 ;;
+ *) suffix=posix ;;
esac
-AC_SUBST([GREP_SRC_INCLUDES])
+AC_CONFIG_LINKS([lib/colorize.c:lib/colorize-$suffix.c])
AC_CONFIG_FILES([
Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9127784..afbf3cd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,7 +23,7 @@ AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
libgreputils_a_SOURCES += \
colorize.c colorize.h savedir.c savedir.h
-EXTRA_DIST += colorize-impl.c ms/colorize-impl.c
+EXTRA_DIST += colorize-posix.c colorize-w32.c
libgreputils_a_LIBADD += $(LIBOBJS) $(ALLOCA)
libgreputils_a_DEPENDENCIES += $(LIBOBJS) $(ALLOCA)
diff --git a/lib/colorize-impl.c b/lib/colorize-posix.c
similarity index 100%
rename from lib/colorize-impl.c
rename to lib/colorize-posix.c
diff --git a/lib/ms/colorize-impl.c b/lib/colorize-w32.c
similarity index 100%
rename from lib/ms/colorize-impl.c
rename to lib/colorize-w32.c
diff --git a/lib/colorize.c b/lib/colorize.c
deleted file mode 100644
index 51b1847..0000000
--- a/lib/colorize.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <colorize-impl.c>
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=9871ae65430b46710f6bccf732672d4b439aa60c
commit a00ff6423cab863c05f18cbac38abc51afe9d657
Author: Paolo Bonzini <address@hidden>
Date: Tue Jan 3 09:10:05 2012 +0100
remove lib/ms/
* configure.ac: Create lib/colorize.c as a symbolic link.
* lib/colorize-posix.c: New name of lib/colorize-impl.c.
* lib/colorize-w32.c: New name of lib/ms/colorize-impl.c.
* lib/colorize.c: Delete.
* lib/Makefile.am (EXTRA_DIST): Adjust.
* .gitignore: Adjust.
* cfg.mk: Adjust syntax-check exclusions.
diff --git a/.gitignore b/.gitignore
index e4c7b47..35f5d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,5 +61,8 @@ Makefile.in
TAGS
!/gnulib-tests/Makefile.am
!/lib/Makefile.am
+!/lib/colorize-posix.c
+!/lib/colorize-w32.c
+!/lib/colorize.h
!/lib/savedir.c
!/lib/savedir.h
diff --git a/cfg.mk b/cfg.mk
index 204727d..5040199 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -63,10 +63,8 @@ update-copyright-env = \
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
exclude_file_name_regexp--sc_bindtextdomain = ^tests/get-mb-cur-max\.c$$
-exclude_file_name_regexp--sc_prohibit_strcmp = /colorize-impl\.c$$
+exclude_file_name_regexp--sc_prohibit_strcmp = /colorize-.*\.c$$
exclude_file_name_regexp--sc_prohibit_xalloc_without_use = ^src/kwset\.c$$
exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
(Makefile|\.(am|mk)$$|^gl/lib/.*\.c\.diff$$)
-exclude_file_name_regexp--sc_require_config_h = ^lib/colorize\.c$$
-exclude_file_name_regexp--sc_require_config_h_first = ^lib/colorize\.c$$
exclude_file_name_regexp--sc_space_tab = ^gl/lib/.*\.c\.diff$$
diff --git a/configure.ac b/configure.ac
index 0cfeb62..d681dc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,10 +201,10 @@ fi
gl_FUNC_PCRE
case $host_os in
- mingw*) GREP_SRC_INCLUDES='-I$(top_srcdir)/lib/ms' ;;
- *) GREP_SRC_INCLUDES= ;;
+ mingw*) suffix=w32 ;;
+ *) suffix=posix ;;
esac
-AC_SUBST([GREP_SRC_INCLUDES])
+AC_CONFIG_LINKS([lib/colorize.c:lib/colorize-$suffix.c])
AC_CONFIG_FILES([
Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9127784..afbf3cd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,7 +23,7 @@ AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
libgreputils_a_SOURCES += \
colorize.c colorize.h savedir.c savedir.h
-EXTRA_DIST += colorize-impl.c ms/colorize-impl.c
+EXTRA_DIST += colorize-posix.c colorize-w32.c
libgreputils_a_LIBADD += $(LIBOBJS) $(ALLOCA)
libgreputils_a_DEPENDENCIES += $(LIBOBJS) $(ALLOCA)
diff --git a/lib/colorize-impl.c b/lib/colorize-posix.c
similarity index 100%
rename from lib/colorize-impl.c
rename to lib/colorize-posix.c
diff --git a/lib/ms/colorize-impl.c b/lib/colorize-w32.c
similarity index 100%
rename from lib/ms/colorize-impl.c
rename to lib/colorize-w32.c
diff --git a/lib/colorize.c b/lib/colorize.c
deleted file mode 100644
index 51b1847..0000000
--- a/lib/colorize.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <colorize-impl.c>
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3f99160691ffee1356ff3757d91a389564270578
commit a00ff6423cab863c05f18cbac38abc51afe9d657
Author: Paolo Bonzini <address@hidden>
Date: Tue Jan 3 09:10:05 2012 +0100
remove lib/ms/
* configure.ac: Create lib/colorize.c as a symbolic link.
* lib/colorize-posix.c: New name of lib/colorize-impl.c.
* lib/colorize-w32.c: New name of lib/ms/colorize-impl.c.
* lib/colorize.c: Delete.
* lib/Makefile.am (EXTRA_DIST): Adjust.
* .gitignore: Adjust.
* cfg.mk: Adjust syntax-check exclusions.
diff --git a/.gitignore b/.gitignore
index e4c7b47..35f5d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,5 +61,8 @@ Makefile.in
TAGS
!/gnulib-tests/Makefile.am
!/lib/Makefile.am
+!/lib/colorize-posix.c
+!/lib/colorize-w32.c
+!/lib/colorize.h
!/lib/savedir.c
!/lib/savedir.h
diff --git a/cfg.mk b/cfg.mk
index 204727d..5040199 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -63,10 +63,8 @@ update-copyright-env = \
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
exclude_file_name_regexp--sc_bindtextdomain = ^tests/get-mb-cur-max\.c$$
-exclude_file_name_regexp--sc_prohibit_strcmp = /colorize-impl\.c$$
+exclude_file_name_regexp--sc_prohibit_strcmp = /colorize-.*\.c$$
exclude_file_name_regexp--sc_prohibit_xalloc_without_use = ^src/kwset\.c$$
exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
(Makefile|\.(am|mk)$$|^gl/lib/.*\.c\.diff$$)
-exclude_file_name_regexp--sc_require_config_h = ^lib/colorize\.c$$
-exclude_file_name_regexp--sc_require_config_h_first = ^lib/colorize\.c$$
exclude_file_name_regexp--sc_space_tab = ^gl/lib/.*\.c\.diff$$
diff --git a/configure.ac b/configure.ac
index 0cfeb62..d681dc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,10 +201,10 @@ fi
gl_FUNC_PCRE
case $host_os in
- mingw*) GREP_SRC_INCLUDES='-I$(top_srcdir)/lib/ms' ;;
- *) GREP_SRC_INCLUDES= ;;
+ mingw*) suffix=w32 ;;
+ *) suffix=posix ;;
esac
-AC_SUBST([GREP_SRC_INCLUDES])
+AC_CONFIG_LINKS([lib/colorize.c:lib/colorize-$suffix.c])
AC_CONFIG_FILES([
Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9127784..afbf3cd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,7 +23,7 @@ AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
libgreputils_a_SOURCES += \
colorize.c colorize.h savedir.c savedir.h
-EXTRA_DIST += colorize-impl.c ms/colorize-impl.c
+EXTRA_DIST += colorize-posix.c colorize-w32.c
libgreputils_a_LIBADD += $(LIBOBJS) $(ALLOCA)
libgreputils_a_DEPENDENCIES += $(LIBOBJS) $(ALLOCA)
diff --git a/lib/colorize-impl.c b/lib/colorize-posix.c
similarity index 100%
rename from lib/colorize-impl.c
rename to lib/colorize-posix.c
diff --git a/lib/ms/colorize-impl.c b/lib/colorize-w32.c
similarity index 100%
rename from lib/ms/colorize-impl.c
rename to lib/colorize-w32.c
diff --git a/lib/colorize.c b/lib/colorize.c
deleted file mode 100644
index 51b1847..0000000
--- a/lib/colorize.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <colorize-impl.c>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 3 ++
bootstrap.conf | 1 +
cfg.mk | 4 +--
configure.ac | 6 ++--
gnulib | 2 +-
lib/Makefile.am | 2 +-
lib/{colorize-impl.c => colorize-posix.c} | 29 ++++++++++++++++++++-------
lib/{ms/colorize-impl.c => colorize-w32.c} | 22 ++++++--------------
lib/colorize.c | 1 -
lib/colorize.h | 23 +++------------------
lib/ms/colorize.h | 4 ---
src/Makefile.am | 1 -
src/main.c | 2 +-
13 files changed, 43 insertions(+), 57 deletions(-)
rename lib/{colorize-impl.c => colorize-posix.c} (65%)
rename lib/{ms/colorize-impl.c => colorize-w32.c} (92%)
delete mode 100644 lib/colorize.c
delete mode 100644 lib/ms/colorize.h
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.10-41-ga00ff64,
Paolo Bonzini <=