From 9921fe8fadb535fca9f7c1d67c9337dbd47ee126 Mon Sep 17 00:00:00 2001
From: Matthew <matthew@ijw.co.nz>
Date: Thu, 23 Sep 2010 18:12:13 +1200
Subject: [PATCH] Linux package parallelisation.

---
 packaging/package-all.sh | 62 +++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 10c3ad3379..ca834b94ed 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -88,7 +88,7 @@ pushd packaging &> /dev/null
         mv OpenRA.exe OpenRA-$VERSION.exe
         ../uploader.sh windows "$VERSION" OpenRA-$VERSION.exe "$FTPPATH" "$2" "$3"
     else
-        msg "\E[31m" "Package build failed, refer to log."  
+        msg "\E[31m" "Windows package build failed, refer to log."  
     fi
     popd &> /dev/null
 ) &
@@ -101,7 +101,7 @@ pushd packaging &> /dev/null
     if [ $? -eq 0 ]; then
         ../uploader.sh mac "$VERSION" ~/openra-package/$_gitname-build/osxbuild/OpenRA-$VERSION.zip "$FTPPATH" "$2" "$3"
     else
-        msg "\E[31m" "Package build failed, refer to log."
+        msg "\E[31m" "OSX package build failed, refer to log."
     fi
     popd &> /dev/null
 ) &
@@ -132,33 +132,41 @@ pushd packaging &> /dev/null
     cp -r hicolor $BUILTDIR/usr/share/icons/
 
     popd &> /dev/null
+    
+    (
+        #Arch-Linux
+        msg "\E[34m" "Building Arch-Linux package."
+        pushd linux/pkgbuild/ &> /dev/null
+        sh buildpackage.sh "ftp.open-ra.org" "$FTPPATH/linux" "$2" "$3" "$VERSION" &> package.log
+        if [ $? -ne 0 ]; then
+            msg "\E[31m" "Arch-Linux package build failed, refer to log."
+        fi
+        popd &> /dev/null
+    ) &
 
-    #Arch-Linux
-    msg "\E[34m" "Building Arch-Linux package."
-    pushd linux/pkgbuild/ &> /dev/null
-    sh buildpackage.sh "ftp.open-ra.org" "$FTPPATH/linux" "$2" "$3" "$VERSION" &> package.log
-    if [ $? -ne 0 ]; then
-        msg "\E[31m" "Package build failed, refer to log."
-    fi
-    popd &> /dev/null
+    (
+        #RPM
+        msg "\E[34m" "Building RPM package."
+        pushd linux/rpm/ &> /dev/null
+        sh buildpackage.sh "ftp.open-ra.org" "$FTPPATH/linux" "$2" "$3" "$VERSION" ~/rpmbuild &> package.log
+        if [ $? -ne 0 ]; then
+            msg "\E[31m" "RPM package build failed, refer to log."
+        fi
+        popd &> /dev/null
+    ) &
 
-    #RPM
-    msg "\E[34m" "Building RPM package."
-    pushd linux/rpm/ &> /dev/null
-    sh buildpackage.sh "ftp.open-ra.org" "$FTPPATH/linux" "$2" "$3" "$VERSION" ~/rpmbuild &> package.log
-    if [ $? -ne 0 ]; then
-        msg "\E[31m" "Package build failed, refer to log."
-    fi
-    popd &> /dev/null
-
-    #deb
-    msg "\E[34m" "Building deb package."
-    pushd linux/deb/ &> /dev/null
-    ./buildpackage.sh "ftp.open-ra.org" "$FTPPATH/linux" "$2" "$3" "$VERSION" ~/openra-package/built ~/debpackage &> package.log
-    if [ $? -ne 0 ]; then
-        msg "\E[31m" "Package build failed, refer to log."
-    fi
-    popd &> /dev/null
+    (
+        #deb
+        msg "\E[34m" "Building deb package."
+        pushd linux/deb/ &> /dev/null
+        ./buildpackage.sh "ftp.open-ra.org" "$FTPPATH/linux" "$2" "$3" "$VERSION" ~/openra-package/built ~/debpackage &> package.log
+        if [ $? -ne 0 ]; then
+            msg "\E[31m" "deb package build failed, refer to log."
+        fi
+        popd &> /dev/null
+    ) &
+    
+    wait
 ) &
 
 wait