Merge pull request #8083 from obrakmann/separate_download_dir

Closes #8069

packaging/linux/buildpackage.sh

@@ -29,12 +29,12 @@ make install-linux-appdata prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 mkdir -p $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/
 cp *.html $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/
 
-cd packaging/linux
-
-pushd deb
+pushd packaging/linux/deb >/dev/null
 echo "Building Debian package."
-bash buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
+./buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
 if [ $? -ne 0 ]; then
     echo "Debian package build failed."
 fi
-popd
+popd >/dev/null
+
+rm -rf $PWD/packaging/linux/$ROOTDIR/

packaging/linux/deb/buildpackage.sh

@@ -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"
 
 # 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
 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"
 
 # Clean up
-popd
+popd >/dev/null
 rm -rf "${DEB_BUILD_ROOT}"
 

packaging/osx/buildpackage.sh

@@ -15,11 +15,11 @@ if [ -e "OpenRA.app" ]; then
 fi
 
 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
 
 # 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
 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.Editor.exe
 
-# Remove linux cruft
-rm Eluant.dll.config.in
-
 # Set version string
 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

packaging/package-all.sh

@@ -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 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
 ./Markdown_1.0.1/Markdown.pl Changelog.md > CHANGELOG.html
 ./Markdown_1.0.1/Markdown.pl README.md > README.html
@@ -47,28 +47,29 @@ for i in "${FILES[@]}"; do
 done
 
 # SharpZipLib for zip file support
-cp thirdparty/ICSharpCode.SharpZipLib.dll packaging/built
+cp thirdparty/download/ICSharpCode.SharpZipLib.dll packaging/built
 
 # FuzzyLogicLibrary for improved AI
-cp thirdparty/FuzzyLogicLibrary.dll packaging/built
+cp thirdparty/download/FuzzyLogicLibrary.dll packaging/built
 
 # SharpFont for FreeType support
-cp thirdparty/SharpFont* packaging/built
+cp thirdparty/download/SharpFont* packaging/built
 
 # SDL2-CS
+cp thirdparty/download/SDL2-CS* packaging/built
 cp thirdparty/SDL2-CS* packaging/built
 
 # Mono.NAT for UPnP support
-cp thirdparty/Mono.Nat.dll packaging/built
+cp thirdparty/download/Mono.Nat.dll packaging/built
 
 # Eluant (Lua integration)
-cp thirdparty/Eluant* packaging/built
+cp thirdparty/download/Eluant* packaging/built
 
 # GeoIP database access
-cp thirdparty/MaxMind.Db.dll packaging/built
-cp thirdparty/MaxMind.GeoIP2.dll packaging/built
-cp thirdparty/Newtonsoft.Json.dll packaging/built
-cp thirdparty/RestSharp.dll packaging/built
+cp thirdparty/download/MaxMind.Db.dll packaging/built
+cp thirdparty/download/MaxMind.GeoIP2.dll packaging/built
+cp thirdparty/download/Newtonsoft.Json.dll packaging/built
+cp thirdparty/download/RestSharp.dll packaging/built
 
 # Copy game icon for windows package
 cp OpenRA.Game/OpenRA.ico packaging/built
@@ -79,35 +80,28 @@ cp OpenRA.exe packaging/built
 cd packaging
 echo "Creating packages..."
 
-if [ -x /usr/bin/makensis ]; then
-    pushd windows
-    echo "Building Windows setup.exe"
-    makensis -V2 -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi
-    if [ $? -eq 0 ]; then
-        mv OpenRA.Setup.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
-    else
-        echo "Windows package build failed."
-    fi
-    popd
-else
-    echo "Skipping Windows setup.exe build due to missing NSIS"
+pushd windows >/dev/null
+./buildpackage.sh "$TAG" "$BUILTDIR" "$SRCDIR" "$OUTPUTDIR"
+if [ $? -ne 0 ]; then
+    echo "Windows package build failed."
 fi
+popd >/dev/null
 
-pushd osx
+pushd osx >/dev/null
 echo "Zipping OS X package"
-bash buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR"
+./buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR"
 if [ $? -ne 0 ]; then
     echo "OS X package build failed."
 fi
-popd
+popd >/dev/null
 
-pushd linux
+pushd linux >/dev/null
 echo "Building Linux packages"
-bash buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR"
+./buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR"
 if [ $? -ne 0 ]; then
     echo "Linux package build failed."
 fi
-popd
+popd >/dev/null
 
 echo "Package build done."
 

packaging/windows/buildpackage.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+TAG="$1"
+BUILTDIR="$2"
+SRCDIR="$3"
+OUTPUTDIR="$4"
+
+if [ -x /usr/bin/makensis ]; then
+    pushd "$SRCDIR" >/dev/null
+    popd >/dev/null
+    if [[ ! -f /usr/share/nsis/Include/nsProcess.nsh &&  ! -f /usr/share/nsis/Plugin/nsProcess.dll ]]; then
+        echo "Installing NsProcess NSIS plugin in /usr/share/nsis"
+        sudo unzip -qq -o ${SRCDIR}/thirdparty/download/NsProcess.zip 'Include/*' -d /usr/share/nsis
+        sudo unzip -qq -j -o ${SRCDIR}/thirdparty/download/NsProcess.zip 'Plugin/*' -d /usr/share/nsis/Plugins
+    fi
+    echo "Building Windows setup.exe"
+    makensis -V2 -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/download/windows" OpenRA.nsi
+    if [ $? -eq 0 ]; then
+        mv OpenRA.Setup.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
+    else
+        exit 1
+    fi
+else
+    echo "Skipping Windows setup.exe build due to missing NSIS"
+fi