Make packaging less noisy, + random cleanups

This commit is contained in:
Oliver Brakmann
2015-05-02 16:38:22 +02:00
parent f251813f89
commit 71857be388
4 changed files with 16 additions and 19 deletions

View File

@@ -28,12 +28,12 @@ make install-linux-mime prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
mkdir -p $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/ mkdir -p $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/
cp *.html $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/ cp *.html $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/
cd packaging/linux pushd packaging/linux/deb >/dev/null
pushd deb
echo "Building Debian package." echo "Building Debian package."
bash 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 popd >/dev/null
rm -rf $PWD/packaging/linux/$ROOTDIR/

View File

@@ -50,7 +50,7 @@ PACKAGE_SIZE=`du --apparent-size -c "${DEB_BUILD_ROOT}/usr" | grep "total" | awk
sed "s/{VERSION}/$VERSION/" DEBIAN/control | sed "s/{SIZE}/$PACKAGE_SIZE/" > "${DEB_BUILD_ROOT}/DEBIAN/control" sed "s/{VERSION}/$VERSION/" DEBIAN/control | sed "s/{SIZE}/$PACKAGE_SIZE/" > "${DEB_BUILD_ROOT}/DEBIAN/control"
# Build it in the temp directory, but place the finished deb in our starting directory # Build it in the temp directory, but place the finished deb in our starting directory
pushd "${DEB_BUILD_ROOT}" pushd "${DEB_BUILD_ROOT}" >/dev/null
# Calculate md5sums and clean up the ./usr/ part of them # Calculate md5sums and clean up the ./usr/ part of them
find . -type f -not -path "./DEBIAN/*" -print0 | xargs -0 -n1 md5sum | sed 's|\./usr/|/usr/|' > DEBIAN/md5sums find . -type f -not -path "./DEBIAN/*" -print0 | xargs -0 -n1 md5sum | sed 's|\./usr/|/usr/|' > DEBIAN/md5sums
@@ -63,6 +63,6 @@ PKGVERSION=`echo $1 | sed "s/-/\\./g"`
fakeroot dpkg-deb -b . "$3/openra_${PKGVERSION}_all.deb" fakeroot dpkg-deb -b . "$3/openra_${PKGVERSION}_all.deb"
# Clean up # Clean up
popd popd >/dev/null
rm -rf "${DEB_BUILD_ROOT}" rm -rf "${DEB_BUILD_ROOT}"

View File

@@ -15,11 +15,11 @@ if [ -e "OpenRA.app" ]; then
fi fi
curl -s -L -O https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/launcher.zip || exit 3 curl -s -L -O https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/launcher.zip || exit 3
unzip launcher.zip unzip -qq launcher.zip
rm launcher.zip rm launcher.zip
# Copy the template to build the game package # Copy the template to build the game package
cp -rv $2/* "OpenRA.app/Contents/Resources/" || exit 3 cp -r $2/* "OpenRA.app/Contents/Resources/" || exit 3
# Remove unused icon # Remove unused icon
rm OpenRA.app/Contents/Resources/OpenRA.ico rm OpenRA.app/Contents/Resources/OpenRA.ico
@@ -28,9 +28,6 @@ rm OpenRA.app/Contents/Resources/OpenRA.ico
rm OpenRA.app/Contents/Resources/OpenRA.exe rm OpenRA.app/Contents/Resources/OpenRA.exe
rm OpenRA.app/Contents/Resources/OpenRA.Editor.exe rm OpenRA.app/Contents/Resources/OpenRA.Editor.exe
# Remove linux cruft
rm Eluant.dll.config.in
# Set version string # Set version string
sed "s/{DEV_VERSION}/${1}/" OpenRA.app/Contents/Info.plist > OpenRA.app/Contents/Info.plist.tmp sed "s/{DEV_VERSION}/${1}/" OpenRA.app/Contents/Info.plist > OpenRA.app/Contents/Info.plist.tmp
mv OpenRA.app/Contents/Info.plist.tmp OpenRA.app/Contents/Info.plist mv OpenRA.app/Contents/Info.plist.tmp OpenRA.app/Contents/Info.plist

View File

@@ -25,7 +25,7 @@ test -e Changelog.md && rm Changelog.md
curl -s -L -O https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md curl -s -L -O https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md
curl -s -L -O http://daringfireball.net/projects/downloads/Markdown_1.0.1.zip curl -s -L -O http://daringfireball.net/projects/downloads/Markdown_1.0.1.zip
unzip Markdown_1.0.1.zip unzip -qq Markdown_1.0.1.zip
rm -rf Markdown_1.0.1.zip rm -rf Markdown_1.0.1.zip
./Markdown_1.0.1/Markdown.pl Changelog.md > CHANGELOG.html ./Markdown_1.0.1/Markdown.pl Changelog.md > CHANGELOG.html
./Markdown_1.0.1/Markdown.pl README.md > README.html ./Markdown_1.0.1/Markdown.pl README.md > README.html
@@ -80,28 +80,28 @@ cp OpenRA.exe packaging/built
cd packaging cd packaging
echo "Creating packages..." echo "Creating packages..."
pushd windows pushd windows >/dev/null
./buildpackage.sh "$TAG" "$BUILTDIR" "$SRCDIR" "$OUTPUTDIR" ./buildpackage.sh "$TAG" "$BUILTDIR" "$SRCDIR" "$OUTPUTDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Windows package build failed." echo "Windows package build failed."
fi fi
popd popd >/dev/null
pushd osx pushd osx >/dev/null
echo "Zipping OS X package" echo "Zipping OS X package"
./buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR" ./buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "OS X package build failed." echo "OS X package build failed."
fi fi
popd popd >/dev/null
pushd linux pushd linux >/dev/null
echo "Building Linux packages" echo "Building Linux packages"
./buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR" ./buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Linux package build failed." echo "Linux package build failed."
fi fi
popd popd >/dev/null
echo "Package build done." echo "Package build done."