mirror of
https://github.com/alliedmodders/metamod-source.git
synced 2024-11-28 10:24:20 +01:00
Enable Insurgency and Blade Symphony x64 builds (#77)
* Enable Insurgency and Blade Symphony x64 builds The HL2SDKs were updated to support compilation and linking on x64 before. #67 allowed to load MMS on Blade Symphony Win64. AMBuild 2.2 allowed to build for multiple architectures in one build script on Windows. #76 * Add Insurgency to AppVeyor SDKs to test win64 builds * Try to enable x64 builds on appveyor * I don't know PowerShell syntax * Split the envvar before usage Thanks psychonic!
This commit is contained in:
parent
0084d58709
commit
0ab7434c43
@ -37,6 +37,15 @@ Source2 = {
|
|||||||
'windows': ['x86', 'x86_64'],
|
'windows': ['x86', 'x86_64'],
|
||||||
'linux': ['x86_64'],
|
'linux': ['x86_64'],
|
||||||
}
|
}
|
||||||
|
Insurgency = {
|
||||||
|
'windows': ['x86', 'x86_64'],
|
||||||
|
'linux': ['x86'],
|
||||||
|
'mac': ['x86', 'x86_64'],
|
||||||
|
}
|
||||||
|
Blade = {
|
||||||
|
'windows': ['x86', 'x86_64'],
|
||||||
|
'linux': ['x86_64']
|
||||||
|
}
|
||||||
|
|
||||||
PossibleSDKs = {
|
PossibleSDKs = {
|
||||||
'episode1': SDK('HL2SDK', '2.ep1', '1', 'EPISODEONE', WinLinux, 'episode1'),
|
'episode1': SDK('HL2SDK', '2.ep1', '1', 'EPISODEONE', WinLinux, 'episode1'),
|
||||||
@ -56,8 +65,8 @@ PossibleSDKs = {
|
|||||||
'csgo': SDK('HL2SDKCSGO', '2.csgo', '21', 'CSGO', CSGO, 'csgo'),
|
'csgo': SDK('HL2SDKCSGO', '2.csgo', '21', 'CSGO', CSGO, 'csgo'),
|
||||||
'dota': SDK('HL2SDKDOTA', '2.dota', '22', 'DOTA', [], 'dota'),
|
'dota': SDK('HL2SDKDOTA', '2.dota', '22', 'DOTA', [], 'dota'),
|
||||||
'portal2': SDK('HL2SDKPORTAL2', '2.portal2', '17', 'PORTAL2', [], 'portal2'),
|
'portal2': SDK('HL2SDKPORTAL2', '2.portal2', '17', 'PORTAL2', [], 'portal2'),
|
||||||
'blade': SDK('HL2SDKBLADE', '2.blade', '18', 'BLADE', WinOnly, 'blade'),
|
'blade': SDK('HL2SDKBLADE', '2.blade', '18', 'BLADE', Blade, 'blade'),
|
||||||
'insurgency': SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', WinLinuxMac, 'insurgency'),
|
'insurgency': SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', Insurgency, 'insurgency'),
|
||||||
'doi': SDK('HL2SDKDOI', '2.doi', '20', 'DOI', WinLinuxMac, 'doi'),
|
'doi': SDK('HL2SDKDOI', '2.doi', '20', 'DOI', WinLinuxMac, 'doi'),
|
||||||
'contagion': SDK('HL2SDKCONTAGION', '2.contagion', '14', 'CONTAGION', WinOnly, 'contagion'),
|
'contagion': SDK('HL2SDKCONTAGION', '2.contagion', '14', 'CONTAGION', WinOnly, 'contagion'),
|
||||||
'bms': SDK('HL2SDKBMS', '2.bms', '10', 'BMS', WinLinux, 'bms'),
|
'bms': SDK('HL2SDKBMS', '2.bms', '10', 'BMS', WinLinux, 'bms'),
|
||||||
|
104
appveyor.yml
104
appveyor.yml
@ -1,96 +1,18 @@
|
|||||||
version: 1.0.{build}
|
version: 1.0.{build}
|
||||||
image: Visual Studio 2015
|
image: Visual Studio 2015
|
||||||
clone_folder: c:\projects\metamod-source
|
clone_folder: c:\projects\metamod-source
|
||||||
|
clone_depth: 1
|
||||||
|
environment:
|
||||||
|
SDKS: csgo,l4d2,tf2,episode1,insurgency
|
||||||
install:
|
install:
|
||||||
- ps: >-
|
# https://www.appveyor.com/docs/windows-images-software/#python
|
||||||
Function Checkout-Repo($name, $branch, $repo, $origin)
|
- cmd: set PATH=C:\Python38;C:\Python38\Scripts;%PATH%
|
||||||
|
- cmd: git pull
|
||||||
{
|
- cmd: cd ..
|
||||||
if (-not (Test-Path $name -PathType Container))
|
- ps: metamod-source/support/checkout-deps.ps1 -SDKs ($env:SDKS -split ',')
|
||||||
{
|
- cmd: cd metamod-source
|
||||||
git clone $repo -b $branch $name 2>&1 | Write-Host
|
|
||||||
if ($origin)
|
|
||||||
{
|
|
||||||
cd $name
|
|
||||||
git remote rm origin 2>&1 | Write-Host
|
|
||||||
git remote add origin $origin 2>&1 | Write-Host
|
|
||||||
cd ..
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cd $name
|
|
||||||
git checkout $branch 2>&1 | Write-Host
|
|
||||||
git pull origin $branch 2>&1 | Write-Host
|
|
||||||
cd ..
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Set-Location $env:APPVEYOR_BUILD_FOLDER
|
|
||||||
|
|
||||||
[System.Environment]::CurrentDirectory = Get-Location
|
|
||||||
|
|
||||||
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
[System.Environment]::CurrentDirectory = Get-Location
|
|
||||||
|
|
||||||
|
|
||||||
if (-not (Test-Path "metamod-source" -PathType Container))
|
|
||||||
|
|
||||||
{
|
|
||||||
Write-Error "Could not find a MetaMod:Source repository; make sure you aren't running this script inside it."
|
|
||||||
Exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$SDKS = @( "csgo", "l4d2", "tf2", "episode1" )
|
|
||||||
|
|
||||||
if (-not (Test-Path "hl2sdk-proxy-repo" -PathType Container))
|
|
||||||
|
|
||||||
{
|
|
||||||
git clone --mirror https://github.com/alliedmodders/hl2sdk hl2sdk-proxy-repo 2>&1 | Write-Host
|
|
||||||
}
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
{
|
|
||||||
cd hl2sdk-proxy-repo
|
|
||||||
git fetch 2>&1 | Write-Host
|
|
||||||
cd ..
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$SDKS | % {
|
|
||||||
Checkout-Repo "hl2sdk-$_" $_ "hl2sdk-proxy-repo" "https://github.com/alliedmodders/hl2sdk"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Checkout-Repo "ambuild" "master" "https://github.com/alliedmodders/ambuild"
|
|
||||||
|
|
||||||
cd ambuild
|
|
||||||
|
|
||||||
& c:\python27\python.exe setup.py install
|
|
||||||
|
|
||||||
|
|
||||||
[System.Environment]::CurrentDirectory = "c:\projects\"
|
|
||||||
|
|
||||||
Set-Location "c:\projects\"
|
|
||||||
|
|
||||||
|
|
||||||
#Checkout-Repo "amtl" "master" "https://github.com/alliedmodders/amtl"
|
|
||||||
|
|
||||||
|
|
||||||
Set-Location $env:APPVEYOR_BUILD_FOLDER
|
|
||||||
|
|
||||||
[System.Environment]::CurrentDirectory = Get-Location
|
|
||||||
build_script:
|
build_script:
|
||||||
- cmd: >-
|
- cmd: mkdir build
|
||||||
"%VS140COMNTOOLS%\vsvars32.bat"
|
- cmd: cd build
|
||||||
|
- cmd: python ../configure.py --enable-optimize --sdks=%SDKS% --targets=x86,x86_64
|
||||||
mkdir opt32 && cd opt32
|
- cmd: ambuild
|
||||||
|
|
||||||
C:\python27\python.exe ..\configure.py --enable-optimize --sdks=csgo,l4d2,tf2,episode1
|
|
||||||
|
|
||||||
C:\python27\Scripts\ambuild
|
|
||||||
|
133
support/checkout-deps.ps1
Normal file
133
support/checkout-deps.ps1
Normal file
@ -0,0 +1,133 @@
|
|||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Downloads dependencies for compiling MetaMod:Source.
|
||||||
|
.PARAMETER SDKs
|
||||||
|
List of HL2SDK branch names to downloads.
|
||||||
|
#>
|
||||||
|
|
||||||
|
[CmdletBinding()]
|
||||||
|
param(
|
||||||
|
[string[]]$SDKs = @(
|
||||||
|
'csgo',
|
||||||
|
'hl2dm',
|
||||||
|
'nucleardawn',
|
||||||
|
'l4d2',
|
||||||
|
'dods',
|
||||||
|
'l4d',
|
||||||
|
'css',
|
||||||
|
'tf2',
|
||||||
|
'insurgency',
|
||||||
|
'sdk2013',
|
||||||
|
'dota',
|
||||||
|
'orangebox',
|
||||||
|
'blade',
|
||||||
|
'episode1',
|
||||||
|
'bms',
|
||||||
|
'darkm',
|
||||||
|
'swarm',
|
||||||
|
'bgt',
|
||||||
|
'eye',
|
||||||
|
'contagion',
|
||||||
|
'doi'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
Function Get-Repository
|
||||||
|
{
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory=$true)][string]$Name,
|
||||||
|
[Parameter(Mandatory=$true)][string]$Branch,
|
||||||
|
[Parameter(Mandatory=$true)][string]$Repo,
|
||||||
|
[string]$Origin
|
||||||
|
)
|
||||||
|
|
||||||
|
If (-not (Test-Path $Name -PathType Container))
|
||||||
|
{
|
||||||
|
& git clone $Repo -b $Branch $Name 2>&1 | Write-Host
|
||||||
|
If ($Origin)
|
||||||
|
{
|
||||||
|
Set-Location $Name
|
||||||
|
& git remote set-url origin $Origin 2>&1 | Write-Host
|
||||||
|
Set-Location ..
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Else
|
||||||
|
{
|
||||||
|
Set-Location $Name
|
||||||
|
If ($Origin)
|
||||||
|
{
|
||||||
|
& git remote set-url origin ..\$Repo 2>&1 | Write-Host
|
||||||
|
}
|
||||||
|
& git checkout $Branch 2>&1 | Write-Host
|
||||||
|
& git pull origin $Branch 2>&1 | Write-Host
|
||||||
|
If ($Origin)
|
||||||
|
{
|
||||||
|
& git remote set-url origin $Origin 2>&1 | Write-Host
|
||||||
|
}
|
||||||
|
Set-Location ..
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (-not (Test-Path "metamod-source" -PathType Container))
|
||||||
|
{
|
||||||
|
Write-Error "Could not find a MetaMod:Source repository; make sure you aren't running this script inside it."
|
||||||
|
Exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if (-not (Test-Path "hl2sdk-proxy-repo" -PathType Container))
|
||||||
|
{
|
||||||
|
& git clone --mirror https://github.com/alliedmodders/hl2sdk hl2sdk-proxy-repo 2>&1 | Write-Host
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Set-Location hl2sdk-proxy-repo
|
||||||
|
& git fetch 2>&1 | Write-Host
|
||||||
|
Set-Location ..
|
||||||
|
}
|
||||||
|
|
||||||
|
$SDKS | ForEach-Object {
|
||||||
|
Get-Repository -Name "hl2sdk-$_" -Branch $_ -Repo "hl2sdk-proxy-repo" "https://github.com/alliedmodders/hl2sdk.git"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Find a suitable installation of Python
|
||||||
|
$PYTHON_CMD = Get-Command 'python' -ErrorAction SilentlyContinue
|
||||||
|
if ($NULL -eq $PYTHON_CMD)
|
||||||
|
{
|
||||||
|
$PYTHON_CMD = Get-Command 'python3' -ErrorAction SilentlyContinue
|
||||||
|
if ($NULL -eq $PYTHON_CMD)
|
||||||
|
{
|
||||||
|
$PYTHON_CMD = Get-Command 'py' -ErrorAction SilentlyContinue
|
||||||
|
if ($NULL -eq $PYTHON_CMD)
|
||||||
|
{
|
||||||
|
Write-Error 'No suitable installation of Python detected'
|
||||||
|
Exit 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$PYTHON_CMD = $PYTHON_CMD.Source # Convert the result into a string path.
|
||||||
|
|
||||||
|
& $PYTHON_CMD -c 'import ambuild2' 2>&1 1>$NULL
|
||||||
|
if ($LastExitCode -eq 1)
|
||||||
|
{
|
||||||
|
Write-Host -ForegroundColor Red "AMBuild is required to build MetaMod:Source"
|
||||||
|
|
||||||
|
# Ensure PIP is installed, otherwise, install it.
|
||||||
|
& $PYTHON_CMD -m pip --version 2>&1 1>$NULL # We use PIP's '--version' as it's the least verbose.
|
||||||
|
if ($LastExitCode -eq 1) {
|
||||||
|
Write-Host -ForegroundColor Red 'The detected Python installation does not have PIP'
|
||||||
|
Write-Host 'Installing the latest version of PIP available (VIA "get-pip.py")'
|
||||||
|
|
||||||
|
$GET_PIP = Join-Path $(Resolve-Path './') 'get-pip.py'
|
||||||
|
Invoke-WebRequest -Uri "https://bootstrap.pypa.io/get-pip.py" -OutFile $GET_PIP
|
||||||
|
|
||||||
|
& $PYTHON_CMD $GET_PIP
|
||||||
|
if ($LastExitCode -eq 1) {
|
||||||
|
Write-Error 'Installation of PIP has failed'
|
||||||
|
Exit 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Get-Repository -Name "ambuild" -Branch "master" -Repo "https://github.com/alliedmodders/ambuild.git"
|
||||||
|
& $PYTHON_CMD -m pip install ./ambuild
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user