[gnome-builder/wip/lantw/freebsd-improvement-and-gtk-doc: 1/5] Revert "todo: avoid grep --exclude-dirs on FreeBSD"



commit dbcdf528870ba3541f4c899da315aaf64f911ab1
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Mon Jan 29 22:21:47 2018 +0800

    Revert "todo: avoid grep --exclude-dirs on FreeBSD"
    
    This reverts commit 9489d51e1fd2dfd010917a2a83e466a37da2e7f3.
    
    Since we use the GNU-compatible bsdgrep instead of the ancient GNU grep
    on FreeBSD, we no longer need to disable the use of --exclude-dir.

 src/plugins/todo/gbp-todo-model.c | 9 ---------
 1 file changed, 9 deletions(-)
---
diff --git a/src/plugins/todo/gbp-todo-model.c b/src/plugins/todo/gbp-todo-model.c
index 22065511a..e8f426cf5 100644
--- a/src/plugins/todo/gbp-todo-model.c
+++ b/src/plugins/todo/gbp-todo-model.c
@@ -59,14 +59,12 @@ static GParamSpec *properties [N_PROPS];
 static GRegex *line1;
 static GRegex *line2;
 
-#ifndef __FreeBSD__
 static const gchar *exclude_dirs[] = {
   ".bzr",
   ".flatpak-builder",
   ".git",
   ".svn",
 };
-#endif
 
 static const gchar *exclude_files[] = {
   "*.m4",
@@ -336,12 +334,6 @@ gbp_todo_model_mine_worker (GTask        *task,
       ide_subprocess_launcher_push_argv (launcher, arg);
     }
 
-#ifndef __FreeBSD__
-  /* Exclude directories to reduce how much data can get into our
-   * GBytes of stdout data. FreeBSD does not currently support
-   * this option in their GNU grep version, so we'll just skip it
-   * and their stdout GBytes will be slightly larger (but work).
-   */
   for (guint i = 0; i < G_N_ELEMENTS (exclude_dirs); i++)
     {
       const gchar *exclude_dir = exclude_dirs[i];
@@ -350,7 +342,6 @@ gbp_todo_model_mine_worker (GTask        *task,
       arg = g_strdup_printf ("--exclude-dir=%s", exclude_dir);
       ide_subprocess_launcher_push_argv (launcher, arg);
     }
-#endif
 
   for (guint i = 0; i < G_N_ELEMENTS (keywords); i++)
     {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]