Skip to content

Commit

Permalink
Add docs to mingw release and don't modify libtool files in mingw's M…
Browse files Browse the repository at this point in the history
…akefile
  • Loading branch information
madebr committed Oct 1, 2024
1 parent 8291b1b commit 2b2907d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 5 additions & 3 deletions build-scripts/build-release.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions mingw/pkg-support/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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!"; \
Expand Down

0 comments on commit 2b2907d

Please sign in to comment.