Skip to content

v10.7 = remove NSIS installer (still keep icons creation option) #1389

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

v10.7 = remove NSIS installer (still keep icons creation option) #1389

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
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Dependencies
Requirements
------------

* installer can be NSIS, 7-Zip, or nothing
* installer can be 7-Zip or nothing (just .zip-it)


Installation
Expand Down
25 changes: 1 addition & 24 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def get_7zip_exe():
if Path(exe).is_file():
return exe
else:
raise RuntimeError("NSIS is not installed on this computer.")
raise RuntimeError("7ZIP is not installed on this computer.")


def replace_in_nsis_file(fname, data):
Expand Down Expand Up @@ -564,27 +564,6 @@ def create_python_batch(
+ " %*",
)

def create_installer(self):
"""Create installer with NSIS"""
self._print("Creating WinPython installer")
portable_dir = str(Path(__file__).resolve().parent / "portable")
fname = str(Path(portable_dir) / "installer-tmp.nsi")
data = (
("DISTDIR", self.winpydir),
("ARCH", self.winpy_arch),
(
"VERSION",
f"{self.python_fullversion}.{self.build_number}{self.flavor}",
),
(
"VERSION_INSTALL",
f'{self.python_fullversion.replace(".", "")}' + f"{self.build_number}",
),
("RELEASELEVEL", self.release_level),
)
build_nsis("installer.nsi", fname, data)
self._print_done()


def create_installer_7zip(self, installer_option=""):
"""Create installer with 7-ZIP"""
Expand Down Expand Up @@ -1899,8 +1878,6 @@ def make_all(
)
# ,find_links=osp.join(basedir, 'packages.srcreq'))
if str(create_installer).lower() != "false" and not simulation:
if "nsis" in str(create_installer).lower():
dist.create_installer() # NSIS installer (can't handle big build)
if "7zip" in str(create_installer).lower():
dist.create_installer_7zip(".exe") # 7-zip (no licence splash screen)
if ".7z" in str(create_installer).lower():
Expand Down
112 changes: 0 additions & 112 deletions portable/installer.nsi
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion winpython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
OTHER DEALINGS IN THE SOFTWARE.
"""

__version__ = '10.6.20240908'
__version__ = '10.7.20240908'
__license__ = __doc__
__project_url__ = 'http://winpython.github.io/'