Keep downloaded files in a separate directory
As a side effect, this re-enables building the Windows installer on Linux hosts.
This commit is contained in:
@@ -27,19 +27,4 @@ if [ "$os" == 'Linux' ]; then
|
||||
sed "s/@LIBLUA51@/${liblua51}/" thirdparty/Eluant.dll.config.in > Eluant.dll.config
|
||||
echo "Eluant.dll.config has been created successfully."
|
||||
fi
|
||||
elif [ "$os" == 'Darwin' ]; then
|
||||
if [ ! -f libSDL2.dylib ]; then
|
||||
echo "Fetching OS X SDL2 library from GitHub."
|
||||
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/libSDL2.dylib
|
||||
fi
|
||||
|
||||
if [ ! -f liblua.5.1.dylib ]; then
|
||||
echo "Fetching OS X Lua 5.1 library from GitHub."
|
||||
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/liblua.5.1.dylib
|
||||
fi
|
||||
|
||||
if [ ! -f Eluant.dll.config ]; then
|
||||
echo "Fetching OS X Lua configuration file from GitHub."
|
||||
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/Eluant.dll.config
|
||||
fi
|
||||
fi
|
||||
20
thirdparty/fetch-thirdparty-deps-osx.sh
vendored
Executable file
20
thirdparty/fetch-thirdparty-deps-osx.sh
vendored
Executable file
@@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
|
||||
download_dir="${0%/*}/download/osx"
|
||||
mkdir -p "$download_dir"
|
||||
cd "$download_dir"
|
||||
|
||||
if [ ! -f libSDL2.dylib ]; then
|
||||
echo "Fetching OS X SDL2 library from GitHub."
|
||||
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/libSDL2.dylib
|
||||
fi
|
||||
|
||||
if [ ! -f liblua.5.1.dylib ]; then
|
||||
echo "Fetching OS X Lua 5.1 library from GitHub."
|
||||
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/liblua.5.1.dylib
|
||||
fi
|
||||
|
||||
if [ ! -f Eluant.dll.config ]; then
|
||||
echo "Fetching OS X Lua configuration file from GitHub."
|
||||
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/Eluant.dll.config
|
||||
fi
|
||||
27
thirdparty/fetch-thirdparty-deps-windows.sh
vendored
27
thirdparty/fetch-thirdparty-deps-windows.sh
vendored
@@ -3,34 +3,39 @@
|
||||
# Die on any error for Travis CI to automatically retry:
|
||||
set -e
|
||||
|
||||
if [ ! -d windows ]; then
|
||||
mkdir windows
|
||||
fi
|
||||
download_dir="${0%/*}/download/windows"
|
||||
|
||||
if [ ! -f windows/SDL2.dll ]; then
|
||||
mkdir -p "${download_dir}"
|
||||
cd "${download_dir}"
|
||||
|
||||
if [ ! -f SDL2.dll ]; then
|
||||
echo "Fetching SDL2 from nuget"
|
||||
nuget install sdl2 -Version 2.0.3 -ExcludeVersion
|
||||
cp ./sdl2.redist/build/native/bin/Win32/dynamic/SDL2.dll ./windows/
|
||||
cp ./sdl2.redist/build/native/bin/Win32/dynamic/SDL2.dll .
|
||||
rm -rf sdl2 sdl2.redist
|
||||
fi
|
||||
|
||||
if [ ! -f windows/freetype6.dll ]; then
|
||||
if [ ! -f freetype6.dll ]; then
|
||||
echo "Fetching FreeType2 from nuget"
|
||||
nuget install SharpFont.Dependencies -Version 2.5.5.1 -ExcludeVersion
|
||||
cp ./SharpFont.Dependencies/bin/msvc10/x86/freetype6.dll ./windows/
|
||||
cp ./SharpFont.Dependencies/bin/msvc10/x86/freetype6.dll .
|
||||
rm -rf SharpFont.Dependencies
|
||||
fi
|
||||
|
||||
if [ ! -f windows/lua51.dll ]; then
|
||||
if [ ! -f lua51.dll ]; then
|
||||
echo "Fetching Lua 5.1 from nuget"
|
||||
nuget install lua.binaries -Version 5.1.5 -ExcludeVersion
|
||||
cp ./lua.binaries/bin/win32/dll8/lua5.1.dll ./windows/lua51.dll
|
||||
cp ./lua.binaries/bin/win32/dll8/lua5.1.dll ./lua51.dll
|
||||
rm -rf lua.binaries
|
||||
fi
|
||||
|
||||
if [ ! -f windows/soft_oal.dll ]; then
|
||||
if [ ! -f soft_oal.dll ]; then
|
||||
echo "Fetching OpenAL Soft from nuget"
|
||||
nuget install OpenAL-Soft -Version 1.16.0 -ExcludeVersion
|
||||
cp ./OpenAL-Soft/bin/Win32/soft_oal.dll windows/soft_oal.dll
|
||||
cp ./OpenAL-Soft/bin/Win32/soft_oal.dll ./soft_oal.dll
|
||||
rm -rf OpenAL-Soft
|
||||
fi
|
||||
|
||||
if [ ! -f ../NsProcess.zip ]; then
|
||||
curl -s -L -o ../NsProcess.zip http://nsis.sourceforge.net/mediawiki/images/archive/1/18/20140806212030!NsProcess.zip
|
||||
fi
|
||||
|
||||
6
thirdparty/fetch-thirdparty-deps.ps1
vendored
6
thirdparty/fetch-thirdparty-deps.ps1
vendored
@@ -1,4 +1,6 @@
|
||||
mkdir windows -Force >$null
|
||||
mkdir download/windows -Force >$null
|
||||
|
||||
cd download
|
||||
|
||||
if (!(Test-Path "nuget.exe"))
|
||||
{
|
||||
@@ -127,3 +129,5 @@ if (!(Test-Path "Eluant.dll"))
|
||||
$target = Join-Path $pwd.ToString() "Eluant.dll"
|
||||
(New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/Eluant/releases/download/20140425/Eluant.dll", $target)
|
||||
}
|
||||
|
||||
cd ..
|
||||
|
||||
5
thirdparty/fetch-thirdparty-deps.sh
vendored
5
thirdparty/fetch-thirdparty-deps.sh
vendored
@@ -3,6 +3,11 @@
|
||||
# Die on any error for Travis CI to automatically retry:
|
||||
set -e
|
||||
|
||||
download_dir="${0%/*}/download"
|
||||
|
||||
mkdir -p "${download_dir}"
|
||||
cd "${download_dir}"
|
||||
|
||||
if [ ! -f StyleCopPlus.dll ]; then
|
||||
echo "Fetching StyleCopPlus from nuget"
|
||||
nuget install StyleCopPlus.MSBuild -Version 4.7.49.5 -ExcludeVersion
|
||||
|
||||
Reference in New Issue
Block a user