Update pkg_win and pkg_win_release jobs to make the python version used...

Update pkg_win and pkg_win_release jobs to make the python version used consistent to their pkg_win_purepy ci job counterparts (WIN_PY_VER).

It fixes the win nsis .exe installer.

.gitlab-ci.yml

@@ -156,8 +156,15 @@ pkg_win:
         - cd build
           #- 'cmake -G "MinGW Makefiles" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=ON -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%SHA_START% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DEXPERIMENTAL_PKG=ON -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod ..'
           #- make
-        - 'cmake -G "Visual Studio 16 2019" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=ON -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%SHA_START% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DMATIO_LIB_FILE=C:/faust_libs/libmatio_standalone.lib -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DEXPERIMENTAL_PKG=ON -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod -DPYTHON_ENCODING=windows-1252 -DBUILD_MULTITHREAD=ON -DBUILD_FLOAT_PYX=ON -DCMAKE_BUILD_TYPE=%BUILD_CONFIG% -DVCOMPLIB_PATH=C:\faust_libs\vcomp140.dll ..'
+          # build first only matfaust
+        - 'cmake -G "Visual Studio 16 2019" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=OFF -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%SHA_START% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DMATIO_LIB_FILE=C:/faust_libs/libmatio_standalone.lib -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DEXPERIMENTAL_PKG=ON -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod -DPYTHON_ENCODING=windows-1252 -DBUILD_MULTITHREAD=ON -DBUILD_FLOAT_PYX=ON -DCMAKE_BUILD_TYPE=%BUILD_CONFIG% -DVCOMPLIB_PATH=C:\faust_libs\vcomp140.dll ..'
         - cmake --build . --config %BUILD_CONFIG%
+          # now build pyfaust too
+          # specifying a consistent python version with pkg_win_purepy_rev
+        - cmake -DBUILD_WRAPPER_PYTHON=ON ..
+        - cd wrapper\python
+        - py -%WIN_PY_VER% setup.py build_ext --inplace # normally it costs no time of building because pkg_win_purepy_rev already compiled the .pyd lib
+        - cd ..\..
         - makensis faust.nsi
     artifacts:
         paths:
@@ -165,7 +172,6 @@ pkg_win:
         expire_in: '1 week'
     tags:
         - win10
-          #- win7
     except:
         - schedules
         - tags
@@ -285,15 +291,21 @@ pkg_macos_release:
         - cd build
           #- 'cmake -G "MinGW Makefiles" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=ON -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%CI_COMMIT_TAG% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod ..'
           # - make
-        - 'cmake -G "Visual Studio 16 2019" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=ON -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%CI_COMMIT_TAG% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DUSE_MATIO_STATIC_LIBS=ON -DMATIO_LIB_FILE=C:/faust_libs/libmatio_standalone.lib -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DEXPERIMENTAL_PKG=OFF -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod -DPYTHON_ENCODING=windows-1252 -DBUILD_MULTITHREAD=ON -DBUILD_FLOAT_PYX=ON -DBUILD_FLOAT_MEX=ON -DCMAKE_BUILD_TYPE=%BUILD_CONFIG% -DVCOMPLIB_PATH=C:\faust_libs\vcomp140.dll ..'
+          # build first only matfaust
+        - 'cmake -G "Visual Studio 16 2019" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=OFF -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%CI_COMMIT_TAG% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DUSE_MATIO_STATIC_LIBS=ON -DMATIO_LIB_FILE=C:/faust_libs/libmatio_standalone.lib -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DEXPERIMENTAL_PKG=OFF -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod -DPYTHON_ENCODING=windows-1252 -DBUILD_MULTITHREAD=ON -DBUILD_FLOAT_PYX=ON -DBUILD_FLOAT_MEX=ON -DCMAKE_BUILD_TYPE=%BUILD_CONFIG% -DVCOMPLIB_PATH=C:\faust_libs\vcomp140.dll ..'
         - cmake --build . --config Release
+          # now build pyfaust too
+          # specifying a consistent python version with pkg_win_purepy_rev
+        - cmake -DBUILD_WRAPPER_PYTHON=ON ..
+        - cd wrapper\python
+        - py -%WIN_PY_VER% setup.py build_ext --inplace # normally it costs no time of building because pkg_win_purepy_release already compiled the .pyd lib
+        - cd ..\..
         - makensis faust.nsi
     artifacts:
         paths:
             - build/faust-%CI_COMMIT_TAG%-amd64.exe
         expire_in: '1 yrs'
     tags:
-        #- win7
         - win10
     only:
         - tags
@@ -584,7 +596,7 @@ pkg_linux_purepy_release_openblaso:
         - if "%GEN_EGG%" == "ON" (py -%WIN_PY_VER% setup.py bdist_egg)
     artifacts:
         paths:
-            - build\wrapper\python\dist
+            - build\wrapper\python # not only dist folder (with wheel package) in order to share .pyd with pkg_win(_release) ci job
     tags:
         - win10
     except: