From a0eec8b85d6f2e96f9b31131f03707fba65faec6 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 31 Jan 2025 10:25:02 +0300 Subject: [PATCH] scripts: waifulib: add special_install_path for platform-specific executable formats that create post link stage (was nro_install_path) --- engine/wscript | 2 +- scripts/waifulib/nswitch.py | 2 +- scripts/waifulib/psvita.py | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/engine/wscript b/engine/wscript index 65a11e41..732de0a6 100644 --- a/engine/wscript +++ b/engine/wscript @@ -212,7 +212,7 @@ def build(bld): use = libs, defines = defines, install_path = install_path, - nro_install_path = bld.env.BINDIR, + special_install_path = bld.env.BINDIR, nacp = 'platform/nswitch/xash3d-fwgs.nacp', icon = 'platform/nswitch/icon.jpg', sce_sys = 'platform/psvita/sce_sys', diff --git a/scripts/waifulib/nswitch.py b/scripts/waifulib/nswitch.py index c5eee3da..d70fa0b1 100644 --- a/scripts/waifulib/nswitch.py +++ b/scripts/waifulib/nswitch.py @@ -58,7 +58,7 @@ def apply_nro(self): tsk = self.nro_task = self.create_task('elf2nro', nodes) self.nro_task.set_outputs(nodes[0].change_ext('.nro')) - inst_to = getattr(self, 'nro_install_path', None) + inst_to = getattr(self, 'special_install_path', None) if inst_to: self.add_install_files(install_to=inst_to, install_from=tsk.outputs[:], chmod=Utils.O755, task=tsk) diff --git a/scripts/waifulib/psvita.py b/scripts/waifulib/psvita.py index 1ffee115..48894d6f 100644 --- a/scripts/waifulib/psvita.py +++ b/scripts/waifulib/psvita.py @@ -113,5 +113,10 @@ def apply_vpk(self): self.env.SCESYS = [str(scesysdir)] self.env.VPKFILE = str(vpkfile) - self.vpk_task = self.create_task('mkvpk', in_nodes) + tsk = self.vpk_task = self.create_task('mkvpk', in_nodes) self.vpk_task.set_outputs(out_nodes) + + inst_to = getattr(self, 'special_install_path', None) + if inst_to: + self.add_install_files(install_to=inst_to, + install_from=tsk.outputs[:], chmod=Utils.O755, task=tsk)