Avoid artifacting untarred dist folders and add package publication

This commit is contained in:
Tristan
2022-06-06 08:51:31 +01:00
parent 77fea45630
commit 2bbb15c003
5 changed files with 71 additions and 14 deletions

7
deps/lua/Makefile vendored
View File

@@ -4,8 +4,9 @@ LUA_TARBALL = lua-$(LUA_VERSION).tar.gz
LUA_BUILDIR = src
LUA_DESTDIR = dist
LUA_DESTDIR_ABS = $(shell realpath $(LUA_DESTDIR))
LUA_ARCHIVE = lua-dist.tar.gz
all: $(LUA_BUILDIR) $(LUA_DESTDIR)
all: $(LUA_BUILDIR) $(LUA_DESTDIR) $(LUA_ARCHIVE)
$(LUA_BUILDIR):
@if ! [ -d "$(LUA_BUILDIR)" ]; then mkdir -v "$(LUA_BUILDIR)"; fi
@@ -21,9 +22,13 @@ $(LUA_DESTDIR): build
if ! [ -d "$(LUA_DESTDIR)" ]; then mkdir -v "$(LUA_DESTDIR)"; fi
$(MAKE) -C $(LUA_BUILDIR) -j$(shell nproc) install INSTALL_TOP="$(LUA_DESTDIR_ABS)"
$(LUA_ARCHIVE): $(LUA_DESTDIR)
tar -C "$(LUA_DESTDIR)" -cjf "$(LUA_ARCHIVE)" $$(ls -1 $(LUA_DESTDIR))
clean:
rm -rf "$(LUA_BUILDIR)"
rm -rf "$(LUA_DESTDIR)"
rm -fv "$(LUA_TARBALL)"
rm -fv "$(LUA_ARCHIVE)"
.PHONY: clean build

9
deps/pcre2/Makefile vendored
View File

@@ -4,6 +4,7 @@ PCRE2_TARBALL = pcre2-$(PCRE2_VERSION).tar.gz
PCRE2_BUILDIR = src
PCRE2_DESTDIR = dist
PCRE2_DESTDIR_ABS = $(shell realpath $(PCRE2_DESTDIR))
PCRE2_ARCHIVE = pcre2-dist.tar.gz
all: build dist
@@ -18,13 +19,17 @@ build: $(PCRE2_BUILDIR)/pcre2-$(PCRE2_VERSION).tar.gz
if [ -f "$(PCRE2_BUILDIR)/CmakeCache.txt" ]; then rm -v "$(PCRE2_BUILDIR)/CmakeCache.txt"; fi
cd "$(PCRE2_BUILDIR)" && cmake -DPCRE2_STATIC_PIC=ON -DPCRE2_SUPPORT_JIT=ON -DCMAKE_INSTALL_PREFIX="$(PCRE2_DESTDIR_ABS)" . && make
dist: build
$(PCRE2_DESTDIR): build
if ! [ -d "$(PCRE2_DESTDIR)" ]; then mkdir -v "$(PCRE2_DESTDIR)"; fi
cd "$(PCRE2_BUILDIR)" && make install
$(PCRE2_ARCHIVE): $(PCRE2_DESTDIR)
tar -C "$(PCRE2_DESTDIR)" -cjf "$(PCRE2_ARCHIVE)" $$(ls -1 $(PCRE2_DESTDIR))
clean:
rm -rf "$(PCRE2_BUILDIR)"
rm -rf "$(PCRE2_DESTDIR)"
rm -fv "$(PCRE2_TARBALL)"
rm -fv "$(PCRE2_ARCHIVE)"
.PHONY: clean build dist
.PHONY: clean build

View File

@@ -4,7 +4,7 @@ QUICTLS_TARBALL = quictls-$(QUICTLS_VERSION).tar.gz
QUICTLS_BUILDIR = src
QUICTLS_DESTDIR = dist
QUICTLS_DESTDIR_ABS = $(shell realpath $(QUICTLS_DESTDIR))
QUICTLS_ARCHIVE = quictls-$(QUICTLS_VERSION)-dist.tar.gz
QUICTLS_ARCHIVE = quictls-dist.tar.gz
all: $(QUICTLS_DESTDIR) $(QUICTLS_ARCHIVE)