X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=b41942843989a75ec2ff0cadd9692979ddd8d890;hb=c6ca9573e07d6547883d37ecf86f9deaffd6bcf5;hp=67854e0186401cba21b7e35da3f8dab05ef21e30;hpb=0ac06dd73a92022079bbd0d4eb770d2c6202c23c;p=zpackage

diff --git a/Makefile b/Makefile
index 67854e0..b419428 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlit
 
 ZPMVER:=$(shell git tag --list 'v[0-9]*' | sed -e 's/^v//' | sort -nr | head -1)
 ifeq ($(strip $(ZPMVER)),)
-	ZPMVER:=0.1
+	ZPMVER:=0.1.1
 endif
 
 LZMAFLAGS=-Ilzma/api -Ilzma/tuklib -Ilzma/lzma -Ilzma/common -Ilzma/check -Ilzma/lz -Ilzma/rangecoder -Ilzma/simple -Ilzma/delta -DHAVE_CHECK_CRC64 -DHAVE_CHECK_CRC32 -DHAVE_ENCODER_LZMA2 -DHAVE_DECODER_LZMA2 -DHAVE_MF_BT4
@@ -18,7 +18,7 @@ curdir=$(shell pwd)
 ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
 	zpm-findpkg zpm-shell zpm-soneed
 
-SCRIPTS=zpm zpm-install zpm-merge zpm-list
+SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -27,18 +27,18 @@ d:
 	printf '%s\n' $(LZMAOBJ)
 	printf '%s\n' $(PATH)
 
-package: zpm-0.1-1.zpm
+package: zpm-$(ZPMVER)-1.zpm
 
 ZPM:= ./zpm -P scripts:bin:.
 
-zpm-0.1-1.zpm: programs
+zpm-$(ZPMVER)-1.zpm: programs
 	rm -f $@
-	$(ZPM) newpackage -f $@ -v 0.1 zpm
-	$(ZPM) addtopackage -u root -g root -f $@ -P /bin -v 0.1 zpm $(PROGRAMS)
+	$(ZPM) newpackage -f $@ -v $(ZPMVER) zpm
+	$(ZPM) addtopackage -u root -g root -f $@ -P /sbin -v $(ZPMVER) zpm $(PROGRAMS)
 
-tarball: zpm-0.1-1.tar.xz
+tarball: zpm-$(ZPMVER)-1.tar.xz
 
-zpm-0.1-1.tar.xz: programs
+zpm-$(ZPMVER)-1.tar.xz: programs
 	rm -f $@
 	tar -cJf $@ --transform='s|^|bin/|' \
 		$(PROGRAMS)
@@ -52,8 +52,11 @@ lzma.o: lzma.c
 stest: $(ZPKGBIN)
 	PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t
 
-test: $(ZPKGBIN)
-	PATH=$(curdir)/t:$(curdir):$(PATH) prove -e '' t/*.t
+t/ctap/prove: t/ctap/prove.o
+	$(CC) $(CFLAGS) -o $@ $+
+
+test: $(ZPKGBIN) t/ctap/prove
+	PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
 
 programs: elftype zpm-soname zpm-soneed zpm-addfile zpm-extract zpm-init \
 	zpm-vercmp zpm-findpkg zpm-merge
@@ -94,7 +97,7 @@ sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
 	$(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
 sqlite/shell.o: sqlite/shell.c sqlite/config.h
-	$(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+	$(CC) -Wall -std=c99 -Ilib -D_POSIX_C_SOURCE=200112L -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
 $(LZMAOBJ):
 	$(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $*.c
@@ -124,4 +127,10 @@ install: $(COMPILED)
 clean:
 	rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
 		libelf.a libzpm.a zpm-addfile soname \
-		*.xz *.zpm
+		*.xz *.zpm \
+		local.db t/ctap/prove.o
+
+tmpinstall: package
+	rm -rf tmp
+	mkdir tmp
+	ZPMDB=tmp/db.zpm ./zpm -P. install -R tmp -f zpm-$(ZPMVER)-1.zpm -u nw -g nw