rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-20 13:54:14 +01:00
Code Issues Releases Activity

Fix Source2 linux packaging layout (#120)

Browse Source 
* Fix linux packaging layout
* Split binary layouts per sdk
This commit is contained in:
GAMMACASE 2023-09-29 05:42:30 +03:00 committed by GitHub
parent 0e8144585e
commit 62dd3dd4fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/AMBuilder
View File

@ -39,8 +39,7 @@ for sdk_name in MMS.sdks:
'vsp_bridge.cpp' 'vsp_bridge.cpp'
] ]
# Source2 hack. TODO: check this more deterministically, "are we doing an x64 build?" if cxx.target.arch == 'x86':
if binary.compiler.target.arch == 'x86':
binary.sources += ['sourcehook/sourcehook_hookmangen.cpp'] binary.sources += ['sourcehook/sourcehook_hookmangen.cpp']
nodes = builder.Add(binary) nodes = builder.Add(binary)
MMS.binaries += [nodes] MMS.binaries += [nodes]

7
loader/AMBuilder
View File

@ -20,9 +20,10 @@ def configure_library(cxx, name, linux_defines):
for cxx in MMS.all_targets: for cxx in MMS.all_targets:
if cxx.target.platform == 'linux': if cxx.target.platform == 'linux':
if cxx.target.arch == 'x64': if cxx.target.arch == 'x86_64':
configure_library(cxx, 'libserver', ['LIB_PREFIX="lib"', 'LIB_SUFFIX=".so"']) configure_library(cxx, 'libserver', ['LIB_PREFIX="lib"', 'LIB_SUFFIX=".so"'])
elif cxx.target.arch == 'x86': elif cxx.target.arch == 'x86':
configure_library(cxx, 'server_i486', ['LIB_PREFIX=""', 'LIB_SUFFIX="_i486.so"']) configure_library(cxx, 'server_i486', ['LIB_PREFIX=""', 'LIB_SUFFIX="_i486.so"'])
configure_library(cxx, 'server', ['LIB_PREFIX=""', 'LIB_SUFFIX=".so"'])
configure_library(cxx, 'server', ['LIB_PREFIX="lib"', 'LIB_SUFFIX=".so"']) else:
configure_library(cxx, 'server', [])

17
support/buildbot/PackageScript
View File

@ -3,6 +3,13 @@ import os
builder.SetBuildFolder('package') builder.SetBuildFolder('package')
def deduce_target_sdk(path):
for sdk_name in MMS.sdks:
sdk = MMS.sdks[sdk_name]
if ('metamod.' + sdk.ext) in path:
return sdk
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'))
@ -11,14 +18,17 @@ 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
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'))
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
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'))
@ -28,7 +38,14 @@ 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)
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
# as s2 folders differ to s1 layout
if 'libserver' in task.binary.path or (sdk is not None and sdk.name in ['dota', 'cs2']):
builder.AddCopy(task.binary, bin64_s2_folder)
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)