Explorar el Código

Add docs to mingw release and don't modify libtool files in mingw's Makefile

(cherry picked from commit 2b2907db18484c4c41a6afa0972accd1c0e84237)
Anonymous Maarten hace 10 meses
padre
commit
79ec168f3c
Se han modificado 2 ficheros con 5 adiciones y 5 borrados
  1. 5 3
      build-scripts/build-release.py
  2. 0 2
      mingw/pkg-support/Makefile

+ 5 - 3
build-scripts/build-release.py

@@ -362,6 +362,7 @@ class Releaser:
             ("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 @@ class Releaser:
             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"

+ 0 - 2
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!"; \