epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep downloaded files in a separate directory

Browse Source 
As a side effect, this re-enables building the Windows installer on Linux hosts.
This commit is contained in:
Oliver Brakmann
2015-05-02 16:28:27 +02:00
parent 14886bc3f7
commit f251813f89
21 changed files with 154 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packaging/package-all.sh
View File

@@ -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,23 +80,16 @@ 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
./buildpackage.sh "$TAG" "$BUILTDIR" "$SRCDIR" "$OUTPUTDIR"
if [ $? -ne 0 ]; then
echo "Windows package build failed."
fi
popd
pushd osx
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
@@ -103,7 +97,7 @@ popd
pushd linux
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