[Libreoffice-commits] dev-tools.git: 3 commits - bibisect/Makefile bibisect/mergeranges bibisect/ranges scripts/bashrc_termcolorbuild

[Bjoern Michaelsen]

 bibisect/Makefile             |   20 +++++++++++++++++++-
 bibisect/mergeranges          |   31 +++++++++++++++++++++++++++++++
 bibisect/ranges               |    3 +++
 scripts/bashrc_termcolorbuild |   18 ++++++++++++++++++
 4 files changed, 71 insertions(+), 1 deletion(-)

New commits:
commit 594231d61c37eaf754b53872918d41c8d2de71a3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Apr 5 01:05:12 2013 +0200

    eyecandy: bashrc snipplet to build with color on interactive shells (only)

diff --git a/scripts/bashrc_termcolorbuild b/scripts/bashrc_termcolorbuild
new file mode 100644
index 0000000..0841787
--- /dev/null
+++ b/scripts/bashrc_termcolorbuild
@@ -0,0 +1,18 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# add this snipplet to your .bashrc to have gbuild output in nice color if and
+# only if running in an interactive shell
+
+function make {
+	if [ -t 1 ]
+	then
+  		`which make` gb_COLOR=T -r $@
+  	else
+    		`which make` -r $@
+    	fi
+}
commit b0f162b7ddb76694e96125424beecca48a824dfa
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Dec 18 02:12:30 2012 +0100

    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 @@ include bibisect.cfg
 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 $(BINREPO) && git checkout -f $(1) && \
 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 @@ ifneq ($(MAKECMDGOALS),clean)
 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 @@ $(WORKDIR)/buildorder: $(WORKDIR)/init
 				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)
commit e2139d955539cdfe8d9b6b37a36fa5c5868cbc55
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Dec 12 14:18:45 2012 +0100

    add tool to merge bibisect repos

diff --git a/bibisect/mergeranges b/bibisect/mergeranges
new file mode 100755
index 0000000..5d9b14a
--- /dev/null
+++ b/bibisect/mergeranges
@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+
+import sys
+import subprocess
+
+def justrunit(arglist):
+    print(subprocess.check_output(arglist).decode('utf-8'))
+
+def init_branch(startpoint):
+    justrunit(['git', 'checkout', '-b', 'mergeranges', startpoint])
+
+def cherry_pick_theirs(revision):
+    try:
+        justrunit(['git', 'rm', '-rf', '.'])
+    except:
+        pass
+    justrunit(['git', 'checkout', revision, '--', '.'])
+    justrunit(['git', 'commit', '-C', revision])
+    tag = subprocess.check_output(['git', 'log', '-1', '--pretty=%s', 'HEAD']).decode('utf-8').rstrip()
+    justrunit(['git', 'tag', tag])
+    
+
+initBranch = False
+for line in open(sys.argv[1]).readlines():
+    revisions = [r for r in subprocess.check_output(['git', 'rev-list', '--reverse', line.rstrip()]).decode('utf-8').split('\n') if r.rstrip()]
+    for revision in revisions:
+        if not initBranch:
+            init_branch(revision)
+            initBranch = True
+        else:
+            cherry_pick_theirs(revision)
diff --git a/bibisect/ranges b/bibisect/ranges
new file mode 100644
index 0000000..f44af39
--- /dev/null
+++ b/bibisect/ranges
@@ -0,0 +1,3 @@
+50612eb408c515e3672952083b805be708d59c4a..remotes/bibisect35/master
+d38dc5cb288aeef58175a0d656091940a3f35ee5..remotes/bibisect36/master
+b4e60c226e714050f5ab0680669463b98ccd8ea8..remotes/bibisect40/master