add tagbased build too
diff --git a/bibisect/Makefile b/bibisect/Makefile
index f90cde9..79f6102 100755
--- a/bibisect/Makefile
+++ b/bibisect/Makefile
@@ -32,6 +32,14 @@
BINREPO:=$(WORKDIR)/binrepo
BUILDDIR:=$(WORKDIR)/build
ARTIFACTDIR:=$(WORKDIR)/artifact
ORDERMODE?=master
ifeq ($(ORDERMODE),master)
SOURCETYPE:=hash
endif
ifeq ($(ORDERMODE),tags)
SOURCETYPE:=tag
endif
.DEFAULT_GOAL=all
.PHONY: all clean
@@ -47,7 +55,7 @@
cd $(ARTIFACTDIR) && \
git --git-dir=$(BINREPO)/.git --work-tree=$(ARTIFACTDIR) add -A && \
git --git-dir=$(BINREPO)/.git --work-tree=$(ARTIFACTDIR) commit -F $(ARTIFACTDIR)/commitmsg && \
git --git-dir=$(BINREPO)/.git tag source-hash-$(2) && \
git --git-dir=$(BINREPO)/.git tag source-$(SOURCETYPE)-$(2) && \
echo "$(2) $(3)" > $@;
endef
@@ -69,6 +77,8 @@
include $(WORKDIR)/buildorder
endif
ifeq ($(ORDERMODE),master)
$(WORKDIR)/buildorder: $(WORKDIR)/init
git --git-dir=$(SOURCEREPO) rev-list --reverse $(FROM)..$(TO) | \
awk \
@@ -76,6 +86,14 @@
NR % $(INTERVAL) == 1 { current="$(WORKDIR)/milestone/" $$0; printf "%s: %s\n", current, last; last = current} \
END { printf "$(TO): %s\nall: $(TO)", last }' > $@
endif
ifeq ($(ORDERMODE),tags)
$(WORKDIR)/buildorder: $(WORKDIR)/init
git --git-dir=$(SOURCEREPO) tag|grep ^libreoffice|sed -e 's/\./-/g'|paste - <(git --git-dir=$(SOURCEREPO) tag|grep ^libreoffice)|sort|cut -f2 > $@
endif
$(WORKDIR)/init:
mkdir -p $(WORKDIR)/milestone
mkdir -p $(BUILDDIR)
