diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/notsd-find-renames | 2 | ||||
| -rwxr-xr-x | tools/notsd-fixup | 17 | ||||
| -rwxr-xr-x | tools/notsd-fixup--includes | 17 | ||||
| -rwxr-xr-x | tools/notsd-move | 35 |
4 files changed, 40 insertions, 31 deletions
diff --git a/tools/notsd-find-renames b/tools/notsd-find-renames new file mode 100755 index 0000000000..fe90e325f6 --- /dev/null +++ b/tools/notsd-find-renames @@ -0,0 +1,2 @@ +#!/bin/sh +git diff --find-renames -l1000 --stat=300,290 "${1:-notsystemd/postmove}" "${2:-notsystemd/master}" |sed -n '/=>/s/\s*|.*//p'
\ No newline at end of file diff --git a/tools/notsd-fixup b/tools/notsd-fixup index 77df56fff4..99ae0981a3 100755 --- a/tools/notsd-fixup +++ b/tools/notsd-fixup @@ -22,12 +22,17 @@ fixup_makefiles() ( ) fixup_includes() ( - find $(find . -type d -name include) -type d | while read -r dir; do - lib="${dir##*/}" - pushd "$dir" >/dev/null - find . -type f -exec sed -ri -e "s|$lib/||" -- {} + - popd >/dev/null - done + dirs=($(find "$@" -type d -name include)) + if [[ ${#dirs[@]} -gt 0 ]]; then + find "${dirs[@]}" -type d | while read -r dir; do + printf '=> libdir %q\n' "$dir" + lib="${dir##*/}" + find "$dir" -type f | while read -r filename; do + printf ' => sed -ir %q %q\n' "s|$lib/||" "$filename" + sed -r "s|$lib/||" < "$filename" | build-aux/write-ifchanged "$filename" + done + done + fi find "$@" \( -name '*.h' -o -name '*.c' -o -name '*.gperf' \) -type f | while read -r filename; do "$0"--includes "$filename" diff --git a/tools/notsd-fixup--includes b/tools/notsd-fixup--includes index 315be32c8d..33218233d5 100755 --- a/tools/notsd-fixup--includes +++ b/tools/notsd-fixup--includes @@ -33,7 +33,7 @@ classify() { case "$base" in dns_type) d=src/grp-resolve/systemd-resolved;; keyboard-keys) d=src/grp-udev/libudev-core;; - af|arphrd|cap|errno) d=src/libbasic/include/basic;; + af|arphrd|cap|errno) d=src/libsystemd-basic/src;; audit_type) d=src/libsystemd/src/sd-journal;; *) >&2 printf 'Unknown gperf base: %q\n' "$base" @@ -57,7 +57,7 @@ classify() { if [[ "$current_file" = */systemd-boot/* ]]; then out private util.h else - out protected basic/util.h + out protected systemd-basic/util.h fi ;; *) @@ -77,6 +77,9 @@ classify() { */include/*) out protected "${file##*/include/}" ;; + */include-staging/*) + out protected "${file##*/include-staging/}" + ;; *) if [[ "${current_file%/*}" = "${file%/*}" ]]; then out private "${file##*/}" @@ -219,7 +222,6 @@ main() { current_file="$1" printf ' => %q %q\n' "$0" "$current_file" set -o pipefail - trap 'rm -f -- "$current_file.tmp"' EXIT { IFS='' while read -r line; do @@ -227,14 +229,7 @@ main() { IFS='' done "$hook" - } < "$current_file" > "$current_file.tmp" - # I specificially don't use write-ifchanged because I don't want the - # temporary file to have the .c suffix. - if cmp -s "$current_file.tmp" "$current_file"; then - rm -f "$current_file.tmp" || : - else - mv -Tf "$current_file.tmp" "$current_file" - fi + } < "$current_file" | build-aux/write-ifchanged "$current_file" } main "$@" diff --git a/tools/notsd-move b/tools/notsd-move index 2f6ad3f1b0..21609485a9 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -119,21 +119,22 @@ move_files() ( src/core/umount* mv -T src/{,lib}core - mv -T src/{,lib}basic - mv -T src/{,lib}shared + mv -T src/{,libsystemd-}basic + mv -T src/{,libsystemd-}shared - mv -T src/lib{shared,core}/linux + mv -T src/lib{systemd-shared,core}/linux mkdir src/libfirewall - mv -T src/lib{shared,firewall}/firewall-util.c - mv -T src/lib{shared,firewall}/firewall-util.h + mv -T src/lib{systemd-shared,firewall}/firewall-util.c + mv -T src/lib{systemd-shared,firewall}/firewall-util.h - split_lib src/libbasic + split_lib src/libcore + split_lib src/libsystemd-basic + split_lib src/libsystemd-shared split_lib src/libsystemd-network - split_lib src/libshared - mv src/libshared/{test,include/shared}/test-tables.h - rmdir src/libshared/test + mv src/libsystemd-shared/{test,include/systemd-shared}/test-tables.h + rmdir src/libsystemd-shared/test mkdir src/systemd-hibernate-resume-generator mv -t src/systemd-hibernate-resume-generator \ @@ -441,7 +442,7 @@ move_files() ( units/machine.slice* # muck - mv -t src/libbasic/include/basic src/libbasic/.gitignore + mv -t src/libsystemd-basic/include/systemd-basic src/libsystemd-basic/.gitignore mv -T {test,src/systemd-boot}/test-efi-create-disk.sh mv -t src/systemd-tmpfiles units/systemd-tmpfiles* mv -t src/systemd-tmpfiles \ @@ -698,7 +699,7 @@ breakup_makefile() ( sed -ri \ -e '/^[^# ]*:/ { s|\S+/|$(outdir)/|g }' \ - src/libbasic/include/basic/Makefile \ + src/libsystemd-basic/include/systemd-basic/Makefile \ src/libsystemd/src/Makefile \ src/libsystemd/src/sd-journal/Makefile \ src/grp-udev/libudev-core/Makefile @@ -722,8 +723,8 @@ breakup_makefile() ( ln -sT ../../grp-login/systemd-logind/logind-acl.h src/grp-udev/libudev-core/logind-acl.h ln -sT ../../libsystemd/src/sd-login/sd-login.c src/grp-udev/libudev-core/sd-login.c ln -sT ../../grp-login/systemd-logind/logind-acl.c src/grp-udev/libudev-core/logind-acl.c - ln -sT ../../../libshared/include/shared/gcrypt-util.h src/libsystemd/src/sd-journal/gcrypt-util.h - ln -sT ../../../libshared/src/gcrypt-util.c src/libsystemd/src/sd-journal/gcrypt-util.c + ln -sT ../../../libsystemd-shared/include/systemd-shared/gcrypt-util.h src/libsystemd/src/sd-journal/gcrypt-util.h + ln -sT ../../../libsystemd-shared/src/gcrypt-util.c src/libsystemd/src/sd-journal/gcrypt-util.c ln -sT ../grp-system/libcore/machine-id-setup.h src/systemd-machine-id-setup/machine-id-setup.h ln -sT ../grp-system/libcore/machine-id-setup.c src/systemd-machine-id-setup/machine-id-setup.c @@ -748,7 +749,13 @@ fixup_makefile() { -e '/^[^# ]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \ -e 's|^if (.*)|ifneq ($(\1),)|' \ -e '/^\s*\$\(AM_(C|CPP|LD)FLAGS\b/d' \ - -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g' + -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g' \ + -e '#### Rename helpers ################' \ + -e 's|libbasic_la|libsystemd_basic_la|g' \ + -e 's|libshared_la|libsystemd_shared_la|g' \ + -e 's|libbasic|libsystemd-basic|g' \ + -e 's|libshared|libsystemd-shared|g' \ + -e 's|libsystemd-basic-dns|libbasic-dns|g' } breakup_zshcompletion() ( |