X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=641e9129cfc2ca296eb1ca656714fc204af272d0;hb=f12e588273d9a3ffc97c20a7075845dff68905e4;hp=09a6e80f33a66a431ead127278feb735a99cfee7;hpb=1797d41ad1ffcbc522e570bd38c28173fe79ace1;p=zpackage

diff --git a/Makefile b/Makefile
index 09a6e80..641e912 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
-CFLAGS=-Wall -W -Wextra -Werror -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api
+CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api
+
+ZPMVER:=$(shell git describe --tags --match 'v[0-9]*' | sed -e 's/^v//' | sed -e 's/-g.\+//' | sed -e 's/-/./g')
 
 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
 
@@ -8,16 +10,73 @@ LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.c
 LZMASRC=$(shell ls lzma/lzma/*.c lzma/common/*.c lzma/lz/*.c) $(LZMACHECKSRC) lzma/rangecoder/price_table.c
 LZMAOBJ=$(filter-out lzma/common/stream_encoder_mt.o, $(LZMASRC:%.c=%.o))
 
+JSWSRC=lib/jsw/jsw_avltree.c \
+lib/jsw/jsw_atree.c \
+lib/jsw/jsw_hlib.c \
+lib/jsw/jsw_rbtree.c
+
+JSWOBJ=$(JSWSRC:%.c=%.o)
+LIBZPMSRC=sha256.c db.c compress.c uncompress.c zpm.c zpm_hash.c \
+	  foreach_path.c vercmp.o findpkg.c quote.c dbquery.c script_hash.c
+
+LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
+
 curdir=$(shell pwd)
 
 ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
-	zpm-findpkg zpm-shell
+	zpm-findpkg zpm-shell zpm-soneed zpm-foreach-path zpm-parse \
+	zpm-runscript
+
+SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
+	zpm-contents
+COMPILED=$(ZPKGBIN)
+PROGRAMS=$(SCRIPTS) $(COMPILED)
 
 def: programs
 d:
 	printf '%s\n' $(LZMAOBJ)
 	printf '%s\n' $(PATH)
 
+libzpm.a: $(LIBZPMOBJ) sqlite/sqlite3.o \
+	$(LZMAOBJ) \
+	$(JSWOBJ)
+	ar rcuv $@ $?
+
+package: zpm-$(ZPMVER)-1.zpm
+
+lzmaupdate:
+	find xz/src/liblzma -type d -name .deps -prune \
+		-o -type f -printf '%P\n' \
+		| xargs -IZ echo Z Z Z \
+		| xargs printf 'test -e lzma/%s && cp xz/src/liblzma/%s lzma/%s\n' \
+		| sh
+
+#lzma/lz/lz_decoder.o: lzma/lz/lz_decoder.c
+#lzma/lz/lz_encoder.o: lzma/lz/lz_encoder.c
+
+lzma/%.o: lzma/%.c
+	$(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $<
+
+lib/liblzma.a: $(LZMAOBJ)
+	ar rcuv $@ $?
+
+lib/libjsw.a: $(JSWOBJ)
+	ar rcuv $@ $?
+
+ZPM:= ./zpm -P.
+
+zpm-$(ZPMVER)-1.zpm: programs
+	rm -f $@
+	$(ZPM) newpackage -C zpm-$(ZPMVER)-1
+	$(ZPM) add -u root -g root -f $@ -P /sbin zpm-$(ZPMVER)-1 $(sort $(PROGRAMS))
+
+tarball: zpm-$(ZPMVER)-1.tar.xz
+
+zpm-$(ZPMVER)-1.tar.xz: programs
+	rm -f $@
+	tar -cJf $@ --transform='s|^|bin/|' \
+		$(PROGRAMS)
+
 lzma.c: mklzma
 	sh mklzma
 
@@ -27,11 +86,13 @@ 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 soname zpm-soneed zpm-addfile zpm-extract zpm-init \
-	zpm-vercmp zpm-findpkg
+programs: $(ZPKGBIN)
 
 uncompress: uncompress.o 
 	$(CC) $(CFLAGS) -o $@ $+ -llzma
@@ -39,7 +100,7 @@ uncompress: uncompress.o
 elftype: elf/elftype.c
 	$(CC) $(CFLAGS) -o $@ $+
 
-soname: elf/soname.c
+zpm-soname: elf/soname.c
 	$(CC) -Ielf $(CFLAGS) -o $@ $+
 
 zpm-soneed: elf/needed.c
@@ -57,48 +118,63 @@ zpm-init: zpm-init.o libzpm.a
 zpm-extract: zpm-extract.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
+zpm-runscript: zpm-runscript.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+	
+zpm-foreach-path.o: CFLAGS+=-Wno-unused
+
+zpm-foreach-path: zpm-foreach-path.o libzpm.a sqlite/sqlite3.h
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
 zpm-findpkg: zpm-findpkg.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
+zpm-pkgfiles: zpm-pkgfiles.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm
+
+zpm-parse: zpm-parse.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
+zpm-quote: zpm-quote.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
 newdb.c: db.sql
 	echo "char createdb[] = {" > $@
 	xxd -i < $< >> $@
 	echo ", 0};" >> $@
 
-lib/sqlite3.o: lib/sqlite3.c lib/config.h
+sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
 	$(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
-$(LZMAOBJ):
-	$(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $*.c
+sqlite/shell.o: sqlite/shell.c sqlite/config.h
+	$(CC) -Wall -std=c99 -Ilib -D_POSIX_C_SOURCE=200112L -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
 lib/zpm.o: newdb.c
 
 zpm-vercmp: zpm-vercmp.o lib/vercmp.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 	
-libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
-	lib/sqlite3.o \
-	lib/vercmp.o \
-	$(LZMAOBJ)
-	ar rcuv $@ $?
+zpm-shell: sqlite/sqlite3.o sqlite/shell.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
+
 
 libelf.a: elf/libelf.o
 	ar rcuv $@ $?
 
-install: elftype
-	install -D zpm $(DESTDIR)/bin/zpm
-	install -D zpm-note $(DESTDIR)/bin/zpm-note
-	install -D zpm-bug $(DESTDIR)/bin/zpm-bug
-	install -D zpm-sequence $(DESTDIR)/bin/zpm-sequence
-	install -D zpm-preserve $(DESTDIR)/bin/zpm-preserve
-	install -d -m2770 -o root -g adm $(DESTDIR)/var/lib/admin
-	install -d -m2770 -o root -g adm $(DESTDIR)/var/lib/admin/notes
-	install -d -m2770 -o root -g adm $(DESTDIR)/var/lib/admin/notes/open
-	install -d -m2770 -o root -g adm $(DESTDIR)/var/lib/admin/notes/ack
-	install -D elftype $(DESTDIR)/usr/sbin/elftype
-	install -D soname $(DESTDIR)/usr/sbin/soname
-	#SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
+install: $(COMPILED)
+	test -d $(DESTDIR)/bin || install -d $(DESTDIR)/bin
+	install -D $(PROGRAMS) $(DESTDIR)/bin
 
 clean:
 	rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
-		libelf.a libzpm.a zpm-addfile soname
+		libelf.a libzpm.a zpm-addfile soname \
+		*.xz \
+		local.db t/ctap/prove.o
+
+tmpinstall:
+	rm -rf tmp
+	mkdir tmp
+	ZPMDB=tmp/db.zpm ./zpm -P. install -R tmp -f zpm-0.1.2-1.zpm -u nw -g nw
+
+tmpupgrade:
+	ZPMDB=tmp/db.zpm ./zpm -P. install -R tmp -f zpm-$(ZPMVER)-1.zpm -u nw -g nw