From e79696650cffc1e12f16a969645bc1b80adb2db9 Mon Sep 17 00:00:00 2001
From: Christian Bayle <chris@bayle.eu>
Date: Sun, 14 Oct 2012 20:02:26 +0200
Subject: [PATCH] Build out of the source tree, use config file

---
 3rd-party/mediawiki/Makefile      | 21 ++++++++++++---------
 tests/scripts/debian-3rd-party.sh | 10 ++--------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/3rd-party/mediawiki/Makefile b/3rd-party/mediawiki/Makefile
index e605a3e..358f842 100644
--- a/3rd-party/mediawiki/Makefile
+++ b/3rd-party/mediawiki/Makefile
@@ -4,20 +4,23 @@ MINOR=2
 
 VERS=$(MAJOR)-$(MINOR)
 
+include $(COWBUILDERCONFIG)
+
 DSCFILE=http://ftp.de.debian.org/debian/pool/main/m/mediawiki/mediawiki_$(VERS).dsc
 DIST=wheezy
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
 CHANGEFILEM=mediawiki_$(VERS)_$(ARCH).changes
 
-$(BUILDRESULT)/$(CHANGEFILEM): mediawiki_$(VERS).dsc
-	sudo cowbuilder --configfile $(COWBUILDERCONFIG) --buildresult $(BUILDRESULT) --build mediawiki_1.19.2-1.dsc
+$(BUILDRESULT)/$(CHANGEFILEM): $(BUILDPLACE)/mediawiki_$(VERS).dsc
+	sudo cowbuilder --configfile $(COWBUILDERCONFIG) --buildresult $(BUILDRESULT) --buildplace $(BUILDPLACE) --build $(BUILDPLACE)/mediawiki_$(VERS).dsc
+	reprepro -Vb ${REPOPATH} --ignore=wrongdistribution --ignore=missingfile include $(DIST) $@
 
-pdebuild: mediawiki-$(MAJOR)
-	cd mediawiki-1.19.2; pdebuild --configfile $(COWBUILDERCONFIG) --buildresult $(BUILDRESULT)
+pdebuild: $(BUILDPLACE)/mediawiki-$(MAJOR)
+	cd $(BUILDPLACE)/mediawiki-$(MAJOR) ; pdebuild --configfile $(COWBUILDERCONFIG) --buildresult $(BUILDRESULT)
 
-mediawiki-$(MAJOR): mediawiki_$(VERS).dsc
-	dpkg-source -x mediawiki_$(VERS).dsc
-	sed -i -e "1s/unstable/$(DIST)/" $@/debian/changelog
+mediawiki-$(MAJOR): $(BUILDPLACE)/mediawiki_$(VERS).dsc
+	cd $(BUILDPLACE) ; dpkg-source -x mediawiki_$(VERS).dsc
+	cd $(BUILDPLACE) ; sed -i -e "1s/unstable/$(DIST)/" $@/debian/changelog
 
-mediawiki_$(VERS).dsc:
-	dget -d $(DSCFILE)
+$(BUILDPLACE)/mediawiki_$(VERS).dsc: $(BUILDPLACE)
+	cd $(BUILDPLACE) ; dget -d $(DSCFILE)
diff --git a/tests/scripts/debian-3rd-party.sh b/tests/scripts/debian-3rd-party.sh
index e4aba96..04ea5e1 100755
--- a/tests/scripts/debian-3rd-party.sh
+++ b/tests/scripts/debian-3rd-party.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/sh -e
 
 # Setup Env
 relativepath=`dirname $0`
@@ -20,9 +20,6 @@ COWBUILDERCONFIG=$BUILDERDIR/config/$DIST.config
 WORKDIR=$(cd $absolutesourcepath/..; pwd)
 # Jenkins will set WORKSPACE
 WORKSPACE=${WORKSPACE:-$WORKDIR}
-BUILDRESULT=$WORKSPACE/build/packages
-[ ! -d $BUILDRESULT/build ] || mkdir $BUILDRESULT/build
-[ ! -d $BUILDRESULT/build/packages ] || mkdir $BUILDRESULT/build/packages
 
 REPOPATH=$WORKSPACE/build/debian
 [ ! -d $REPOPATH ] || rm -r $REPOPATH
@@ -41,9 +38,6 @@ SignWith: $SIGNKEY
 EOF
 
 # Build mediawiki
-CHANGEFILEM=mediawiki_1.19.2-1_amd64.changes
-make -C 3rd-party/mediawiki BUILDRESULT=$BUILDRESULT COWBUILDERCONFIG=$COWBUILDERCONFIG
-cd $BUILDRESULT
-reprepro -Vb ${REPOPATH} --ignore=wrongdistribution include $DIST $CHANGEFILEM
+make -C 3rd-party/mediawiki COWBUILDERCONFIG=$COWBUILDERCONFIG REPOPATH=$REPOPATH
 gpg --export --armor > ${REPOPATH}/key
 
-- 
2.1.4