Skip to content

remove INNO setup code #1386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Sep 8, 2024
Merged

remove INNO setup code #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 1 addition & 41 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
#
# Copyright © 2012 Pierre Raybaut
# Copyright © 2014-2024+ The Winpython development team https://github.com/winpython/
# Licensed under the terms of the MIT License
# (see winpython/__init__.py for details)

Expand Down Expand Up @@ -60,23 +61,6 @@ def get_nsis_exe():
raise RuntimeError("NSIS is not installed on this computer.")


def get_iscc_exe():
"""Return ISCC executable"""
localdir = str(Path(sys.prefix).parent.parent)
for drive in get_drives():
for dirname in (
r"C:\Program Files",
r"C:\Program Files (x86)",
str(Path(localdir) / "Inno Setup 5"),
):
for subdirname in (".", "App"):
exe = str(Path(dirname) / subdirname / "Inno Setup 5" / "iscc.exe")
if Path(exe).is_file():
return exe
else:
raise RuntimeError("Inno Setup 5 is not installed on this computer.")


def get_7zip_exe():
"""Return 7zip executable"""
localdir = str(Path(sys.prefix).parent.parent)
Expand Down Expand Up @@ -204,30 +188,6 @@ def build_shimmy_launcher(launcher_name, command, icon_path, mkshim_program='mks
subprocess.run(mkshim_command, shell=True)


def build_iss(srcname, dstname, data):
"""Build Inno Setup Script"""
ISCC_EXE = get_iscc_exe() # Inno Setup Compiler (iscc.exe)
portable_dir = str(Path(__file__).resolve().parent / "portable")
shutil.copy(str(Path(portable_dir) / srcname), dstname)
data = [("PORTABLE_DIR", portable_dir)] + list(data)
replace_in_iss_file(dstname, data)
try:
retcode = subprocess.call(
f'"{ISCC_EXE}" "{dstname}"',
shell=True,
stdout=sys.stderr,
)
if retcode < 0:
print(
"Child was terminated by signal",
-retcode,
file=sys.stderr,
)
except OSError as e:
print("Execution failed:", e, file=sys.stderr)
# os.remove(dstname)


def build_7zip(srcname, dstname, data):
"""7-Zip Setup Script"""
SEVENZIP_EXE = get_7zip_exe()
Expand Down
112 changes: 0 additions & 112 deletions portable/installer_INNO.iss
View file
Open in desktop

This file was deleted.