UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix spcomp64 filename for Windows #1368

Browse Source
This commit is contained in:
Erik Minekus 2020-10-19 19:02:20 +02:00 committed by GitHub
parent 6a4364d404
commit 90b68f095f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/buildbot/PackageScript
View File

@ -42,7 +42,7 @@ if 'x86_64' in SM.target_archs:
folder_list.extend([ folder_list.extend([
'addons/sourcemod/bin/x64', 'addons/sourcemod/bin/x64',
'addons/sourcemod/extensions/x64', 'addons/sourcemod/extensions/x64',
]) ])
# Create the distribution folder hierarchy. # Create the distribution folder hierarchy.
folder_map = {} folder_map = {}
@ -69,7 +69,7 @@ for cxx_task in SM.spvm:
builder.AddCopy(cxx_task.binary, dest_path) builder.AddCopy(cxx_task.binary, dest_path)
elif cxx_task.target.arch == 'x86_64': elif cxx_task.target.arch == 'x86_64':
builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/bin/x64']) builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/bin/x64'])
def lipo(binaries, outFolder): def lipo(binaries, outFolder):
bins = [] bins = []
binPaths = [] binPaths = []
@ -82,7 +82,7 @@ def lipo(binaries, outFolder):
builder.AddCommand( builder.AddCommand(
argv = argv + binPaths + ['-output', outputPath], argv = argv + binPaths + ['-output', outputPath],
inputs = bins, inputs = bins,
outputs = [os.path.join(outFolder, binary)], outputs = [os.path.join(outFolder, binary)],
) )
if builder.host.platform == 'mac' and len(SM.target_archs) > 1: if builder.host.platform == 'mac' and len(SM.target_archs) > 1:
@ -90,7 +90,8 @@ if builder.host.platform == 'mac' and len(SM.target_archs) > 1:
else: else:
for bin_task in SM.spcomp_bins: for bin_task in SM.spcomp_bins:
if bin_task.target.arch == 'x86_64': if bin_task.target.arch == 'x86_64':
file = os.path.basename(bin_task.binary.path) + '64' root, ext = os.path.splitext(os.path.basename(bin_task.binary.path))
file = root + '64' + ext
builder.AddCopy(bin_task.binary, os.path.normpath('addons/sourcemod/scripting/' + file)) builder.AddCopy(bin_task.binary, os.path.normpath('addons/sourcemod/scripting/' + file))
else: else:
builder.AddCopy(bin_task.binary, folder_map['addons/sourcemod/scripting']) builder.AddCopy(bin_task.binary, folder_map['addons/sourcemod/scripting'])
@ -204,9 +205,9 @@ CopyFiles('gamedata/sdkhooks.games', 'addons/sourcemod/gamedata/sdkhooks.games',
'game.hidden.txt', 'game.hidden.txt',
'game.hl2ctf.txt', 'game.hl2ctf.txt',
'game.insurgency.txt', 'game.insurgency.txt',
'game.kz.txt', 'game.kz.txt',
'game.l4d2.txt', 'game.l4d2.txt',
'game.modularcombat.txt', 'game.modularcombat.txt',
'game.neotokyo.txt', 'game.neotokyo.txt',
'game.nmrih.txt', 'game.nmrih.txt',
'game.nucleardawn.txt', 'game.nucleardawn.txt',
@ -259,9 +260,9 @@ CopyFiles('gamedata/sdktools.games', 'addons/sourcemod/gamedata/sdktools.games',
'game.hl2mp.txt', 'game.hl2mp.txt',
'game.insurgency.txt', 'game.insurgency.txt',
'game.ios.txt', 'game.ios.txt',
'game.kz.txt', 'game.kz.txt',
'game.left4dead2.txt', 'game.left4dead2.txt',
'game.modularcombat.txt', 'game.modularcombat.txt',
'game.neotokyo.txt', 'game.neotokyo.txt',
'game.nmrih.txt', 'game.nmrih.txt',
'game.nucleardawn.txt', 'game.nucleardawn.txt',