diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/check-docs.sh | 20 | ||||
| -rwxr-xr-x | tools/create-exports-NetworkManager.sh | 15 | ||||
| -rwxr-xr-x | tools/meson-post-install.sh | 4 | ||||
| -rwxr-xr-x | tools/run-nm-test.sh | 2 | ||||
| -rwxr-xr-x | tools/test-networkmanager-service.py | 1 |
5 files changed, 28 insertions, 14 deletions
diff --git a/tools/check-docs.sh b/tools/check-docs.sh index b6fca6e0..e0ed7837 100755 --- a/tools/check-docs.sh +++ b/tools/check-docs.sh @@ -23,9 +23,15 @@ same_lines() { libnm_headers() { ( - ls -1 "$1"libnm/*.h "$1"libnm-core/*.h + ls -1 "$1/libnm"/*.h "$1/libnm-core"/*.h | \ if [ -n "$2" ]; then - ls -1 "$2"/libnm/*.h "$2"/libnm-core/*.h + grep -v -F "$1/libnm-core/nm-core-enum-types.h" | \ + grep -v -F "$1/libnm/nm-enum-types.h" + else + cat + fi + if [ -n "$2" ]; then + ls -1 "$2/libnm"/*.h "$2/libnm-core"/*.h fi ) | sort | uniq } @@ -36,28 +42,28 @@ BUILDDIR="$2" if test "$SOURCEDIR" == "$BUILDDIR"; then BUILDDIR= fi -[ -n "$SOURCEDIR" ] && SOURCEDIR="$SOURCEDIR/" +[ -z "$SOURCEDIR" ] && SOURCEDIR='.' # Check that the D-Bus API docs contain all known interfaces -F1="$(sed -n 's,^ <xi:include href="dbus-\([^"]*\.xml\)"/>$,\1,p' "$SOURCEDIR"docs/api/network-manager-docs.xml)" +F1="$(sed -n 's,^ <xi:include href="dbus-\([^"]*\.xml\)"/>$,\1,p' "$SOURCEDIR/docs/api/network-manager-docs.xml")" F1_EXTRA=" org.freedesktop.NetworkManager.Device.WiMax.xml org.freedesktop.NetworkManager.WiMax.Nsp.xml " -F2="$(cd "$SOURCEDIR"introspection; ls -1 *.xml)" +F2="$(cd "$SOURCEDIR/introspection"; ls -1 *.xml)" if ! same_lines "$F1"$'\n'"$F1_EXTRA" "$F2" ; then die "*** Error: D-Bus interfaces not included in docs/api/network-manager-docs.xml ***" fi # Check that files that define types that are in public libnm API are included in libnm documentation. -F1="$(sed -n 's/.*<xi:include href="xml\/\([^"]*\)\.xml".*/\1/p' "$SOURCEDIR"docs/libnm/libnm-docs.xml)" +F1="$(sed -n 's/.*<xi:include href="xml\/\([^"]*\)\.xml".*/\1/p' "$SOURCEDIR/docs/libnm/libnm-docs.xml")" F1_EXTRA=" nm-core-enum-types nm-enum-types " -F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR"libnm/libnm.ver | word_regex)" \ +F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR/libnm/libnm.ver" | word_regex)" \ $(libnm_headers "$SOURCEDIR" "$BUILDDIR") \ | sed 's,.*/\([^/]\+\)\.h$,\1,')" F2_EXTRA=" diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh index 375141aa..b089aba2 100755 --- a/tools/create-exports-NetworkManager.sh +++ b/tools/create-exports-NetworkManager.sh @@ -18,10 +18,15 @@ die() { # options to yield the most symbols. _build() { git clean -fdx - ./autogen.sh --enable-ld-gc --enable-ifcfg-rh --enable-ifupdown \ - --enable-config-plugin-ibft --enable-teamdctl --enable-wifi \ - --with-modem-manager-1 --with-ofono --with-more-asserts \ - --with-more-logging + ./autogen.sh --enable-ld-gc \ + --enable-ifcfg-rh \ + --enable-ifupdown \ + --enable-teamdctl \ + --enable-wifi \ + --with-modem-manager-1 \ + --with-ofono \ + --with-more-asserts \ + --with-more-logging make -j20 } @@ -56,7 +61,7 @@ get_symbols_missing() { ./src/devices/*/${libs} \ ./src/ppp/${libs} -name '*.so' 2>/dev/null); do call_nm "$f" | - sed -n 's/^\([U]\) \(\(nm_\|nmp_\|_nm\|NM\|_NM\|c_siphash_\).*\)$/\2/p' + sed -n 's/^\([U]\) \(\(nm_\|nmp_\|_nm\|NM\|_NM\|nmtst_\|c_siphash_\|c_list_\).*\)$/\2/p' done) | _sort | grep -Fx -f <(get_symbols_explict) -v | diff --git a/tools/meson-post-install.sh b/tools/meson-post-install.sh index 2037c0ce..76b44371 100755 --- a/tools/meson-post-install.sh +++ b/tools/meson-post-install.sh @@ -27,6 +27,10 @@ for dir in "${pkgconfdir}/conf.d" \ "${pkgconfdir}/dnsmasq.d" \ "${pkgconfdir}/dnsmasq-shared.d" \ "${pkglibdir}/conf.d" \ + "${pkglibdir}/dispatcher.d/no-wait.d" \ + "${pkglibdir}/dispatcher.d/pre-down.d" \ + "${pkglibdir}/dispatcher.d/pre-up.d" \ + "${pkglibdir}/system-connections" \ "${pkglibdir}/VPN"; do mkdir -p "${DESTDIR}${dir}" chmod 0755 "${DESTDIR}${dir}" diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh index 6e7d02c8..135310ac 100755 --- a/tools/run-nm-test.sh +++ b/tools/run-nm-test.sh @@ -192,7 +192,7 @@ TEST_NAME="${TEST##*/}" if [ -z "${NMTST_LAUNCH_DBUS}" ]; then # autodetect whether to launch D-Bus based on the test path. - if [[ $TEST_PATH == */libnm/tests || $TEST_PATH == */libnm-glib/tests ]]; then + if [[ $TEST_PATH == */libnm/tests ]]; then NMTST_LAUNCH_DBUS=1 else NMTST_LAUNCH_DBUS=0 diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index c2d874f3..c921aede 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- from __future__ import print_function |