X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=Makefile;h=85a5d13dcce9ba837bc686260b5e0d4ebf53026f;hp=ff9f4c94eccdc6473a7a65e15e58e542a813c13a;hb=89a160b4762730e078ed8d2e5c212a51f17ac6f8;hpb=98344faf58c6ae59c9df9b46e4f0b0e49013846b

diff --git a/Makefile b/Makefile
index ff9f4c9..85a5d13 100644
--- a/Makefile
+++ b/Makefile
@@ -1,58 +1,213 @@
-CFLAGS=-Wall -std=c99 -I. -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 -D_POSIX_C_SOURCE=1
-LDFLAGS=-L.
+CC=clang --target=x86_64-pc-linux-musl
+#CC=/usr/musl/bin/musl-gcc
+CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api --target=x86_64-pc-linux-musl
+
+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
+
+LDFLAGS=-fuse-ld=lld -L. -static
 
 LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.c lzma/check/crc32_table.c lzma/check/crc64_table.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))
 
-def: libzpm.a
+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.c findpkg.c quote.c dbquery.c script_hash.c \
+	  parse.c integ.c seterror.c notes.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-soneed zpm-foreach-path zpm-parse \
+	zpm-script zpm-soname zpm-syncfs zpm-packagehash zpm-verify \
+	zpm-elftype zpm-quote zpm-note zpm-search
+
+SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
+	zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \
+	zpm-pkg zpm-add zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit
+MANPAGES=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 )
+COMPILED=$(ZPKGBIN)
+PROGRAMS=$(SCRIPTS) $(COMPILED)
+
+def: programs
+	strip $(ZPKGBIN)
+
 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 $(MANPAGES)
+	rm -f $@
+	$(ZPM) newpackage -C zpm-$(ZPMVER)-1
+	$(ZPM) add -v -u root -g root -f $@ -P /sbin zpm-$(ZPMVER)-1 $(sort $(PROGRAMS))
+	$(ZPM) add -v -u root -g root -f $@ -P /usr/share/man/man8 -S doc $(MANPAGES)
+
+tarball: zpm-$(ZPMVER)-1.tar.xz
+
+zpm-$(ZPMVER)-1.tar.xz: programs
+	rm -f $@
+	tar -cJf $@ --transform='s|^|sbin/|' \
+		$(PROGRAMS)
+
+lzma.c: mklzma
+	sh mklzma
+
+lzma.o: lzma.c
+	gcc -std=c99 -Wall -c -o $@ $<
 
-test: zpm-addfile
-	prove -e'' t/*.t
+stest: $(ZPKGBIN)
+	PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t
 
-programs: elftype soname zpm-addfile zpm-extract
+t/ctap/prove: t/ctap/prove.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
+
+test: $(ZPKGBIN) t/ctap/prove
+	@PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
+
+programs: $(ZPKGBIN)
 
 uncompress: uncompress.o 
-	$(CC) $(CFLAGS) -o $@ $+ -llzma -lsqlite3
+	$(CC) $(CFLAGS) -o $@ $+ -llzma
+
+zpm-elftype: elf/elftype.c
+	$(CC) -Ielf $(CFLAGS) -o $@ $+
+
+zpm-soname: elf/soname.c
+	$(CC) -Ielf $(CFLAGS) -o $@ $+
+
+zpm-soneed: elf/needed.c
+	$(CC) -Ielf $(CFLAGS) -o $@ $+
+
+zpm-addfile: zpm-addfile.o libzpm.a libelf.a
+	$(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-elftype: elf/elftype.c
-	$(CC) $(CFLAGS) -o $@ $+
+zpm-hash: zpm-hash.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-soname: elf/soname.c
-	$(CC) $(CFLAGS) -o $@ $+
+zpm-verify: zpm-verify.o t/ctap/ctap.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf
 
-zpm-addfile: zpm-addfile.o libzpm.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lsqlite3 -lzpm
+zpm-init: zpm-init.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
 zpm-extract: zpm-extract.o libzpm.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lsqlite3 -llzma -lzpm
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
+zpm-script: zpm-script.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+	
+zpm-packagehash: zpm-packagehash.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
+zpm-foreach-path.o: CFLAGS+=-Wno-unused-parameter
+zpm-script.o: CFLAGS+=-Wno-unused-parameter
+
+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-search: zpm-search.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
+zpm-note: zpm-note.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
+zpm-syncfs: zpm-syncfs.o libzpm.a libelf.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm
+
+zpm-parse: zpm-parse.o lib/parse.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
+
+zpm-quote: zpm-quote.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql
+	echo 'begin;' > $@
+	cat $+ >> $@
+	echo 'commit;' >> $@
 
 newdb.c: db.sql
 	echo "char createdb[] = {" > $@
 	xxd -i < $< >> $@
 	echo ", 0};" >> $@
 
+sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
+	$(CC) -O3 -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+
+sqlite/extensions.o: sqlite/extensions.c
+	$(CC) -O3 -Wall -std=c99 -I. -DSQLITE_CORE=1 -c -o $@ $<
+
+sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile
+	$(CC) -Wall -std=c99 -Ilib \
+		-DSQLITE_OMIT_LOAD_EXTENSION=1 \
+		'-DSQLITE_SHELL_INIT_PROC(x)=zpm_setup_extensions(x)' \
+		-D_POSIX_C_SOURCE=200112L -c -o $@ $<
+
+lib/zpm.o: newdb.c
+
+zpm-vercmp: zpm-vercmp.o lib/vercmp.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
+	
+zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
+
+libelf.a: elf/libelf.o
+	ar rcuv $@ $?
+
+install: $(COMPILED) $(MANPAGES)
+	test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin
+	install $(PROGRAMS) $(DESTDIR)/sbin
+	mkdir -p $(DESTDIR)/usr/share/man/man8
+	install -m644 $(MANPAGES) $(DESTDIR)/usr/share/man/man8
 
-libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o newdb.o lib/zpm.o \
-	sqlite3.o \
-	$(LZMAOBJ)
-	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
+scan-prep: clean sqlite/sqlite3.o sqlite/shell.o lib/liblzma.a
+	@echo scan-build -v -o report make -j10
 
 clean:
-	rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile
+	rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
+		libelf.a libzpm.a zpm-addfile soname \
+		*.xz \
+		local.db \
+		t/ctap/*.o \
+		$(ZPKGBIN) \
+		db.sql \
+		elf/*.o lib/jsw/*.o