Skip to content

Commit b235b11

Browse files
committed
Repackage builds so both platforms are under bin/
1 parent 4d5bceb commit b235b11

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

PackageScript

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@ metamod_folder = builder.AddFolder(os.path.join('addons', 'metamod'))
77
bin_folder_path = os.path.join('addons', MMSPlugin.plugin_name, 'bin')
88
bin_folder = builder.AddFolder(bin_folder_path)
99

10-
for cxx in MMSPlugin.all_targets:
11-
if cxx.target.arch == 'x86_64':
12-
if cxx.target.platform == 'windows':
13-
bin64_folder_path = os.path.join('addons', MMSPlugin.plugin_name, 'bin', 'win64')
14-
bin64_folder = builder.AddFolder(bin64_folder_path)
15-
elif cxx.target.platform == 'linux':
16-
bin64_folder_path = os.path.join('addons', MMSPlugin.plugin_name, 'bin', 'linuxsteamrt64')
17-
bin64_folder = builder.AddFolder(bin64_folder_path)
18-
1910
pdb_list = []
2011
for task in MMSPlugin.binaries:
2112
# This hardly assumes there's only 1 targetted platform and would be overwritten
@@ -24,26 +15,20 @@ for task in MMSPlugin.binaries:
2415
fp.write('"Metamod Plugin"\n')
2516
fp.write('{\n')
2617
fp.write(f'\t"alias"\t"{MMSPlugin.plugin_alias}"\n')
27-
if task.target.arch == 'x86_64':
28-
fp.write(f'\t"file"\t"{os.path.join(bin64_folder_path, MMSPlugin.plugin_name)}"\n')
29-
else:
30-
fp.write(f'\t"file"\t"{os.path.join(bin_folder_path, MMSPlugin.plugin_name)}"\n')
18+
fp.write(f'\t"file"\t"{os.path.join(bin_folder_path, MMSPlugin.plugin_name)}"\n')
3119
fp.write('}\n')
3220

33-
if task.target.arch == 'x86_64':
34-
builder.AddCopy(task.binary, bin64_folder)
35-
else:
3621
builder.AddCopy(task.binary, bin_folder)
3722

3823
if task.debug:
3924
pdb_list.append(task.debug)
4025

4126
builder.AddCopy(os.path.join(builder.buildPath, MMSPlugin.plugin_name + '.vdf'), metamod_folder)
4227

43-
cfg_folder = builder.AddFolder(os.path.join('cfg', MMSPlugin.plugin_name))
44-
builder.AddCopy(os.path.join(builder.sourcePath, 'cfg', MMSPlugin.plugin_name, 'multiaddonmanager.cfg'), cfg_folder)
45-
4628
# Generate PDB info.
4729
with open(os.path.join(builder.buildPath, 'pdblog.txt'), 'wt') as fp:
4830
for line in pdb_list:
49-
fp.write(line.path + '\n')
31+
fp.write(line.path + '\n')
32+
33+
cfg_folder = builder.AddFolder(os.path.join('cfg', MMSPlugin.plugin_name))
34+
builder.AddCopy(os.path.join(builder.sourcePath, 'cfg', MMSPlugin.plugin_name, 'multiaddonmanager.cfg'), cfg_folder)

0 commit comments

Comments
 (0)