From af54cd4ee1ba14bf3456ad4a55ad87f332a9cd54 Mon Sep 17 00:00:00 2001 From: Rudy Date: Sat, 17 May 2025 13:17:47 +1000 Subject: [PATCH] libmakepkg/tidy: give scripts a priority order This ensures (e.g.) that the "emptydirs" script runs last after unneeded files have been deleted. Fixes #184. Signed-off-by: Allan McRae --- .../libmakepkg/tidy/{docs.sh.in => 10-docs.sh.in} | 0 .../tidy/{libtool.sh.in => 10-libtool.sh.in} | 0 .../tidy/{staticlibs.sh.in => 10-staticlibs.sh.in} | 0 .../tidy/{purge.sh.in => 50-purge.sh.in} | 0 .../tidy/{strip.sh.in => 50-strip.sh.in} | 0 .../tidy/{zipman.sh.in => 50-zipman.sh.in} | 0 .../tidy/{emptydirs.sh.in => 90-emptydirs.sh.in} | 0 scripts/libmakepkg/tidy/meson.build | 14 +++++++------- 8 files changed, 7 insertions(+), 7 deletions(-) rename scripts/libmakepkg/tidy/{docs.sh.in => 10-docs.sh.in} (100%) rename scripts/libmakepkg/tidy/{libtool.sh.in => 10-libtool.sh.in} (100%) rename scripts/libmakepkg/tidy/{staticlibs.sh.in => 10-staticlibs.sh.in} (100%) rename scripts/libmakepkg/tidy/{purge.sh.in => 50-purge.sh.in} (100%) rename scripts/libmakepkg/tidy/{strip.sh.in => 50-strip.sh.in} (100%) rename scripts/libmakepkg/tidy/{zipman.sh.in => 50-zipman.sh.in} (100%) rename scripts/libmakepkg/tidy/{emptydirs.sh.in => 90-emptydirs.sh.in} (100%) diff --git a/scripts/libmakepkg/tidy/docs.sh.in b/scripts/libmakepkg/tidy/10-docs.sh.in similarity index 100% rename from scripts/libmakepkg/tidy/docs.sh.in rename to scripts/libmakepkg/tidy/10-docs.sh.in diff --git a/scripts/libmakepkg/tidy/libtool.sh.in b/scripts/libmakepkg/tidy/10-libtool.sh.in similarity index 100% rename from scripts/libmakepkg/tidy/libtool.sh.in rename to scripts/libmakepkg/tidy/10-libtool.sh.in diff --git a/scripts/libmakepkg/tidy/staticlibs.sh.in b/scripts/libmakepkg/tidy/10-staticlibs.sh.in similarity index 100% rename from scripts/libmakepkg/tidy/staticlibs.sh.in rename to scripts/libmakepkg/tidy/10-staticlibs.sh.in diff --git a/scripts/libmakepkg/tidy/purge.sh.in b/scripts/libmakepkg/tidy/50-purge.sh.in similarity index 100% rename from scripts/libmakepkg/tidy/purge.sh.in rename to scripts/libmakepkg/tidy/50-purge.sh.in diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/50-strip.sh.in similarity index 100% rename from scripts/libmakepkg/tidy/strip.sh.in rename to scripts/libmakepkg/tidy/50-strip.sh.in diff --git a/scripts/libmakepkg/tidy/zipman.sh.in b/scripts/libmakepkg/tidy/50-zipman.sh.in similarity index 100% rename from scripts/libmakepkg/tidy/zipman.sh.in rename to scripts/libmakepkg/tidy/50-zipman.sh.in diff --git a/scripts/libmakepkg/tidy/emptydirs.sh.in b/scripts/libmakepkg/tidy/90-emptydirs.sh.in similarity index 100% rename from scripts/libmakepkg/tidy/emptydirs.sh.in rename to scripts/libmakepkg/tidy/90-emptydirs.sh.in diff --git a/scripts/libmakepkg/tidy/meson.build b/scripts/libmakepkg/tidy/meson.build index 052ac7a2..7421b02a 100644 --- a/scripts/libmakepkg/tidy/meson.build +++ b/scripts/libmakepkg/tidy/meson.build @@ -1,13 +1,13 @@ libmakepkg_module = 'tidy' sources = [ - 'docs.sh.in', - 'emptydirs.sh.in', - 'libtool.sh.in', - 'purge.sh.in', - 'staticlibs.sh.in', - 'strip.sh.in', - 'zipman.sh.in', + '10-docs.sh.in', + '10-libtool.sh.in', + '10-staticlibs.sh.in', + '50-purge.sh.in', + '50-strip.sh.in', + '50-zipman.sh.in', + '90-emptydirs.sh.in', ] foreach src : sources