CMake: Translations: Pass some additional arguments to commands

[apt.git] / prepare-release

diff --git a/prepare-release b/prepare-release
index cdc2ba6763c16bb1f83f7e692d7409ceacaa1c9a..77d8580d9c8ef542c77a0322b60a26d07324155a 100755 (executable)
--- a/prepare-release
+++ b/prepare-release
@@ -21,7 +21,7 @@ librarysymbolsfromfile() {
        echo '=== Missing required symbols:'
        echo -n "$MISSING" | grep -v '|optional=' || true
        echo '=== New symbols:'
-       grep '^+ ' "$1" | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do
+       grep '^+ ' "$1" | grep -v '^+ (c++' | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do
                echo " (c++)\"${line}@${SYMVER}\" $VERSION"
        done | sort -u
 }
@@ -127,7 +127,14 @@ elif [ "$1" = 'post-build' ]; then
 
 elif [ "$1" = 'library' ]; then
        librarysymbols() {
+               local libname=$(echo "${1}" | cut -c 4-)
                local buildlib="build/bin/${1}.so.${2}"
+               for dir in $libname */$libname; do
+                       local new_buildlib="$dir/${1}.so.${2}"
+                       if [  -r "${new_buildlib}" ] && [ ! -e "$buildlib" -o "$new_buildlib" -nt "$buildlib" ]; then
+                               local buildlib="${new_buildlib}"
+                       fi
+               done
                if [ ! -r "$buildlib" ]; then
                        echo "ERROR: The library ${1} has to be built before symbols can be checked!"
                        return
@@ -147,7 +154,7 @@ elif [ "$1" = 'buildlog' ]; then
                shift
        done
 elif [ "$1" = 'travis-ci' ]; then
-       apt-get install -qy --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' | tr -d ',')
+       apt-get install -qy --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' -e 's#<.*>##g' | tr -d ',')
        apt-get install -qy --no-install-recommends $(sed -n 's#^Depends: .*@, \(.*\)$#\1#p' debian/tests/control | tr -d ',')
 elif [ "$1" = 'coverage' ]; then
        DIR="${2:-./coverage}"