[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - solenv/bin

[Pranav Kant]

 solenv/bin/create-tags |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 54aca54e3dfb3610e90ef109660e6357851f9666
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Nov 27 23:25:35 2017 +0530

    etags: pass the "-e" flag directly to ctag binary
    
    'man ctags' says that emacs mode will be enabled if the ctags binary is
    renamed as etags or '-e' flag is provided to ctags binary.
    
    Before this patch, the script assumes that host system has an 'etags'
    binary renamed from 'ctags' program. This is not always the case in all
    hosts. Eg: In Fedora, 'etags' binary is provided by emacs-common package
    which doesn't understand the flags given later in the script.
    
    It is safe to just explicitly enable the emacs mode via '-e' flag to the
    ctags binary.
    
    Change-Id: Ic7ded56cff32683fc5e9d3fcc7405e79da4c23b7
    Reviewed-on: https://gerrit.libreoffice.org/45358
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    (cherry picked from commit 3ece8264b4c0b41f480e77980b987db4540e49e7)
    Reviewed-on: https://gerrit.libreoffice.org/45541
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index 639111cb1f77..913f97f4be36 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -7,11 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-ctags=ctags
-if test "$1" = "-e"; then
-    ctags=etags
-fi
-
+ctags="ctags $@"
 saloptions="-ISAL_DELETED_FUNCTION -ISAL_OVERRIDE -ISAL_FINAL -ISAL_CONSTEXPR"
 omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"