X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=id-deb-build%2Fid-pbuild-all.sh;h=3af753a38854eb3a61d908823ecf02eceea04217;hb=10fecddf16262d3ca5d0d52ec01e97e3fb2dbf3a;hp=b4c15a01a576dd75dcd49d28a062dbbc28eddbd9;hpb=ce67322463e8b5988af4336c2c073b5d53a45f37;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/id-pbuild-all.sh b/id-deb-build/id-pbuild-all.sh
index b4c15a0..3af753a 100755
--- a/id-deb-build/id-pbuild-all.sh
+++ b/id-deb-build/id-pbuild-all.sh
@@ -18,8 +18,12 @@ if test ! -e "$PKG"; then
 	exit 1
 fi
 PRODUCT=`echo *.dsc|sed 's/_.*//g'`
-DEBIAN_DIST="squeeze etch lenny"
-UBUNTU_DIST="karmic jaunty intrepid hardy"
+if test -z "$DEBIAN_DIST"; then
+	DEBIAN_DIST="squeeze etch lenny"
+fi
+if test -z "$UBUNTU_DIST"; then
+	UBUNTU_DIST="karmic jaunty intrepid hardy"
+fi
 
 if test "$2" = "upload"; then
 	for dist in ${UBUNTU_DIST}; do
@@ -28,23 +32,46 @@ if test "$2" = "upload"; then
 	for dist in ${DEBIAN_DIST}; do
 		scp ${dist}-*/* ftp.indexdata.dk:/home/ftp/pub/${PRODUCT}/debian/${dist}
 	done
+	echo "Remember to update APT on ftp.indexdata.dk"
+	echo "cd git-tools/update-archive"
+	echo "sudo su"
+	echo "./update-archive.sh"
 	exit 0
 fi
+i=0
+concurrency=4
+echo "Building $PKG"
+date
 for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
-	for arch in i386 amd64; do
-		if test ! -f /var/cache/pbuilder/${dist}-${arch}-base.tgz; then
-			DIST=$dist ARCH=$arch pbuilder create
-		fi
-		if $update; then
-			DIST=$dist ARCH=$arch pbuilder update --override-config
-		fi
-		DIST=$dist ARCH=$arch pbuilder --build $PKG
-		if test -f ${dist}-${arch}/*.dsc; then
-			:
-		else
-			echo "No .dsc file for ${dist}-${arch}"
-			exit 1
-		fi
-	done
+    for arch in i386 amd64; do
+        rm -fr ${dist}-${arch}
+	(
+	    if test ! -f /var/cache/pbuilder/${dist}-${arch}-base.tgz; then
+		DIST=$dist ARCH=$arch pbuilder create
+	    fi
+	    if $update; then
+		DIST=$dist ARCH=$arch pbuilder update --override-config
+	    fi
+	    DIST=$dist ARCH=$arch pbuilder --build $PKG
+	    ) >${dist}-${arch}.log 2>&1 &
+	i=`expr $i + 1`
+	if test $i -eq $concurrency; then
+	    i=0
+	    wait
+	fi
+    done
 done
-
+wait
+for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
+    for arch in i386 amd64; do
+	
+	if test -f ${dist}-${arch}/*.dsc; then
+	    :
+	else
+	    echo "No .dsc file for ${dist}-${arch}"
+	    exit 1
+	fi
+    done
+done
+date
+echo "Done"