[Libreoffice-commits] core.git: solenv/bin

[Michael Stahl (via logerrit)]

 solenv/bin/create-tags |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit cbfa11ab8f429bf0cb279c732ec7a8dba0090104
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Feb 7 14:01:38 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Feb 7 18:24:01 2020 +0100

    create-tags: Exuberant Ctags 5.8 lacks -D, try to detect that
    
    Change-Id: I1abc60184e0e5b68c41f5a3517f0877889d8f43a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88195
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index bf788e26cd13..4adf3db114d9 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -11,8 +11,13 @@ ctags="ctags $@"
 saloptions="-ISAL_DELETED_FUNCTION -ISAL_OVERRIDE -ISAL_FINAL"
 omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
 
+if LC_ALL=C ${ctags} -D "foo=bar" --license 2>&1 >/dev/null | grep -q -- 'ctags: Unknown option: -D'; then
+    echo "note: your ctags does not support defining macros with -D"
+    no_defines=" "
+fi
+
 $ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $saloptions $omnicppoptions \
-      -D "CPPUNIT_TEST_FIXTURE(TestClass, TestName)=class TestName : public TestClass {};" \
+      ${no_defines:-"-D CPPUNIT_TEST_FIXTURE(TestClass, TestName)=class TestName : public TestClass {};"} \
       --languages=-HTML,Java,JavaScript \
       --langdef=UNOIDL \
       --langmap=UNOIDL:.idl \