Simplified build process

Author: PierreRaybaut

.env

@@ -1,6 +1,4 @@
 CI_DST=DataLab-WinPython
 CI_VER=0.14.2
 CI_CYR=Copyright (C) 2023 DataLab Platform Developers
-CI_WNM=WPy64-39100
 CI_WPI=Winpython64-3.9.10.0dot.exe
-CI_SUF=Py39

.gitignore

@@ -78,3 +78,6 @@ docs/_build/
 target/
 
 /.spyproject
+
+# Temporary files
+tmp/

scripts/build_distribution.bat

@@ -12,9 +12,24 @@ cd %ROOTPATH%
 
 @REM Build WinPython distribution
 @REM ===========================================================================
-"C:\Program Files\7-Zip\7z.exe" x -y -o"." "%CI_WPI%"
-call "%CI_WNM%\scripts\env_for_icons.bat" %*
-cd %CI_WNM%
+
+@REM Extract WinPython distribution
+if not exist "%ROOTPATH%\dist" ( mkdir "%ROOTPATH%\dist" )
+if exist "%ROOTPATH%\dist\%CI_DST%" ( rmdir /s /q "%ROOTPATH%\dist\%CI_DST%" )
+
+@REM Rename extracted folder to %CI_DST%
+if not exist ".\tmp" ( mkdir ".\tmp" )
+"C:\Program Files\7-Zip\7z.exe" x -y -o".\tmp" "%CI_WPI%"
+for /D %%I in (.\tmp\*) do set WP_FOLDER=%%~nxI
+pushd ".\tmp"
+ren %WP_FOLDER% %CI_DST%
+popd
+move ".\tmp\%CI_DST%" "%ROOTPATH%\dist\"
+rmdir /S /Q ".\tmp"
+
+@REM Customize WinPython distribution
+call "%ROOTPATH%\dist\%CI_DST%\scripts\env_for_icons.bat" %*
+cd %ROOTPATH%\dist\%CI_DST%
 del IPython*.exe
 del Jupyter*.exe
 del Pyzo.exe
@@ -37,10 +52,10 @@ 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"
+  copy "executables\%%~nxf" "%ROOTPATH%\dist\%CI_DST%\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_OUTFILE=%ROOTPATH%\dist\%CI_DST%\%%~nf.exe
   set NSIS_PARAMS=Noshell.vbs %%~nxf
   "C:\Program Files (x86)\NSIS\makensis.exe" nsis\launcher.nsi
 )

scripts/build_installer.bat

@@ -5,16 +5,23 @@ REM ------------------------------------------
 REM Licensed under the terms of the BSD 3-Clause
 REM (see cdl/LICENSE for details)
 REM ======================================================
+setlocal enabledelayedexpansion
 call %~dp0utils GetScriptPath SCRIPTPATH
 call %FUNC% SetEnvVars
 set ROOTPATH=%SCRIPTPATH%\..\
 cd %ROOTPATH%
 
-ren %CI_WNM% %CI_DST%
+@REM CI_WPI=Winpython64-3.9.10.0dot.exe => PYSUFFIX=Py39
+for /f "tokens=2 delims=-" %%a in ("!CI_WPI!") do set VERSION_PART=%%a
+for /f "tokens=1-2 delims=." %%b in ("!VERSION_PART!") do (
+    set MAJOR=%%b
+    set MINOR=%%c
+)
+set PYSUFFIX=Py!MAJOR!!MINOR!
 
 @REM Build installer
 @REM ===========================================================================
-set NSIS_DIST_PATH=%ROOTPATH%%CI_DST%
+set NSIS_DIST_PATH=%ROOTPATH%\DIST\%CI_DST%
 set NSIS_PRODUCT_NAME=%CI_DST%
 set NSIS_PRODUCT_ID=%CI_DST%
 set NSIS_INSTALLDIR=C:\%CI_DST%
@@ -25,8 +32,10 @@ set NSIS_COPYRIGHT_INFO=%CI_CYR%
 
 @REM Create release directory
 @REM ===========================================================================
+if not exist "%ROOTPATH%\releases" ( mkdir "%ROOTPATH%\releases" )
+set RLSPTH=%ROOTPATH%\releases\%CI_DST%-%CI_VER%_release\
 if exist "%RLSPTH%" ( rmdir /s /q "%RLSPTH%" )
 mkdir %RLSPTH%
-move /Y %ROOTPATH%%CI_DST%-%CI_VER%.exe %RLSPTH%\%CI_DST%-%CI_VER%_%CI_SUF%.exe
+move /Y %ROOTPATH%\%CI_DST%-%CI_VER%.exe %RLSPTH%\%CI_DST%-%CI_VER%_%PYSUFFIX%.exe
 
 call %FUNC% EndOfScript

scripts/clean_up.bat

@@ -10,8 +10,8 @@ call %FUNC% SetEnvVars
 set ROOTPATH=%SCRIPTPATH%\..\
 cd %ROOTPATH%
 
-if exist "%CI_WNM%" ( rmdir /s /q "%CI_WNM%" )
-if exist "%CI_DST%" ( rmdir /s /q "%CI_DST%" )
+if exist "tmp" ( rmdir /s /q "tmp" )
+if exist "dist" ( rmdir /s /q "dist" )
 if exist "packages" ( rmdir /s /q "packages" )
 
 call %FUNC% EndOfScript

scripts/download.bat

@@ -7,10 +7,13 @@ cd %ROOTPATH%
 if exist "packages" ( rmdir /s /q "packages" )
 mkdir packages
 
-if not exist "%CI_WNM%" ( "C:\Program Files\7-Zip\7z.exe" x -y -o"." "%CI_WPI%" )
-
-call "%CI_WNM%\scripts\env_for_icons.bat" %*
+if not exist ".\tmp" ( mkdir ".\tmp" )
+"C:\Program Files\7-Zip\7z.exe" x -y -o".\tmp" "%CI_WPI%"
+for /D %%I in (.\tmp\*) do set WP_FOLDER=%%~nxI
+call ".\tmp\%WP_FOLDER%\scripts\env_for_icons.bat" %*
 
 %PYTHON% -m pip install --upgrade pip
 pip download cdl==%CI_VER% -d packages
-pip download -r requirements.txt -d packages
+pip download -r requirements.txt -d packages
+
+rmdir /S /Q ".\tmp"

scripts/utils.bat

@@ -31,7 +31,6 @@ REM ======================================================
     for /F "tokens=*" %%A in (.env) do (
         set %%A
     )
-    set RLSPTH=%~dp0..\%CI_DST%-%CI_VER%_release\
     goto:eof
 
 :UseWinPython