Parallel building of packages.

2010-09-23 18:02:05 +12:00
parent 62c47e3b12
commit f848c5d7d4
1 changed files with 71 additions and 63 deletions
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -80,80 +80,88 @@ fi
 pushd packaging &> /dev/null

 ####### Windows #######
-msg "\E[34m" "Building Windows package."
-pushd windows/ &> /dev/null
-makensis -DSRCDIR=/home/openra/openra-package/$_gitname-build OpenRA.nsi &> package.log
-if [ $? -eq 0 ]; then
-    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."  
-fi
-popd &> /dev/null
+(
+    msg "\E[34m" "Building Windows package."
+    pushd windows/ &> /dev/null
+    makensis -DSRCDIR=/home/openra/openra-package/$_gitname-build OpenRA.nsi &> package.log
+    if [ $? -eq 0 ]; then
+        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."  
+    fi
+    popd &> /dev/null
+) &

 ####### OSX #######
-msg "\E[34m" "Building OSX package."
-pushd osx/ &>/dev/null
-sh package-game.sh ~/openra-package/$_gitname-build "$VERSION" &> package.log
-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."
-fi
-popd &> /dev/null
+(
+    msg "\E[34m" "Building OSX package."
+    pushd osx/ &>/dev/null
+    sh package-game.sh ~/openra-package/$_gitname-build "$VERSION" &> package.log
+    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."
+    fi
+    popd &> /dev/null
+) &

 ####### *nix Builds #######
-pushd linux &> /dev/null
+(
+    pushd linux &> /dev/null

-#Desktop Icons
-BUILTDIR=../../../built
-mkdir -p $BUILTDIR/usr/share/applications/
-sed -i "3,3 d" openra-ra.desktop
-sed -i "3,3 i\Version=$VERSION" openra-ra.desktop
-sed -i "3,3 d" openra-cnc.desktop
-sed -i "3,3 i\Version=$VERSION" openra-cnc.desktop
-cp openra-ra.desktop $BUILTDIR/usr/share/applications/
-cp openra-cnc.desktop $BUILTDIR/usr/share/applications/
+    #Desktop Icons
+    BUILTDIR=../../../built
+    mkdir -p $BUILTDIR/usr/share/applications/
+    sed -i "3,3 d" openra-ra.desktop
+    sed -i "3,3 i\Version=$VERSION" openra-ra.desktop
+    sed -i "3,3 d" openra-cnc.desktop
+    sed -i "3,3 i\Version=$VERSION" openra-cnc.desktop
+    cp openra-ra.desktop $BUILTDIR/usr/share/applications/
+    cp openra-cnc.desktop $BUILTDIR/usr/share/applications/

-#Menu entries
-mkdir -p $BUILTDIR/usr/share/menu/
-cp openra-ra $BUILTDIR/usr/share/menu/
-cp openra-cnc $BUILTDIR/usr/share/menu/
+    #Menu entries
+    mkdir -p $BUILTDIR/usr/share/menu/
+    cp openra-ra $BUILTDIR/usr/share/menu/
+    cp openra-cnc $BUILTDIR/usr/share/menu/

-#Icon images
-mkdir -p $BUILTDIR/usr/share/pixmaps/
-cp openra.32.xpm $BUILTDIR/usr/share/pixmaps/
-mkdir -p $BUILTDIR/usr/share/icons/
-cp -r hicolor $BUILTDIR/usr/share/icons/
+    #Icon images
+    mkdir -p $BUILTDIR/usr/share/pixmaps/
+    cp openra.32.xpm $BUILTDIR/usr/share/pixmaps/
+    mkdir -p $BUILTDIR/usr/share/icons/
+    cp -r hicolor $BUILTDIR/usr/share/icons/

-popd &> /dev/null
+    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
+    #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" "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" "Package build failed, refer to log."
+    fi
+    popd &> /dev/null
+) &
+
+wait

 popd &> /dev/null # packaging
 popd &> /dev/null # $_gitname-build