bibisect updates

2 files changed, 62 insertions, 11 deletions

diff --git a/bibisect/bibisect.cfg b/bibisect/bibisect.cfg
index 3b40c89..d7c5106 100644
--- a/bibisect/bibisect.cfg
+++ b/bibisect/bibisect.cfg
@@ -1,5 +1,5 @@
-FROM:=MELD_LIBREOFFICE_REPOS
-TO:=libreoffice-3-5-branch-point
+FROM:=libreoffice-3-5-branch-point
+TO:=master
 INTERVAL:=64
 
 WORKDIR:=$(HOME)/bibisect
diff --git a/bibisect/build.sh b/bibisect/build.sh
index 831436c..4242722 100755
--- a/bibisect/build.sh
+++ b/bibisect/build.sh
@@ -26,43 +26,94 @@
 # instead of those above.
 #
 
+SCRIPTDIR=$( cd "$( dirname "$0" )" && pwd )
 BUILDDIR=$1
 ARTIFACTDIR=$2
 
 cd ${BUILDDIR}
 
+
+BUILDCOMMIT=`git rev-list -1 HEAD`
+
+#apply patches between 3c5353256bb94ba99fea94939cf06ba723737c10 and 6a0972ced879259e7f960e7bb852b0e175a05b7a
+if test ! `git merge-base ${BUILDCOMMIT} 6a0972ced879259e7f960e7bb852b0e175a05b7a` = 6a0972ced879259e7f960e7bb852b0e175a05b7a
+then
+if test `git merge-base ${BUILDCOMMIT} 3c5353256bb94ba99fea94939cf06ba723737c10` = 3c5353256bb94ba99fea94939cf06ba723737c10
+then
+    echo "This is newer than 3c5353256bb94ba99fea94939cf06ba723737c10, cherrypicking." > ${ARTIFACTDIR}/patch.log
+    git cherry-pick 6a0972ced879259e7f960e7bb852b0e175a05b7a >> ${ARTIFACTDIR}/patch.log 2>&1
+    git cherry-pick 6963de9536cfca1145685a611a6c88c5160d9a1c >> ${ARTIFACTDIR}/patch.log 2>&1
+    git rm solenv/gbuild/templates/makefile.mk  >> ${ARTIFACTDIR}/patch.log 2>&1
+    git commit -C 6963de9536cfca1145685a611a6c88c5160d9a1c >> ${ARTIFACTDIR}/patch.log 2>&1
+    git cherry-pick b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a >> ${ARTIFACTDIR}/patch.log 2>&1
+    git rm tail_build/prj/makefile.mk  >> ${ARTIFACTDIR}/patch.log 2>&1
+    git rm solenv/inc/gbuildbridge.mk  >> ${ARTIFACTDIR}/patch.log 2>&1
+    git commit -C b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a  >> ${ARTIFACTDIR}/patch.log 2>&1
+    git cherry-pick 0bd553e8629104fbc37ac574017519b3f3752cb3 >> ${ARTIFACTDIR}/patch.log 2>&1
+
+    if test ! `git merge-base ${BUILDCOMMIT} f3653d3c1e93a7e92a546b770e418b8cf5c06c54` = f3653d3c1e93a7e92a546b770e418b8cf5c06c54
+    then
+        echo "This is older than f3653d3c1e93a7e92a546b770e418b8cf5c06c54, codemaker is still dmake." >> ${ARTIFACTDIR}/patch.log
+        touch codemaker/prj/dmake
+    fi
+    if test ! `git merge-base ${BUILDCOMMIT} a57b6347999889bbbcf55e704ac480482fdc5497` = a57b6347999889bbbcf55e704ac480482fdc5497
+    then
+        echo "This is older than a57b6347999889bbbcf55e704ac480482fdc5497, unodevtools is still dmake." >> ${ARTIFACTDIR}/patch.log
+        touch unodevtools/prj/dmake
+    fi
+    if test ! `git merge-base ${BUILDCOMMIT} bed6580ec330fea6bc7ee015adf1baf6298ed3fb` = bed6580ec330fea6bc7ee015adf1baf6298ed3fb
+    then
+        echo "This is older than bed6580ec330fea6bc7ee015adf1baf6298ed3fb, idlc is still dmake." >> ${ARTIFACTDIR}/patch.log
+        touch idlc/prj/dmake
+    fi
+    if test ! `git merge-base ${BUILDCOMMIT} 5342bc073b6dff059f9e60ad5fea6905752f0f9c` = 5342bc073b6dff059f9e60ad5fea6905752f0f9c
+    then
+        echo "This is older than 5342bc073b6dff059f9e60ad5fea6905752f0f9c, cpputools is still dmake." >> ${ARTIFACTDIR}/patch.log
+        touch cpputools/prj/dmake
+    fi
+    if test ! `git merge-base ${BUILDCOMMIT} f55eed29c68205f69dd263f8a9657ac407a73ee3` = f55eed29c68205f69dd263f8a9657ac407a73ee3
+    then
+        echo "This is older than f55eed29c68205f69dd263f8a9657ac407a73ee3, rdbmaker is still dmake." >> ${ARTIFACTDIR}/patch.log
+        touch rdbmaker/prj/dmake
+    fi
+fi
+fi
+
 cat <<EOF > autogen.lastrun
+--disable-dependency-tracking
 --disable-mozilla
 --disable-binfilter
 --disable-linkoo
 --without-junit
 --without-help
 --without-myspell-dicts
+--without-doxygen
 --with-external-tar=`readlink -f ${BUILDDIR}/../tarfiles`
---with-num-cpus=30
---with-max-jobs=30
 EOF
 
-export gb_FULLDEPS=
 export CCACHE_DIR=`readlink -f ${BUILDDIR}/../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"
 unset DISPLAY
 
-ccache -M 30G
+ccache -M 8G
 # delete outdated cache to keep the cache small (and in RAM)
-find ${CCACHE_DIR} -mmin +120 -type f -delete
+#find ${CCACHE_DIR} -mmin +120 -type f -delete
 
 ./autogen.sh > ${ARTIFACTDIR}/autogen.log 2>&1
-git log -1 --pretty=format:"source-hash-%H%n%n" > ${ARTIFACTDIR}/commitmsg
-git log -1 --pretty=fuller >> ${ARTIFACTDIR}/commitmsg
+git log -1 --pretty=format:"source-hash-%H%n%n" $BUILDCOMMIT > ${ARTIFACTDIR}/commitmsg
+git log -1 --pretty=fuller $BUILDCOMMIT >> ${ARTIFACTDIR}/commitmsg
 make > ${ARTIFACTDIR}/make.log 2>&1
+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
 # 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`
+#mkdir -p ../ccaches
+#cp -a ${CCACHE_DIR} ../ccaches/ccache-`git log -1 --pretty=format:%H`
 if test -n `find . -name opt -type d`
 then
     mv `find . -name opt -type d` ${ARTIFACTDIR}/opt