rollbash duplacte of installer.nsi

Scille · Oct 2, 2023 · 980391d · 980391d
1 parent 7e5e095
commit 980391d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 401 deletions.
diff --git a/client/poetry.lock b/client/poetry.lock
diff --git a/packaging/windows/freeze_program.py b/packaging/windows/freeze_program.py
@@ -116,12 +116,12 @@ def main(program_source: Path, conformity: bool = False):
     # Path must be provided relative, otherwise we cannot generate this on the CI and
     # run the `make_installer.py` on dev machine (required to have the installer&binary signed)
     (BUILD_DIR / "manifest.ini").write_text(
-        f'target = "{target_dir}"\n'
+        f'target = "{target_dir.relative_to(BUILD_DIR)}"\n'
         f'program_version = "{program_version}"\n'
         f'python_version = "{PYTHON_VERSION}"\n'
         f'platform = "{get_archslug()}"\n'
         f'winfsp_installer_name = "{winfsp_installer.name}"\n'
-        f'winfsp_installer_path = "{winfsp_installer}"\n'
+        f'winfsp_installer_path = "{winfsp_installer.relative_to(BUILD_DIR)}"\n'
     )
 
     # Create the install and uninstall file list for NSIS installer

diff --git a/.../windows/installer_without_conformity.nsi → packaging/windows/installer.nsi b/.../windows/installer_without_conformity.nsi → packaging/windows/installer.nsi