From 79ec168f3c1e2fe27335cb8886439f7ef676fb49 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Tue, 1 Oct 2024 23:04:32 +0200 Subject: [PATCH] Add docs to mingw release and don't modify libtool files in mingw's Makefile (cherry picked from commit 2b2907db18484c4c41a6afa0972accd1c0e84237) --- build-scripts/build-release.py | 8 +++++--- mingw/pkg-support/Makefile | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/build-release.py b/build-scripts/build-release.py index 3e94b66fc549a..0da88a075bcb8 100755 --- a/build-scripts/build-release.py +++ b/build-scripts/build-release.py @@ -362,6 +362,7 @@ def create_mingw_archives(self) -> None: ("WhatsNew.txt", ""), ("LICENSE.txt", ""), ("README.md", ""), + ("docs/*.md", "docs/"), ) test_files = list(Path(r) / f for r, _, files in os.walk(self.root / "test") for f in files) @@ -374,10 +375,11 @@ def create_mingw_archives(self) -> None: logger.info("Creating %s...", tar_paths[comp]) with tarfile.open(tar_paths[comp], f"w:{comp}") as tar_object: arc_root = f"{self.project}-{self.version}" - for file_path, arcdirname in extra_files: + for file_path_glob, arcdirname in extra_files: assert not arcdirname or arcdirname[-1] == "/" - arcname = f"{arc_root}/{arcdirname}{Path(file_path).name}" - tar_object.add(self.root / file_path, arcname=arcname) + for file_path in glob.glob(file_path_glob, root_dir=self.root): + arcname = f"{arc_root}/{arcdirname}{Path(file_path).name}" + tar_object.add(self.root / file_path, arcname=arcname) for arch in mingw_archs: install_path = arch_install_paths[arch] arcname_parent = f"{arc_root}/{arch}-w64-mingw32" diff --git a/mingw/pkg-support/Makefile b/mingw/pkg-support/Makefile index 9edfd003e83e0..3d9bc47889a4c 100644 --- a/mingw/pkg-support/Makefile +++ b/mingw/pkg-support/Makefile @@ -21,8 +21,6 @@ install-package: (cd $(arch) && cp -rv bin include lib share $(prefix)/); \ sed "s|^prefix=.*|prefix=$(prefix)|" <$(arch)/bin/sdl2-config >$(prefix)/bin/sdl2-config; \ chmod 755 $(prefix)/bin/sdl2-config; \ - sed "s|^libdir=.*|libdir=\'$(prefix)/lib\'|" <$(arch)/lib/libSDL2.la >$(prefix)/lib/libSDL2.la; \ - sed "s|^libdir=.*|libdir=\'$(prefix)/lib\'|" <$(arch)/lib/libSDL2main.la >$(prefix)/lib/libSDL2main.la; \ sed "s|^prefix=.*|prefix=$(prefix)|" <$(arch)/lib/pkgconfig/sdl2.pc >$(prefix)/lib/pkgconfig/sdl2.pc; \ else \ echo "*** ERROR: $(arch) or $(prefix) does not exist!"; \