diff options
author | Andreas Fankhauser hiddenalpha.ch | 2023-09-30 14:20:44 +0200 |
---|---|---|
committer | Andreas Fankhauser hiddenalpha.ch | 2023-09-30 14:42:10 +0200 |
commit | ca557f6dc3a59c723525e38e37fce1b9952758e3 (patch) | |
tree | d481ccef286468fb581146a13849504f222de033 | |
parent | 830b4aa30ae4250d50fed8fc999dacd643132597 (diff) | |
download | gateleen-resclone-ca557f6dc3a59c723525e38e37fce1b9952758e3.zip gateleen-resclone-ca557f6dc3a59c723525e38e37fce1b9952758e3.tar.gz |
Use txt instead md. Drop obsolete rt bundle. Hide misleading error msg.
-rw-r--r-- | Makefile | 15 | ||||
-rw-r--r-- | contrib/build-env-setup/README.txt (renamed from contrib/build-env-setup/README.md) | 2 |
2 files changed, 1 insertions, 16 deletions
@@ -114,20 +114,5 @@ dist: clean link mv build/checksums.md5 build/dist-bin/checksums.md5 (cd build/dist-bin && tar --owner=0 --group=0 -czf ../../dist/GateleenResclone-$(PROJECT_VERSION)-$(TOOLCHAIN).tgz *) @echo "\n[\033[34mINFO \033[0m] DONE: Artifacts created and placed in 'dist'." - @# Dependency Bundle. - $(eval PCKROOT := build/dist-rt) - @sh -c 'if test ".exe" = "$(BINEXT)"; then \ - rm -rf ./$(PCKROOT); \ - mkdir -p ./$(PCKROOT)/bin; \ - cp external/$(TOOLCHAIN)/rt/bin/libarchive-13.dll $(PCKROOT)/bin/; \ - cp external/$(TOOLCHAIN)/rt/bin/libcurl-4.dll $(PCKROOT)/bin/; \ - cp external/$(TOOLCHAIN)/rt/bin/libiconv-2.dll $(PCKROOT)/bin/; \ - cp external/$(TOOLCHAIN)/rt/bin/libpcreposix-0.dll $(PCKROOT)/bin/; \ - cp external/$(TOOLCHAIN)/rt/bin/libpcre-1.dll $(PCKROOT)/bin/; \ - cp external/$(TOOLCHAIN)/rt/bin/*pthread*.dll $(PCKROOT)/bin/libwinpthread-1.dll; \ - (cd $(PCKROOT) && find . -type f -exec md5sum -b {} \;) > build/checksums.md5; \ - mv build/checksums.md5 $(PCKROOT)/checksums.md5; \ - (cd build/dist-rt && tar --owner=0 --group=0 -czf ../../dist/GateleenResclone-$(PROJECT_VERSION)-$(TOOLCHAIN)-rt.tgz *); \ - fi' @echo @echo See './dist/' for result. diff --git a/contrib/build-env-setup/README.md b/contrib/build-env-setup/README.txt index 064f6f8..5d21a4c 100644 --- a/contrib/build-env-setup/README.md +++ b/contrib/build-env-setup/README.txt @@ -78,7 +78,7 @@ true \ && PKGINIT=true \ && PKGADD="$SUDO apk add" \ && PKGDEL="$SUDO apk del" \ - && PKGCLEAN="$SUDO apk cache clean || true" \ + && PKGCLEAN="$SUDO apk cache clean 2>&1| grep -v 'ERROR: Package cache is not enabled'" \ && HOST=x86_64-w64-mingw32 \ && true |