Added exe launcher for DataLab

Author: PierreRaybaut

.vscode/tasks.json

@@ -25,33 +25,6 @@
                 "clear": false
             }
         },
-        {
-            "label": "Distribute source",
-            "type": "shell",
-            "command": "cmd",
-            "args": [
-                "/c",
-                "dist.bat"
-            ],
-            "options": {
-                "cwd": "scripts",
-                "env": {
-                    "UNATTENDED": "1",
-                }
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "echo": true,
-                "reveal": "always",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": true,
-                "clear": false
-            }
-        },
         {
             "label": "Clean up",
             "type": "shell",
@@ -144,11 +117,15 @@
         },
         {
             "label": "Build all",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
             "dependsOrder": "sequence",
             "dependsOn": [
                 "Clean up",
                 "Create distribution",
-                "Create installer"
+                "Create installer",
             ]
         }
     ]

executables/DataLab.bat

@@ -1,4 +1,4 @@
 @echo off
-call "%~dp0scripts\env_for_icons.bat" %*
+call "%~dp0env_for_icons.bat" %*
 cd/D "%WINPYWORKDIR1%"
 "%WINPYDIR%\python.exe" -m cdl.app %*

nsis/installer.nsi

@@ -1,5 +1,8 @@
 /*
 
+DataLab-WinPython installer script
+----------------------------------
+
 Licensed under the terms of the BSD 3-Clause
 (see ../LICENSE for details)
 
@@ -56,7 +59,7 @@ RequestExecutionLevel user
 !define MUI_FINISHPAGE_LINK "$(explore_str)"
 !define MUI_FINISHPAGE_LINK_LOCATION "$INSTDIR"
 !define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_TEXT "$(wpcp_str)"
+!define MUI_FINISHPAGE_RUN_TEXT "$(datalab_str)"
 !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
 !insertmacro MUI_PAGE_FINISH
 !insertmacro MUI_UNPAGE_WELCOME
@@ -67,10 +70,12 @@ RequestExecutionLevel user
 !insertmacro MUI_LANGUAGE "French"
 LangString welcome_str ${LANG_ENGLISH} "This will install ${PRODNAME} on your computer.$\r$\n${PRODNAME} deploys itself as a simple folder unzipping to a custom target directory. Installing this software has thus limited effect on the operating system and will not compromise any existing Python installation.$\r$\n$\r$\nPlease click on Next to continue."
 LangString welcome_str ${LANG_FRENCH} "Vous êtes sur le point d'installer ${PRODNAME} sur votre ordinateur.$\r$\n${PRODNAME} s'installe par une simple copie de fichiers dans un répertoire de destination paramétrable. L'installation n'est pas invasive et peut cohabiter (sans effet de bord) avec n'importe quelle autre distribution Python déjà installée sur cet ordinateur.$\r$\n$\r$\nCliquez sur Suivant pour continuer."
-LangString explore_str ${LANG_ENGLISH} "Browse target directory"
+LangString explore_str ${LANG_ENGLISH} "Browse installation directory"
 LangString explore_str ${LANG_FRENCH} "Explorer le dossier d'installation"
-LangString wpcp_str ${LANG_ENGLISH} "Open WinPython control panel"
-LangString wpcp_str ${LANG_FRENCH} "Démarrer le panneau de contrôle WinPython"
+LangString uninstall_str ${LANG_ENGLISH} "Uninstall ${PRODNAME}"
+LangString uninstall_str ${LANG_FRENCH} "Désinstaller ${PRODNAME}"
+LangString datalab_str ${LANG_ENGLISH} "Run DataLab"
+LangString datalab_str ${LANG_FRENCH} "Lancer DataLab"
 LangString busy_str ${LANG_ENGLISH} "Installer is already running"
 LangString busy_str ${LANG_FRENCH} "L'installeur est déjà en cours d'ex�cution"
 LangString uninst_str ${LANG_ENGLISH} "Permanantly remove ${PRODNAME}?"
@@ -110,8 +115,8 @@ Section "" SecWinPython
 	${locate::Close} $0
 	${locate::Unload}
 
-    createShortCut "$SMPROGRAMS\${PRODNAME}\Dossier d'installation.lnk" "$INSTDIR\"
-    ; createShortCut "$SMPROGRAMS\${PRODNAME}\Désinstaller.lnk" "$INSTDIR\uninstaller.exe"
+    createShortCut "$SMPROGRAMS\${PRODNAME}\$(explore_str).lnk" "$INSTDIR\"
+    createShortCut "$SMPROGRAMS\${PRODNAME}\$(uninstall_str).lnk" "$INSTDIR\uninstaller.exe"
     WriteRegStr HKCU "${UINSTREG}" "DisplayName" "${PRODNAME}"
     WriteRegStr HKCU "${UINSTREG}" "DisplayVersion" "${VERSIONPROD}"
     WriteRegStr HKCU "${UINSTREG}" "Publisher" "${PUBLISHER}"
@@ -150,7 +155,7 @@ Function .onInit
     ${EndIf}
 FunctionEnd
 Function LaunchLink
-  ExecShell "" "$INSTDIR\WinPython Control Panel.exe"
+  ExecShell "" "$INSTDIR\DataLab.exe"
 FunctionEnd
 
 ; Descriptions

nsis/launcher.nsi

@@ -0,0 +1,45 @@
+/*
+
+DataLab-WinPython launcher script
+---------------------------------
+
+Licensed under the terms of the BSD 3-Clause
+(see ../LICENSE for details)
+
+*/
+
+; !addincludedir "%NSIS_INCLUDEDIR%"
+!define COMMAND "$%NSIS_COMMAND%"
+!define PARAMETERS "$%NSIS_PARAMS%"
+!define WORKDIR "$%NSIS_WORKDIR%"
+!define FILENAME "$%NSIS_OUTFILE%"
+Icon "$%NSIS_ICON%"
+OutFile $%NSIS_OUTFILE%
+
+!include "WordFunc.nsh"
+!include "FileFunc.nsh"
+
+Unicode true
+SilentInstall silent
+AutoCloseWindow true
+ShowInstDetails nevershow
+RequestExecutionLevel user
+
+Section ""
+Call Execute
+SectionEnd
+
+Function Execute
+StrCmp ${WORKDIR} "" 0 workdir
+System::Call "kernel32::GetCurrentDirectory(i ${NSIS_MAX_STRLEN}, t .r0)"
+SetOutPath $0
+Goto end_workdir
+workdir:
+SetOutPath "${WORKDIR}"
+end_workdir:
+${GetParameters} $R1
+StrCmp "${PARAMETERS}" "" end_param 0
+StrCpy $R1 "${PARAMETERS} $R1"
+end_param:
+Exec '"${COMMAND}" $R1'
+FunctionEnd

scripts/build_distribution.bat

@@ -20,10 +20,27 @@ del Pyzo.exe
 del Qt*.exe
 del Spyder*.exe
 del VS*.exe
+del IDLE*.exe
 del "WinPython Powershell Prompt.exe"
 rmdir /S /Q notebooks
 rmdir /S /Q t
 cd %ROOTPATH%
+@REM Install packages
 pip install --no-cache-dir --no-index --find-links=packages -r requirements.txt
 
+@REM Create additional launchers
+@REM ===========================================================================
+@REM Iterate over all .bat files in "executables" folder:
+set NSIS_WORKDIR=$EXEDIR\scripts
+set NSIS_COMMAND=wscript.exe
+for %%f in (executables\*.bat) do (
+  @REM Copy each .bat file to the "scripts" folder:
+  copy "executables\%%~nxf" "%ROOTPATH%\%CI_WNM%\scripts"
+  @REM Set NSIS_ICON, NSIS_OUTFILE and NSIS_PARAMS for each .bat file:
+  set NSIS_ICON=%ROOTPATH%\executables\%%~nf.ico
+  set NSIS_OUTFILE=%ROOTPATH%\%CI_WNM%\%%~nf.exe
+  set NSIS_PARAMS=Noshell.vbs %%~nxf
+  "C:\Program Files (x86)\NSIS\makensis.exe" nsis\launcher.nsi
+)
+
 call %FUNC% EndOfScript

scripts/build_installer.bat

@@ -13,8 +13,6 @@ ren %CI_WNM% %CI_DST%
 
 @REM Build installer
 @REM ===========================================================================
-copy "executables\*.ico" "%CI_DST%\scripts"
-copy "executables\*.bat" "%CI_DST%"
 set NSIS_DIST_PATH=%ROOTPATH%%CI_DST%
 set NSIS_PRODUCT_NAME=%CI_DST%
 set NSIS_PRODUCT_ID=%CI_DST%