Skip to content

Commit ad155a2

Browse files
committed
further remove shimmy technic
1 parent 7b77d5c commit ad155a2

File tree

2 files changed

+1
-44
lines changed

2 files changed

+1
-44
lines changed

make.py

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -112,23 +112,6 @@ def replace_in_7zip_file(fname, data):
112112
fd.close()
113113

114114

115-
def build_shimmy_launcher(launcher_name, command, icon_path, mkshim_program='mkshim400.py', workdir=''):
116-
"""Build .exe launcher with mkshim_program and pywin32"""
117-
118-
# define where is mkshim
119-
mkshim_program = str(Path(__file__).resolve().parent / mkshim_program)
120-
python_program = utils.get_python_executable()
121-
122-
# Create the executable using mkshim.py or mkshim240.py
123-
mkshim_command = f'{python_program} "{mkshim_program}" -f "{launcher_name}" -c "{command}"'
124-
if workdir !='': # V03 of shim: we can handle an optional sub-directory
125-
mkshim_command += f' --subdir "{workdir}"'
126-
# Embed the icon, if provided
127-
if Path(icon_path).is_file():
128-
mkshim_command += f' --i "{icon_path}"'
129-
print(f"Building .exe launcher with {mkshim_program}:", mkshim_command)
130-
subprocess.run(mkshim_command, shell=True)
131-
132115
def build_nsis(srcname, dstname, data):
133116
"""Build NSIS script"""
134117
NSIS_EXE = get_nsis_exe() # NSIS Compiler
@@ -417,32 +400,6 @@ def create_batch_script(self, name, contents, do_changes=None):
417400
fd.write(contents_final)
418401
fd.close()
419402

420-
def create_launcher_shimmy(
421-
self,
422-
name,
423-
icon,
424-
command=None,
425-
args=None,
426-
workdir=r"", # ".\script" to go to sub-directory of the icon
427-
mkshim_program="mkshim400.py", # to force another one
428-
):
429-
"""Create an exe launcher with mkshim.py"""
430-
assert name.endswith(".exe")
431-
portable_dir = str(Path(__file__).resolve().parent / "portable")
432-
icon_fname = str(Path(portable_dir) / "icons" / icon)
433-
assert Path(icon_fname).is_file()
434-
435-
# prepare mkshim.py script
436-
# $env:WINPYDIRICONS variable give the icons directory
437-
if command is None:
438-
if args is not None and ".pyw" in args:
439-
command = "${WINPYDIR}\pythonw.exe" #not used
440-
else:
441-
command = "${WINPYDIR}\python.exe" #not used
442-
iconlauncherfullname= str(Path(self.winpydir) / name)
443-
true_command = command.replace(r"$SYSDIR\cmd.exe","cmd.exe")+ " " + args
444-
# build_shimmy_launcher(iconlauncherfullname, true_command, icon_fname, mkshim_program=mkshim_program, workdir=workdir)
445-
446403
def create_launcher(
447404
self,
448405
name,

winpython/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
OTHER DEALINGS IN THE SOFTWARE.
2929
"""
3030

31-
__version__ = '11.2.20241228'
31+
__version__ = '11.3.20250104'
3232
__license__ = __doc__
3333
__project_url__ = 'http://winpython.github.io/'

0 commit comments

Comments
 (0)