bibisect/Makefile | 7 ++++++-
bibisect/bibisect.cfg | 4 +++-
bibisect/build.sh | 32 ++++++++++++++++++++++----------
3 files changed, 31 insertions(+), 12 deletions(-)
New commits:
commit 7e9a2976cdfa0adee9b077e73acf78fed6be380e
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Oct 22 11:37:29 2013 +0200
bibisect update tweaks
Change-Id: I9016e8351036f4b0edcd52fc7fa29d68cc43e903
diff --git a/bibisect/Makefile b/bibisect/Makefile
index 79f6102..e2899bf 100755
--- a/bibisect/Makefile
+++ b/bibisect/Makefile
@@ -33,6 +33,7 @@ BINREPO:=$(WORKDIR)/binrepo
BUILDDIR:=$(WORKDIR)/build
ARTIFACTDIR:=$(WORKDIR)/artifact
ORDERMODE?=master
+SHELL:=/bin/bash
ifeq ($(ORDERMODE),master)
SOURCETYPE:=hash
@@ -90,7 +91,11 @@ 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 > $@
+ git --git-dir=$(SOURCEREPO) tag|grep ^libreoffice|sed -e
's/\./-/g'|paste - <(git --git-dir=$(SOURCEREPO) tag|grep
^libreoffice)|sort|cut -f2| \
+ awk \
+ 'BEGIN { last="$@" } \
+ { current="$(WORKDIR)/milestone/" $$0; printf "%s:
%s\n", current, last; last = current} \
+ END { printf "$(TO): %s\nall: $(TO)", last }' > $@
endif
diff --git a/bibisect/bibisect.cfg b/bibisect/bibisect.cfg
index d7c5106..fc997a2 100644
--- a/bibisect/bibisect.cfg
+++ b/bibisect/bibisect.cfg
@@ -1,6 +1,8 @@
-FROM:=libreoffice-3-5-branch-point
+#FROM:=8450a99c
+FROM:=8450a99c
TO:=master
INTERVAL:=64
+ORDERMODE:=master
WORKDIR:=$(HOME)/bibisect
SOURCEREPO:=$(WORKDIR)/source/.git
diff --git a/bibisect/build.sh b/bibisect/build.sh
index 4242722..c1747e4 100755
--- a/bibisect/build.sh
+++ b/bibisect/build.sh
@@ -81,17 +81,19 @@ fi
cat <<EOF > autogen.lastrun
--disable-dependency-tracking
---disable-mozilla
---disable-binfilter
--disable-linkoo
+--disable-option-checking
--without-junit
--without-help
--without-myspell-dicts
--without-doxygen
+--disable-gnome-vfs
+--disable-odk
+--without-system-jpeg
--with-external-tar=`readlink -f ${BUILDDIR}/../tarfiles`
EOF
-export CCACHE_DIR=`readlink -f ${BUILDDIR}/../ccache`
+export CCACHE_DIR=`readlink -f /root/ccache`
export CCACHE_BASEDIR=`readlink -f .`
#export CCACHE_PREFIX=distcc
#export DISTCC_HOSTS="localhost/8 192.168.0.103/8 192.168.0.98/16"
@@ -109,17 +111,27 @@ echo "second try:" >> ${ARTIFACTDIR}/make.log 2>&1
make > ${ARTIFACTDIR}/make.log 2>&1
make dev-install > ${ARTIFACTDIR}/dev-install.log 2>&1
echo "second try:" >> ${ARTIFACTDIR}/make.log 2>&1
-make dev-install > ${ARTIFACTDIR}/dev-install.log 2>&1
+make dev-install >> ${ARTIFACTDIR}/dev-install.log 2>&1
+
# shelve away the ccache, just in case
ccache -s > ${ARTIFACTDIR}/ccache.log
#mkdir -p ../ccaches
#cp -a ${CCACHE_DIR} ../ccaches/ccache-`git log -1 --pretty=format:%H`
-if test -n `find . -name opt -type d`
+#pwd
+#echo ${BUILDDIR}
+if test -d ${BUILDDIR}/solver/unxlngx6.pro/installation/opt
then
- mv `find . -name opt -type d` ${ARTIFACTDIR}/opt
- if test -f ${ARTIFACTDIR}/opt/program/soffice
- then
- exit 0
- fi
+ echo "found install"
+ cp -a ${BUILDDIR}/solver/unxlngx6.pro/installation/opt ${ARTIFACTDIR}/opt
+else
+ echo "no install found"
+fi
+if test ! -f ${ARTIFACTDIR}/opt/program/soffice.bin
+then
+ cp -a `find . -name instdir -type d`/unxlngx6.pro ${ARTIFACTDIR}/opt
+fi
+if test -f ${ARTIFACTDIR}/opt/program/soffice.bin
+then
+ exit 0
fi
exit 1
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
