Skip to content

Commit 6e4f7ae

Browse files
committed
chore: new build system
1 parent 1036bdb commit 6e4f7ae

File tree

1 file changed

+26
-13
lines changed

1 file changed

+26
-13
lines changed

Diff for: Makefile

+26-13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ _CONFIG_MK!= test -e config.mk && echo config.mk || echo config-null.mk
55
CONFIG_MK?= ${_CONFIG_MK}
66
include ${CONFIG_MK}
77

8+
DIST!= if test -d .git; then echo "dist-git"; \
9+
else echo "dist-inst"; fi
10+
811
SBINDIR?= /sbin
912
SYSCONFDIR?= /etc
1013
LIBEXECDIR?= /libexec/resolvconf
@@ -37,12 +40,12 @@ SED_RCDIR= -e 's:@RCDIR@:${RCDIR}:g'
3740
SED_STATUSARG= -e 's:@STATUSARG@:${STATUSARG}:g'
3841

3942
DISTPREFIX?= ${PKG}-${VERSION}
40-
DISTFILEGZ?= ${DISTPREFIX}.tar.gz
4143
DISTFILE?= ${DISTPREFIX}.tar.xz
4244
DISTINFO= ${DISTFILE}.distinfo
43-
DISTINFOSIGN= ${DISTINFO}.asc
44-
CKSUM?= cksum -a SHA256
45-
PGP?= netpgp
45+
DISTINFOMD= ${DISTINFO}.md
46+
DISTSIGN= ${DISTFILE}.asc
47+
SHA256?= sha256
48+
PGP?= gpg
4649

4750
GITREF?= HEAD
4851

@@ -60,7 +63,7 @@ clean:
6063
rm -f ${TARGET}
6164

6265
distclean: clean
63-
rm -f config.mk ${DISTFILE} ${DISTINFO} ${DISTINFOSIGN}
66+
rm -f config.mk ${DISTFILE} ${DISTINFO} ${DISTINFOMD} ${DISTSIGN}
6467

6568
installdirs:
6669

@@ -91,18 +94,28 @@ dist-inst:
9194
mkdir /tmp/${DISTPREFIX}
9295
cp -RPp * /tmp/${DISTPREFIX}
9396
(cd /tmp/${DISTPREFIX}; make clean)
94-
tar -cvjpf ${DISTFILE} -C /tmp ${DISTPREFIX}
97+
tar -cvJpf ${DISTFILE} -C /tmp ${DISTPREFIX}
9598
rm -rf /tmp/${DISTPREFIX}
9699

97-
dist: dist-git
100+
dist: ${DIST}
98101

99102
distinfo: dist
100-
rm -f ${DISTINFO} ${DISTINFOSIGN}
101-
${CKSUM} ${DISTFILE} >${DISTINFO}
102-
#printf "SIZE (${DISTFILE}) = %s\n" $$(wc -c <${DISTFILE}) >>${DISTINFO}
103-
${PGP} --clearsign --output=${DISTINFOSIGN} ${DISTINFO}
104-
chmod 644 ${DISTINFOSIGN}
105-
ls -l ${DISTFILE} ${DISTINFO} ${DISTINFOSIGN}
103+
rm -f ${DISTINFO} ${DISTSIGN}
104+
${SHA256} ${DISTFILE} >${DISTINFO}
105+
${PGP} --armour --detach-sign ${DISTFILE}
106+
chmod 644 ${DISTSIGN}
107+
ls -l ${DISTFILE} ${DISTINFO} ${DISTSIGN}
108+
109+
${DISTINFOMD}: ${DISTINFO}
110+
echo '```' >${DISTINFOMD}
111+
cat ${DISTINFO} >>${DISTINFOMD}
112+
echo '```' >>${DISTINFOMD}
113+
114+
release: distinfo ${DISTINFOMD}
115+
gh release create v${VERSION} \
116+
--title "openresolv ${VERSION}" --draft --generate-notes \
117+
--notes-file ${DISTINFOMD} \
118+
${DISTFILE} ${DISTSIGN}
106119

107120
import: dist
108121
rm -rf /tmp/${DISTPREFIX}

0 commit comments

Comments
 (0)