[Pkg-xfce-commits] r581 - scripts/pbuilder

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-04-30 23:19:09 +0000 (Sun, 30 Apr 2006)
New Revision: 581

Modified:
   scripts/pbuilder/pdebuild-sources.sh
Log:
use *-sources.txt for build order so we can only use one file
add sort-of resuming when rebuilding everything


Modified: scripts/pbuilder/pdebuild-sources.sh
===================================================================
--- scripts/pbuilder/pdebuild-sources.sh	2006-04-30 20:33:37 UTC (rev 580)
+++ scripts/pbuilder/pdebuild-sources.sh	2006-04-30 23:19:09 UTC (rev 581)
@@ -29,14 +29,20 @@
 case $BUILDING in
 	"desktop")
 		BUILDDIR=$DESKTOPDIR
-		PKGFILE=$SCRIPTSDIR/desktop-build.txt
+		PKGFILE=$SCRIPTSDIR/desktop-sources.txt
 		;;
 	"goodies")
 		BUILDDIR=$GOODIESDIR
-		PKGFILE=$SCRIPTSDIR/goodies-build.txt
+		PKGFILE=$SCRIPTSDIR/goodies-sources.txt
 		;;
+	"clean")
+		echo -n "Cleaning build tree..."
+		sudo rm -rf xfce/build/*
+		echo "done."
+		exit 0
+		;;
 	*)
-        echo "Usage: $0 [desktop|goodies]"
+        echo "Usage: $0 [desktop|goodies|clean]"
 		exit 1
 		;;
 esac
@@ -71,15 +77,22 @@
 fi
 
 # Build every package listed in $PKGFILE (avoiding comments)
-for pkg in $(grep -v "^#" $PKGFILE); do
-	echo "Building $pkg..."
-    if [ -d "$BUILDDIR/$pkg" ];then
-    	cd $BUILDDIR/$pkg
-	    [ "$DEBUG" ] || svn-buildpackage --svn-ignore-new \
-            --svn-builder $SCRIPTSDIR/pbuilder/pdebuild.wrapper
-	    echo "done"
-    else
-        echo "'$BUILDDIR/$pkg' is not a directory" > /dev/stderr
-        echo "failed"
-    fi
+for pkg in $(grep -v "^#" $PKGFILE | cut -f 1 -d " "); do
+	if [ -f xfce/build/$pkg ]; then
+		echo "$pkg already built, skipping"
+	else
+	
+		echo "Building $pkg..."
+		touch xfce/build/$pkg
+		if [ -d "$BUILDDIR/$pkg" ];then
+    			cd $BUILDDIR/$pkg
+	    		[ "$DEBUG" ] || svn-buildpackage --svn-ignore-new \
+            		--svn-builder $SCRIPTSDIR/pbuilder/pdebuild.wrapper
+	    		echo "done"
+			touch xfce/build/$pkg
+		else
+			echo "'$BUILDDIR/$pkg' is not a directory" > /dev/stderr
+			echo "failed"
+    		fi
+	fi
 done