rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-01-19 08:52:34 +01:00
Code Issues Releases Activity

Switch to a manifest-based build model. (#131)

Browse Source 
Rather than hardcode a bunch of SDK stuff, this is an attempt to move
SDK information to a declarative model. Each SDK gets a manifest, and
the manifests are stored in a shared repository.

Manifests encode stuff like "what platforms does this SDK build on" and
"what link flags do I need on each architecture".

This will hopefully reduce the complexity of the build scripts, since
going forward we only have to add new manifests, rather than figure out
how to attach more gunk into the build logic.
This commit is contained in:
David Anderson 2023-10-10 22:17:27 -07:00 committed by GitHub
parent 36cc78aea4
commit 1aae42c579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 134 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "third_party/amtl"] [submodule "third_party/amtl"]
path = third_party/amtl path = third_party/amtl
url = https://github.com/alliedmodders/amtl url = https://github.com/alliedmodders/amtl
[submodule "hl2sdk-manifests"]
path = hl2sdk-manifests
url = https://github.com/alliedmodders/hl2sdk-manifests

248
AMBuildScript
View File

@ -1,90 +1,6 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
import os, sys import os, sys
class SDK(object):
def __init__(self, sdk, ext, aDef, name, platform, dir):
self.folder = 'hl2sdk-' + dir
self.envvar = sdk
self.ext = ext
self.code = aDef
self.define = name
self.name = dir
self.path = None # Actual path
self.platformSpec = platform
# By default, nothing supports x64.
if type(platform) is list:
self.platformSpec = {p: ['x86'] for p in platform}
else:
self.platformSpec = platform
def shouldBuild(self, targets):
for cxx in targets:
if cxx.target.platform in self.platformSpec:
if cxx.target.arch in self.platformSpec[cxx.target.platform]:
return True
return False
WinOnly = ['windows']
WinLinux = ['windows', 'linux']
WinLinuxMac = ['windows', 'linux', 'mac']
CSGO = {
'windows': ['x86'],
'linux': ['x86', 'x86_64'],
'mac': ['x86_64']
}
Source2 = {
'windows': ['x86_64'],
'linux': ['x86_64'],
}
Insurgency = {
'windows': ['x86', 'x86_64'],
'linux': ['x86'],
'mac': ['x86', 'x86_64'],
}
Blade = {
'windows': ['x86', 'x86_64'],
'linux': ['x86_64']
}
MCV = {
'windows': ['x86_64'],
'linux': ['x86_64'],
}
Mock = {
'windows': ['x86', 'x86_64'],
'linux': ['x86', 'x86_64'],
'mac': ['x86_64']
}
PossibleSDKs = {
'episode1': SDK('HL2SDK', '2.ep1', '1', 'EPISODEONE', WinLinux, 'episode1'),
'ep2': SDK('HL2SDKOB', '2.ep2', '3', 'ORANGEBOX', WinLinux, 'orangebox'),
'css': SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'),
'hl2dm': SDK('HL2SDKHL2DM', '2.hl2dm', '7', 'HL2DM', WinLinuxMac, 'hl2dm'),
'dods': SDK('HL2SDKDODS', '2.dods', '8', 'DODS', WinLinuxMac, 'dods'),
'sdk2013': SDK('HL2SDK2013', '2.sdk2013', '9', 'SDK2013', WinLinuxMac, 'sdk2013'),
'tf2': SDK('HL2SDKTF2', '2.tf2', '12', 'TF2', WinLinuxMac, 'tf2'),
'l4d': SDK('HL2SDKL4D', '2.l4d', '13', 'LEFT4DEAD', WinLinuxMac, 'l4d'),
'nucleardawn': SDK('HL2SDKND', '2.nd', '14', 'NUCLEARDAWN', WinLinuxMac, 'nucleardawn'),
'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '16', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
'darkm': SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'),
'swarm': SDK('HL2SDK-SWARM', '2.swarm', '17', 'ALIENSWARM', WinOnly, 'swarm'),
'bgt': SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'),
'eye': SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'),
'mcv': SDK('HL2SDKMCV', '2.mcv', '22', 'MCV', MCV, 'mcv'),
'csgo': SDK('HL2SDKCSGO', '2.csgo', '23', 'CSGO', CSGO, 'csgo'),
'portal2': SDK('HL2SDKPORTAL2', '2.portal2', '18', 'PORTAL2', [], 'portal2'),
'blade': SDK('HL2SDKBLADE', '2.blade', '19', 'BLADE', Blade, 'blade'),
'insurgency': SDK('HL2SDKINSURGENCY', '2.insurgency', '20', 'INSURGENCY', Insurgency, 'insurgency'),
'doi': SDK('HL2SDKDOI', '2.doi', '21', 'DOI', WinLinuxMac, 'doi'),
'contagion': SDK('HL2SDKCONTAGION', '2.contagion', '15', 'CONTAGION', WinOnly, 'contagion'),
'bms': SDK('HL2SDKBMS', '2.bms', '11', 'BMS', WinLinux, 'bms'),
'mock': SDK('HL2SDK-MOCK', '2.mock', '999', 'MOCK', Mock, 'mock'),
'pvkii': SDK('HL2SDKPVKII', '2.pvkii', '10', 'PVKII', WinLinux, 'pvkii'),
'dota': SDK('HL2SDKDOTA', '2.dota', '24', 'DOTA', Source2, 'dota'),
'cs2': SDK('HL2SDKCS2', '2.cs2', '25', 'CS2', Source2, 'cs2'),
}
def ResolveEnvPath(env, folder): def ResolveEnvPath(env, folder):
if env in os.environ: if env in os.environ:
path = os.environ[env] path = os.environ[env]
@ -101,9 +17,15 @@ def ResolveEnvPath(env, folder):
head, tail = os.path.split(head) head, tail = os.path.split(head)
return None return None
SdkHelpers = builder.Eval('hl2sdk-manifests/SdkHelpers.ambuild', {
'Project': 'metamod'
})
class MMSConfig(object): class MMSConfig(object):
def __init__(self): def __init__(self):
self.sdk_manifests = []
self.sdks = {} self.sdks = {}
self.sdk_targets = []
self.binaries = [] self.binaries = []
self.generated_headers = None self.generated_headers = None
self.versionlib = None self.versionlib = None
@ -151,6 +73,22 @@ class MMSConfig(object):
major, minor, release = m.groups() major, minor, release = m.groups()
self.productVersion = '{0}.{1}.{2}'.format(major, minor, release) self.productVersion = '{0}.{1}.{2}'.format(major, minor, release)
def findSdkPath(self, sdk_name):
dir_name = 'hl2sdk-{}'.format(sdk_name)
if builder.options.hl2sdk_root:
sdk_path = os.path.join(builder.options.hl2sdk_root, dir_name)
if os.path.exists(sdk_path):
return sdk_path
return ResolveEnvPath('HL2SDK{}'.format(sdk_name.upper()), dir_name)
def shouldIncludeSdk(self, sdk):
if sdk.get('source2', False) and self.productVersion.startswith('1.'):
return False
for cxx in self.all_targets:
if SdkHelpers.shouldBuildSdk(sdk, cxx):
return True
return False
def detectSDKs(self): def detectSDKs(self):
sdk_list = builder.options.sdks.split(',') sdk_list = builder.options.sdks.split(',')
use_all = sdk_list[0] == 'all' use_all = sdk_list[0] == 'all'
@ -159,23 +97,20 @@ class MMSConfig(object):
sdk_list = [] sdk_list = []
not_found = [] not_found = []
for sdk_name in PossibleSDKs: for sdk_name, sdk in SdkHelpers.getSdks(builder):
sdk = PossibleSDKs[sdk_name] self.sdk_manifests.append(sdk)
if sdk.shouldBuild(self.all_targets): if not self.shouldIncludeSdk(sdk):
if builder.options.hl2sdk_root: continue
sdk_path = os.path.join(builder.options.hl2sdk_root, sdk.folder)
if not os.path.exists(sdk_path): sdk_path = self.findSdkPath(sdk_name)
sdk_path = None if sdk_path is None:
else: if (use_all and sdk_name != 'mock') or sdk_name in sdk_list:
sdk_path = ResolveEnvPath(sdk.envvar, sdk.folder) raise Exception('Could not find a valid path for {0}'.format(sdk_name))
if sdk_path is None: not_found.append(sdk_name)
if (use_all and sdk_name != 'mock') or sdk_name in sdk_list: continue
raise Exception('Could not find a valid path for {0}'.format(sdk.envvar))
not_found.append(sdk_name) sdk['path'] = sdk_path
continue self.sdks[sdk_name] = sdk
if use_all or use_present or sdk_name in sdk_list:
sdk.path = sdk_path
self.sdks[sdk_name] = sdk
if len(self.sdks) < 1 and len(sdk_list): if len(self.sdks) < 1 and len(sdk_list):
raise Exception('No SDKs were found, nothing to build.') raise Exception('No SDKs were found, nothing to build.')
@ -184,6 +119,12 @@ class MMSConfig(object):
for sdk in not_found: for sdk in not_found:
print('Warning: hl2sdk-{} was not found, and will not be included in build.'.format(sdk)) print('Warning: hl2sdk-{} was not found, and will not be included in build.'.format(sdk))
for _, sdk in self.sdks.items():
for cxx in self.all_targets:
if not SdkHelpers.shouldBuildSdk(sdk, cxx):
continue
self.sdk_targets += [(sdk, cxx)]
def configure(self): def configure(self):
builder.AddConfigureFile('pushbuild.txt') builder.AddConfigureFile('pushbuild.txt')
@ -356,24 +297,14 @@ class MMSConfig(object):
os.path.join(context.sourcePath, 'loader'), os.path.join(context.sourcePath, 'loader'),
] ]
defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs] defines = []
for other_sdk in self.sdk_manifests:
defines += ['SE_{}={}'.format(other_sdk['define'], other_sdk['code'])]
compiler.defines += defines compiler.defines += defines
paths = [['public'], compiler.defines += ['SOURCE_ENGINE=' + sdk['code']]
['public', 'engine'],
['public', 'mathlib'],
['public', 'vstdlib'],
['public', 'tier0'], ['public', 'tier1']]
if sdk.name == 'episode1' or sdk.name == 'darkm':
paths.append(['public', 'dlls'])
paths.append(['game_shared'])
else:
paths.append(['public', 'game', 'server'])
paths.append(['game', 'shared'])
paths.append(['common'])
compiler.defines += ['SOURCE_ENGINE=' + sdk.code] if sdk['name'] in ['sdk2013', 'bms', 'pvkii'] and compiler.like('gcc'):
if sdk.name in ['sdk2013', 'bms', 'pvkii'] and compiler.like('gcc'):
# The 2013 SDK already has these in public/tier0/basetypes.h # The 2013 SDK already has these in public/tier0/basetypes.h
compiler.defines.remove('stricmp=strcasecmp') compiler.defines.remove('stricmp=strcasecmp')
compiler.defines.remove('_stricmp=strcasecmp') compiler.defines.remove('_stricmp=strcasecmp')
@ -395,18 +326,14 @@ class MMSConfig(object):
if compiler.target.arch == 'x86_64': if compiler.target.arch == 'x86_64':
compiler.defines += ['X64BITS', 'PLATFORM_64BITS'] compiler.defines += ['X64BITS', 'PLATFORM_64BITS']
if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'pvkii']: SdkHelpers.addLists(sdk, 'defines', compiler)
if compiler.target.platform in ['linux', 'mac']: SdkHelpers.addLists(sdk, 'linkflags', compiler)
compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
if sdk.name in ['csgo', 'blade', 'pvkii'] and compiler.target.platform == 'linux': if sdk['name'] in ['dota', 'cs2']:
compiler.linkflags += ['-lstdc++']
if sdk.name in ['dota', 'cs2']:
compiler.defines += ['META_IS_SOURCE2'] compiler.defines += ['META_IS_SOURCE2']
for path in paths: for path in sdk['include_paths']:
compiler.cxxincludes += [os.path.join(sdk.path, *path)] compiler.cxxincludes += [os.path.join(sdk['path'], path)]
return compiler return compiler
@ -453,77 +380,22 @@ class MMSConfig(object):
def HL2Library(self, context, compiler, name, sdk): def HL2Library(self, context, compiler, name, sdk):
compiler = self.HL2Compiler(context, compiler, sdk) compiler = self.HL2Compiler(context, compiler, sdk)
if compiler.target.platform == 'linux': lib_folder = sdk[compiler.target.platform][compiler.target.arch]['lib_folder']
if sdk.name == 'episode1': lib_folder = os.path.join(sdk['path'], lib_folder)
lib_folder = os.path.join(sdk.path, 'linux_sdk') for lib in SdkHelpers.getLists(sdk, 'libs', compiler):
elif sdk.name in ['sdk2013', 'bms', 'pvkii']: compiler.linkflags += [os.path.join(sdk['path'], lib_folder, lib)]
lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32') for lib in SdkHelpers.getLists(sdk, 'postlink_libs', compiler):
elif compiler.target.arch == 'x86_64': compiler.postlink += [os.path.join(sdk['path'], lib_folder, lib)]
lib_folder = os.path.join(sdk.path, 'lib', 'linux64')
else:
lib_folder = os.path.join(sdk.path, 'lib', 'linux')
elif compiler.target.platform == 'mac':
if sdk.name in ['sdk2013', 'bms']:
lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
elif compiler.target.arch == 'x86_64':
lib_folder = os.path.join(sdk.path, 'lib', 'osx64')
else:
lib_folder = os.path.join(sdk.path, 'lib', 'mac')
if compiler.target.platform in ['linux', 'mac']:
if sdk.name in ['sdk2013', 'bms', 'pvkii'] or compiler.target.arch == 'x86_64':
tier1 = os.path.join(lib_folder, 'tier1.a')
else:
tier1 = os.path.join(lib_folder, 'tier1_i486.a')
if sdk.name == 'mock' and compiler.target.platform == 'linux':
compiler.linkflags += ['-Wl,-z,origin']
compiler.postlink += [tier1]
if sdk.name in ['blade', 'insurgency', 'doi', 'csgo', 'cs2', 'dota']:
if compiler.target.arch == 'x86_64':
compiler.postlink += [os.path.join(lib_folder, 'interfaces.a')]
else:
compiler.postlink += [os.path.join(lib_folder, 'interfaces_i486.a')]
if sdk.name == 'bms':
compiler.postlink += [os.path.join(lib_folder, 'mathlib.a')]
binary = self.Library(compiler, name) binary = self.Library(compiler, name)
compiler = binary.compiler compiler = binary.compiler
dynamic_libs = []
if compiler.target.platform == 'linux': if compiler.target.platform == 'linux':
compiler.linkflags[0:0] = ['-lm'] compiler.linkflags[0:0] = ['-lm']
if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']:
dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
elif compiler.target.arch == 'x86_64' and sdk.name in ['csgo', 'mock']:
dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so']
elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo', 'cs2', 'dota', 'pvkii', 'mcv']:
dynamic_libs = ['libtier0.so']
if sdk.name not in ['dota', 'cs2']:
dynamic_libs += ['libvstdlib.so']
else:
dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
if sdk.name in ['csgo', 'blade']:
compiler.defines += ['_GLIBCXX_USE_CXX11_ABI=0']
elif compiler.target.platform == 'mac': elif compiler.target.platform == 'mac':
binary.compiler.linkflags.append('-liconv') binary.compiler.linkflags.append('-liconv')
dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
elif compiler.target.platform == 'windows':
libs = ['tier0', 'tier1']
if sdk.name not in ['dota', 'cs2']:
libs += ['vstdlib']
if sdk.name in ['swarm', 'blade', 'insurgency', 'doi', 'mcv', 'csgo', 'cs2', 'dota']:
libs.append('interfaces')
if sdk.name == 'bms':
libs.append('mathlib')
for lib in libs:
if compiler.target.arch == 'x86':
lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
elif compiler.target.arch == 'x86_64':
lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib'
binary.compiler.linkflags.append(lib_path)
dynamic_libs = SdkHelpers.getLists(sdk, 'dynamic_libs', compiler)
for library in dynamic_libs: for library in dynamic_libs:
source_path = os.path.join(lib_folder, library) source_path = os.path.join(lib_folder, library)
output_path = os.path.join(binary.localFolder, library) output_path = os.path.join(binary.localFolder, library)

68
core/AMBuilder
View File

@ -1,45 +1,39 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
import os import os
for sdk_name in MMS.sdks: for sdk, cxx in MMS.sdk_targets:
for cxx in MMS.all_targets: name = 'metamod.' + sdk['extension']
sdk = MMS.sdks[sdk_name] binary = MMS.HL2Library(builder, cxx, name, sdk)
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]: binary.sources += [
continue 'metamod.cpp',
'metamod_console.cpp',
name = 'metamod.' + sdk.ext 'metamod_oslink.cpp',
binary = MMS.HL2Library(builder, cxx, name, sdk) 'metamod_plugins.cpp',
'metamod_util.cpp',
'provider/provider_base.cpp',
'sourcehook/sourcehook.cpp',
'sourcehook/sourcehook_impl_chookidman.cpp',
'sourcehook/sourcehook_impl_chookmaninfo.cpp',
'sourcehook/sourcehook_impl_cproto.cpp',
'sourcehook/sourcehook_impl_cvfnptr.cpp',
'gamedll_bridge.cpp'
]
if sdk.get('source2', False):
binary.sources += [ binary.sources += [
'metamod.cpp', 'provider/source2/provider_source2.cpp',
'metamod_console.cpp', os.path.join(sdk['path'], 'tier1', 'convar.cpp'),
'metamod_oslink.cpp', os.path.join(sdk['path'], 'public', 'tier0', 'memoverride.cpp')
'metamod_plugins.cpp',
'metamod_util.cpp',
'provider/provider_base.cpp',
'sourcehook/sourcehook.cpp',
'sourcehook/sourcehook_impl_chookidman.cpp',
'sourcehook/sourcehook_impl_chookmaninfo.cpp',
'sourcehook/sourcehook_impl_cproto.cpp',
'sourcehook/sourcehook_impl_cvfnptr.cpp',
'gamedll_bridge.cpp'
] ]
else:
binary.sources += [
'provider/source/provider_source.cpp',
'provider/source/provider_source_console.cpp',
'vsp_bridge.cpp'
]
if sdk_name in ['dota', 'cs2']: if cxx.target.arch == 'x86':
binary.sources += [ binary.sources += ['sourcehook/sourcehook_hookmangen.cpp']
'provider/source2/provider_source2.cpp', nodes = builder.Add(binary)
os.path.join(sdk.path, 'tier1', 'convar.cpp'), MMS.binaries += [nodes]
os.path.join(sdk.path, 'public', 'tier0', 'memoverride.cpp')
]
else:
binary.sources += [
'provider/source/provider_source.cpp',
'provider/source/provider_source_console.cpp',
'vsp_bridge.cpp'
]
if cxx.target.arch == 'x86':
binary.sources += ['sourcehook/sourcehook_hookmangen.cpp']
nodes = builder.Add(binary)
MMS.binaries += [nodes]

1
hl2sdk-manifests Submodule

@ -0,0 +1 @@
Subproject commit 4b11e3a40c2bd01aeaf85baab816c3c8fefede85

70
support/buildbot/PackageScript
View File

@ -4,33 +4,33 @@ import os
builder.SetBuildFolder('package') builder.SetBuildFolder('package')
def deduce_target_sdk(path): def deduce_target_sdk(path):
for sdk_name in MMS.sdks: for sdk_name in MMS.sdks:
sdk = MMS.sdks[sdk_name] sdk = MMS.sdks[sdk_name]
if ('metamod.' + sdk.ext) in path: if ('metamod.' + sdk['extension']) in path:
return sdk return sdk
return None return None
addons_folder = builder.AddFolder('addons') addons_folder = builder.AddFolder('addons')
metamod_folder = builder.AddFolder(os.path.join('addons', 'metamod')) metamod_folder = builder.AddFolder(os.path.join('addons', 'metamod'))
bin_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin')) bin_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin'))
for cxx in MMS.all_targets: for cxx in MMS.all_targets:
if cxx.target.arch == 'x86_64': if cxx.target.arch == 'x86_64':
if cxx.target.platform == 'windows': if cxx.target.platform == 'windows':
bin64_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin', 'win64')) bin64_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin', 'win64'))
bin64_s2_folder = bin64_folder bin64_s2_folder = bin64_folder
builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metamod_win64.vdf'), builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metamod_win64.vdf'),
os.path.join('addons', 'metamod_x64.vdf')) os.path.join('addons', 'metamod_x64.vdf'))
elif cxx.target.platform == 'linux': elif cxx.target.platform == 'linux':
bin64_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin', 'linux64')) bin64_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin', 'linux64'))
bin64_s2_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin', 'linuxsteamrt64')) bin64_s2_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin', 'linuxsteamrt64'))
builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metamod_linux64.vdf'), builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metamod_linux64.vdf'),
os.path.join('addons', 'metamod_x64.vdf')) os.path.join('addons', 'metamod_x64.vdf'))
elif cxx.target.platform == 'mac': elif cxx.target.platform == 'mac':
bin64_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin', 'osx64')) bin64_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin', 'osx64'))
bin64_s2_folder = bin64_folder bin64_s2_folder = bin64_folder
builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metamod_osx64.vdf'), builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metamod_osx64.vdf'),
os.path.join('addons', 'metamod_x64.vdf')) os.path.join('addons', 'metamod_x64.vdf'))
builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metamod.vdf'), addons_folder) builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metamod.vdf'), addons_folder)
builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metaplugins.ini'), metamod_folder) builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metaplugins.ini'), metamod_folder)
@ -38,23 +38,23 @@ builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'README.txt'), metam
pdb_list = [] pdb_list = []
for task in MMS.binaries: for task in MMS.binaries:
sdk = deduce_target_sdk(task.binary.path) sdk = deduce_target_sdk(task.binary.path)
if task.target.arch == 'x86_64': if task.target.arch == 'x86_64':
# libserver check is a hack to make sure that binary ends up in the correct folder # libserver check is a hack to make sure that binary ends up in the correct folder
# as s2 folders differ to s1 layout # as s2 folders differ to s1 layout
if 'libserver' in task.binary.path or (sdk is not None and sdk.name in ['dota', 'cs2']): if 'libserver' in task.binary.path or (sdk is not None and sdk.get('source2', False)):
builder.AddCopy(task.binary, bin64_s2_folder) builder.AddCopy(task.binary, bin64_s2_folder)
else: else:
builder.AddCopy(task.binary, bin64_folder) builder.AddCopy(task.binary, bin64_folder)
else: else:
builder.AddCopy(task.binary, bin_folder) builder.AddCopy(task.binary, bin_folder)
if task.debug: if task.debug:
pdb_list.append(task.debug) pdb_list.append(task.debug)
# Generate PDB info. # Generate PDB info.
with open(os.path.join(builder.buildPath, 'pdblog.txt'), 'wt') as fp: with open(os.path.join(builder.buildPath, 'pdblog.txt'), 'wt') as fp:
for line in pdb_list: for line in pdb_list:
fp.write(line.path + '\n') fp.write(line.path + '\n')

12
support/checkout-deps.sh
View File

@ -59,15 +59,11 @@ checkout ()
if [ -z ${sdks+x} ]; then if [ -z ${sdks+x} ]; then
sdks=( csgo hl2dm nucleardawn l4d2 dods l4d css tf2 insurgency sdk2013 dota doi ) sdks=( csgo hl2dm nucleardawn l4d2 dods l4d css tf2 insurgency sdk2013 dota doi )
if [ $ismac -eq 0 ]; then # Windows/Linux only.
# Add these SDKs for Windows or Linux sdks+=( orangebox blade episode1 bms pvkii mcv )
sdks+=( orangebox blade episode1 bms pvkii )
# Add more SDKs for Windows only # Windows only.
if [ $iswin -eq 1 ]; then sdks+=( darkm swarm bgt eye contagion )
sdks+=( darkm swarm bgt eye contagion )
fi
fi
fi fi
# Check out a local copy as a proxy. # Check out a local copy as a proxy.