Skip to content

Commit 79ec168

Browse files
committed
Add docs to mingw release and don't modify libtool files in mingw's Makefile
(cherry picked from commit 2b2907d)
1 parent 40a3a80 commit 79ec168

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build-scripts/build-release.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ def create_mingw_archives(self) -> None:
362362
("WhatsNew.txt", ""),
363363
("LICENSE.txt", ""),
364364
("README.md", ""),
365+
("docs/*.md", "docs/"),
365366
)
366367
test_files = list(Path(r) / f for r, _, files in os.walk(self.root / "test") for f in files)
367368

@@ -374,10 +375,11 @@ def create_mingw_archives(self) -> None:
374375
logger.info("Creating %s...", tar_paths[comp])
375376
with tarfile.open(tar_paths[comp], f"w:{comp}") as tar_object:
376377
arc_root = f"{self.project}-{self.version}"
377-
for file_path, arcdirname in extra_files:
378+
for file_path_glob, arcdirname in extra_files:
378379
assert not arcdirname or arcdirname[-1] == "/"
379-
arcname = f"{arc_root}/{arcdirname}{Path(file_path).name}"
380-
tar_object.add(self.root / file_path, arcname=arcname)
380+
for file_path in glob.glob(file_path_glob, root_dir=self.root):
381+
arcname = f"{arc_root}/{arcdirname}{Path(file_path).name}"
382+
tar_object.add(self.root / file_path, arcname=arcname)
381383
for arch in mingw_archs:
382384
install_path = arch_install_paths[arch]
383385
arcname_parent = f"{arc_root}/{arch}-w64-mingw32"

mingw/pkg-support/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ install-package:
2121
(cd $(arch) && cp -rv bin include lib share $(prefix)/); \
2222
sed "s|^prefix=.*|prefix=$(prefix)|" <$(arch)/bin/sdl2-config >$(prefix)/bin/sdl2-config; \
2323
chmod 755 $(prefix)/bin/sdl2-config; \
24-
sed "s|^libdir=.*|libdir=\'$(prefix)/lib\'|" <$(arch)/lib/libSDL2.la >$(prefix)/lib/libSDL2.la; \
25-
sed "s|^libdir=.*|libdir=\'$(prefix)/lib\'|" <$(arch)/lib/libSDL2main.la >$(prefix)/lib/libSDL2main.la; \
2624
sed "s|^prefix=.*|prefix=$(prefix)|" <$(arch)/lib/pkgconfig/sdl2.pc >$(prefix)/lib/pkgconfig/sdl2.pc; \
2725
else \
2826
echo "*** ERROR: $(arch) or $(prefix) does not exist!"; \

0 commit comments

Comments
 (0)