add foreach_path to zpm library

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 8548b30986adfbe11e9b6f056324bd4d87e91a4e..c477580aad986979d694665fd663837939850af1 100644 (file)
--- 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.3
 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
@@ -13,12 +13,29 @@ 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))
 
+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 $@ $?
+
 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 zpm-preserve
+SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
+       zpm-contents
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -33,12 +50,12 @@ ZPM:= ./zpm -P scripts:bin:.
 
 zpm-$(ZPMVER)-1.zpm: programs
        rm -f $@
-       $(ZPM) newpackage -f $@ -v 0.1 zpm
-       $(ZPM) addtopackage -u root -g root -f $@ -P /sbin -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)
@@ -99,9 +116,6 @@ sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
 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 $@ $<
 
-$(LZMAOBJ):
-       $(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $*.c
-
 lib/zpm.o: newdb.c
 
 zpm-vercmp: zpm-vercmp.o lib/vercmp.o
@@ -112,6 +126,7 @@ zpm-shell: sqlite/sqlite3.o sqlite/shell.o
 
 libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
        sqlite/sqlite3.o lib/zpm_hash.o \
+       lib/foreach_path.o \
        lib/vercmp.o \
        lib/sha256.o \
        $(LZMAOBJ)
@@ -129,3 +144,11 @@ clean:
                libelf.a libzpm.a zpm-addfile soname \
                *.xz *.zpm \
                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