one at a time

This commit is contained in:
Matthias Mailänder
2014-06-05 10:22:42 +02:00
parent 4c38a881b4
commit dd7e92112e
2 changed files with 44 additions and 52 deletions

View File

@@ -38,32 +38,29 @@ cp *.html $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/
cd packaging/linux cd packaging/linux
( pushd deb
echo "Building Debian package." echo "Building Debian package."
cd deb ./buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
./buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR" if [ $? -ne 0 ]; then
if [ $? -ne 0 ]; then echo "Debian package build failed."
echo "Debian package build failed." fi
fi popd
) &
( pushd pkgbuild
echo "Building Arch-Linux package." echo "Building Arch-Linux package."
cd pkgbuild sh buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
sh buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR" if [ $? -ne 0 ]; then
if [ $? -ne 0 ]; then echo "Arch-Linux package build failed."
echo "Arch-Linux package build failed." fi
fi popd
) &
( pushd rpm
echo "Building RPM package." echo "Building RPM package."
cd rpm sh buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR"
sh buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR" if [ $? -ne 0 ]; then
if [ $? -ne 0 ]; then echo "RPM package build failed."
echo "RPM package build failed." fi
fi popd
) &
wait wait

View File

@@ -74,40 +74,35 @@ cp thirdparty/RestSharp.dll packaging/built
# Copy game icon for windows package # Copy game icon for windows package
cp OpenRA.Game/OpenRA.ico packaging/built cp OpenRA.Game/OpenRA.ico packaging/built
#
# Change into packaging directory and run the
# platform-dependant packaging in parallel
#
cd packaging cd packaging
echo "Creating packages..." echo "Creating packages..."
( pushd windows
cd windows echo "Building Windows setup.exe"
makensis -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi makensis -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
else else
echo "Windows package build failed." echo "Windows package build failed."
fi fi
) & popd
( pushd osx
cd osx echo "Zipping OS X package"
sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR" sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "OS X package build failed." echo "OS X package build failed."
fi fi
) & popd
( pushd linux
cd linux echo "Building Linux packages"
sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR" sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Linux package build failed." echo "Linux package build failed."
fi fi
) & popd
wait
echo "Package build done." echo "Package build done."
rm -rf $BUILTDIR rm -rf $BUILTDIR