[Libreoffice-commits] core.git: bin/verify-custom-widgets-libs

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Jan 29 17:01:44 UTC 2019


 bin/verify-custom-widgets-libs |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 4faafea4f24316e75b80e6ef97c1a4d39551a0b2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 29 15:29:15 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jan 29 18:01:33 2019 +0100

    give better warning explanation
    
    Change-Id: If76e1acdcb601d70c956bcaf0392046430f4853e
    Reviewed-on: https://gerrit.libreoffice.org/67086
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bin/verify-custom-widgets-libs b/bin/verify-custom-widgets-libs
index b0ea0a5e5a51..7fad02f178c2 100755
--- a/bin/verify-custom-widgets-libs
+++ b/bin/verify-custom-widgets-libs
@@ -15,15 +15,16 @@
 # its easy to put the wrong lib name in if developing
 # under Linux
 
-FOO=`grep -h -r lo- */uiconfig | sed -e "s/<object class=\"//g" | sed -e "s/\".*$//"| sed 's/^[ \t]*//;s/[ \t]*$//'|sort|uniq`
+ret=0
+FOO=`git grep -h -r lo- */uiconfig | sed -e "s/<object class=\"//g" | sed -e "s/\".*$//"| sed 's/^[ \t]*//;s/[ \t]*$//'|sort|uniq`
 for foo in $FOO; do
     lib=$(echo $foo | cut -f1 -d-)
     symbol=$(echo $foo | cut -f2 -d-)
-    echo testing if lib$lib.so contains make$symbol
     nm -D instdir/program/lib$lib.so | grep make$symbol > /dev/null
     if [ $? != 0 ]; then
-        echo "MISSING. Windows will crash"
-    else
-        echo "OK";
+        echo "$foo exists in a .ui file, but make$symbol is missing from lib$lib.so, Windows will fail to find the symbol and crash"
+	echo "  typically make$symbol is in a different library and $foo should have the prefix of that library instead"
+        ret=1
     fi
 done
+exit $ret


More information about the Libreoffice-commits mailing list