Mercurial > vim-gutentags

changeset 228:b2d0b28d8001

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ctags script fixes for file-list support. - Log information when running file-list command. - Don't use a project root when we have a file list.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 11 Nov 2018 22:17:52 -0800
parents c64e8847b4e1
children 34bee0477b51
files plat/unix/update_tags.sh plat/win32/update_tags.cmd
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/plat/unix/update_tags.sh	Sun Nov 11 21:48:15 2018 -0800
+++ b/plat/unix/update_tags.sh	Sun Nov 11 22:17:52 2018 -0800
@@ -109,20 +109,25 @@
 if [ $INDEX_WHOLE_PROJECT -eq 1 ]; then
     if [ -n "${FILE_LIST_CMD}" ]; then
         if [ "${PROJECT_ROOT}" = "." ] || [ $FILE_LIST_CMD_IS_ABSOLUTE -eq 1 ]; then
+            echo "Running file list command"
+            echo "eval $FILE_LIST_CMD > \"${TAGS_FILE}.files\""
             eval $FILE_LIST_CMD > "${TAGS_FILE}.files"
         else
             # If using a tags cache directory, use absolute paths
+            echo "Running file list command, patching for absolute paths"
+            echo "eval $FILE_LIST_CMD"
             eval $FILE_LIST_CMD | while read -r l; do
                 echo "${PROJECT_ROOT%/}/${l}"
             done > "${TAGS_FILE}.files"
         fi
-        CTAGS_ARGS="${CTAGS_ARGS} -L ${TAGS_FILE}.files"
-        # Clear project root if we have a file list
-        PROJECT_ROOT=""
+        CTAGS_ARGS="${CTAGS_ARGS} -L "${TAGS_FILE}.files""
+    else
+        CTAGS_ARGS="${CTAGS_ARGS} "${PROJECT_ROOT}""
     fi
+
     echo "Running ctags on whole project"
-    echo "$CTAGS_EXE -f \"$TAGS_FILE.temp\" $CTAGS_ARGS \"$PROJECT_ROOT\""
-    $CTAGS_EXE -f "$TAGS_FILE.temp" $CTAGS_ARGS "$PROJECT_ROOT"
+    echo "$CTAGS_EXE -f \"$TAGS_FILE.temp\" $CTAGS_ARGS"
+    $CTAGS_EXE -f "$TAGS_FILE.temp" $CTAGS_ARGS
 else
     echo "Running ctags on \"$UPDATED_SOURCE\""
     echo "$CTAGS_EXE -f \"$TAGS_FILE.temp\" $CTAGS_ARGS --append \"$UPDATED_SOURCE\""
--- a/plat/win32/update_tags.cmd	Sun Nov 11 21:48:15 2018 -0800
+++ b/plat/win32/update_tags.cmd	Sun Nov 11 22:17:52 2018 -0800
@@ -107,7 +107,7 @@
 )
 if ["%INDEX_WHOLE_PROJECT%"]==["1"] (
     if not ["%FILE_LIST_CMD%"]==[""] (
-        echo Running custom file lister >> %LOG_FILE%
+        echo Running file list command >> %LOG_FILE%
         set use_raw_list=0
         if ["%PROJECT_ROOT%"]==["."] set use_raw_list=1
         if ["%FILE_LIST_CMD_IS_ABSOLUTE%"]==["1"] set use_raw_list=1