blog2i2j
diff --git a/‎make.py‎
Lines changed: 12 additions & 10 deletions b/‎make.py‎
Lines changed: 12 additions & 10 deletions
diff --git a/‎mkshim.py‎
Lines changed: 0 additions & 40 deletions b/‎mkshim.py‎
Lines changed: 0 additions & 40 deletions
diff --git a/‎mkshim240.py‎
Lines changed: 0 additions & 48 deletions b/‎mkshim240.py‎
Lines changed: 0 additions & 48 deletions
diff --git a/‎mkshim400.py‎
Lines changed: 28 additions & 8 deletions b/‎mkshim400.py‎
Lines changed: 28 additions & 8 deletions
diff --git a/‎mkshim400s.py‎
Lines changed: 0 additions & 64 deletions b/‎mkshim400s.py‎
Lines changed: 0 additions & 64 deletions
diff --git a/‎winpython/__init__.py‎
Lines changed: 1 addition & 1 deletion b/‎winpython/__init__.py‎
Lines changed: 1 addition & 1 deletion
@@ -252,15 +252,17 @@ def updateExecutableIcon(executablePath, iconPath):
     win32api.EndUpdateResource(handle, False)
 
 
-def build_shimmy_launcher(launcher_name, command, icon_path, mkshim_program='mkshim400.py'):
-    """Build .exe launcher with mkshim400.py and pywin32"""
+def build_shimmy_launcher(launcher_name, command, icon_path, mkshim_program='mkshim400.py', workdir=''):
+    """Build .exe launcher with mkshim_program and pywin32"""
 
     # define where is mkshim
     mkshim_program = str(Path(__file__).resolve().parent / mkshim_program)
     python_program = utils.get_python_executable()
 
     # Create the executable using mkshim.py or mkshim240.py
     mkshim_command = f'{python_program} "{mkshim_program}" -f "{launcher_name}" -c "{command}"'
+    if workdir !='': # V03 of shim: we can handle an optional sub-directory
+        mkshim_command += f' --subdir "{workdir}"'
     print(f"Building .exe launcher with {mkshim_program}:", mkshim_command)
     subprocess.run(mkshim_command, shell=True)
 
@@ -590,7 +592,7 @@ def create_launcher_shimmy(
         icon,
         command=None,
         args=None,
-        workdir=r"",  # not used, use $env:WINPYDIRICONS variable in command line
+        workdir=r"",  # ".\script" to go to sub-directory of the icon
         mkshim_program="mkshim400.py", # to force another one
     ):
         """Create an exe launcher with mkshim.py"""
@@ -608,7 +610,7 @@ def create_launcher_shimmy(
                 command = "${WINPYDIR}\python.exe"  #not used
         iconlauncherfullname= str(Path(self.winpydir) / name)
         true_command = command.replace(r"$SYSDIR\cmd.exe","cmd.exe")+ " " + args
-        build_shimmy_launcher(iconlauncherfullname, true_command, icon_fname, mkshim_program=mkshim_program)
+        build_shimmy_launcher(iconlauncherfullname, true_command, icon_fname, mkshim_program=mkshim_program, workdir=workdir)
 
     def create_launcher(
         self,
@@ -823,7 +825,7 @@ def _create_launchers(self):
             "cmd.ico",
             command=".\\cmd.bat",
             args=r"",
-            mkshim_program="mkshim400s.py",
+            workdir=r".\scripts"
         )
 
         self.create_launcher_shimmy(
@@ -847,7 +849,7 @@ def _create_launchers(self):
             "python.ico",
             command=".\\winpython.bat",
             args=r"",
-            mkshim_program="mkshim400s.py",
+            workdir=r".\scripts"
         )
 
         self.create_launcher_shimmy(
@@ -879,7 +881,7 @@ def _create_launchers(self):
             "winpython.ico",
             command=".\\wpcp.bat",
             args=r"",
-            mkshim_program="mkshim400s.py",
+            workdir=r".\scripts"
         )
 
         # Jupyter launchers
@@ -890,7 +892,7 @@ def _create_launchers(self):
             "jupyter.ico",
             command="winipython_notebook.bat",
             args=r"",
-            mkshim_program="mkshim400s.py",
+            workdir=r".\scripts"
         )
 
         self.create_launcher_shimmy(
@@ -900,15 +902,15 @@ def _create_launchers(self):
             #args=r"/k winjupyter_lab.bat",
             command="winjupyter_lab.bat",
             args=r"",
-            mkshim_program="mkshim400s.py",
+            workdir=r".\scripts"
         )
 
         self.create_launcher_shimmy(
             "VS Code.exe",
             "code.ico",
             command="winvscode.bat",
             args=r"",
-            mkshim_program="mkshim400s.py",
+            workdir=r".\scripts"
         )
 
         self._print_done()
 
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '10.3.20240901'
+__version__ = '10.4.20240904'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'