update Windows build scripts: ParaView, PyQt, qt, sip, PyQtChart

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 5f97f66559941fecf37b7bb25f823624b1ac96eb..6d038305f279fffe36bc546b139555e3111af884 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -19,6 +19,7 @@ APPLICATION :
            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
            SALOME_HAS_GLOBAL_ENV : "1"
+           SALOME_USE_64BIT_IDS : '1'
            SET_usr_docs_VARS : "1" # required for PyEditor build
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
@@ -92,7 +93,7 @@ APPLICATION :
         Pygments : '2.4.2'
         pyparsing : '2.4.0'
         PyQt : '5.15.3'
-#        PyQtChart : '5.9'
+        PyQtChart : '5.15.4'
         pyreadline : '2.1'
         Python : '3.6.5'
         pytz : '2019.1'
@@ -103,7 +104,7 @@ APPLICATION :
         ruby : '2.5.5-1'
         scipy : '1.4.1'
         setuptools : '41.0.1'
-        sip : '4.19.3'
+        sip : '5.5.0'
         six : '1.12.0'
         snowballstemmer : '1.9.0'
         Sphinx : '2.1.2'

diff --git a/products/PyQtChart.pyconf b/products/PyQtChart.pyconf
index 64d216fae547bc7816f25ee88cf371fe23aea45c..434614ae0742eb915064ab275da3481a51d3d6b2 100644 (file)
--- a/products/PyQtChart.pyconf
+++ b/products/PyQtChart.pyconf
@@ -25,6 +25,16 @@ default_win :
     compil_script : 'pip_install_whl' + $VARS.scriptExtension
 }
 
+version_5_15_4 :
+{
+    compil_script : 'PyQtChart-5.15.4' + $VARS.scriptExtension
+}
+
+version_5_15_4_win :
+{
+    compil_script : 'pip_install_whl' + $VARS.scriptExtension
+}
+
 version_5_9 :
 {
     compil_script : 'PyQtChart-5.9' + $VARS.scriptExtension

diff --git a/products/compil_scripts/ParaView-5.9.0.bat b/products/compil_scripts/ParaView-5.9.0.bat
new file mode 100644 (file)
index 0000000..54af247
--- /dev/null
+++ b/products/compil_scripts/ParaView-5.9.0.bat
@@ -0,0 +1,233 @@
+@echo off
+
+echo ##########################################################################
+echo ParaView %VERSION% %PYTHON_VERSION% %PYTHON_VERSION:.=%
+echo ##########################################################################
+
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+
+SET PRODUCT_BUILD_TYPE=Release
+if %SAT_DEBUG% == 1 (
+  set PRODUCT_BUILD_TYPE=Debug
+)
+
+set PVLIBVERSION=5.9
+
+set python_name=python%PYTHON_VERSION%
+
+set CMAKE_OPTIONS=
+REM common compiler and install settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_VERBOSE_MAKEFILE=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
+
+REM common ParaView settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR:STRING=lib
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_TESTING:BOOL=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON
+
+REM OpenGL settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DOpenGL_GL_PREFERENCE:STRING=LEGACY
+
+REM Ray-tracing settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON 
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_ENABLE_OSPRAY:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dospray_DIR:PATH=%OSPRAY_ROOT_DIR:\=/%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dembree_DIR:PATH=%EMBREE_ROOT_DIR:\=/%
+
+REM Paraview general settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_VERSION:STRING=3
+
+REM VTK general settings
+
+REM Use 64 bits IDS on request
+if DEFINED SALOME_USE_64BIT_IDS (
+    set CMAKE_OPTIONS=%CMAKE_OPTIONS%  -DVTK_USE_64BIT_IDS:BOOL=ON
+) else (
+    set CMAKE_OPTIONS=%CMAKE_OPTIONS%  -DVTK_USE_64BIT_IDS:BOOL=OFF
+)
+
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-%PVLIBVERSION%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-%PVLIBVERSION%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTKm_INSTALL_LIB_DIR=lib/paraview-%PVLIBVERSION%
+
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF
+
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_VTK_RenderingLOD:INTERNAL=YES
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_VTK_FiltersCore:INTERNAL=YES
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_VTK_CommonCore:INTERNAL=YES
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_VTK_IOCore:INTERNAL=YES
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_VTK_IOEnSight:INTERNAL=YES
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_VTK_IOInfovis:INTERNAL=YES
+
+REM TBB settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DTBB_ROOT:PATH=%TBB_ROOT_DIR:\=/%
+
+REM Qt settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_USE_QT:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF
+
+REM Python settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_USE_PYTHON:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_WRAP_PYTHON:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_INCLUDE_DIR:STRING=%PYTHON_ROOT_DIR:\=/%/include
+if %SAT_DEBUG% == 0 (
+  set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY:STRING=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib
+) else (
+  set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY:STRING=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%_d.lib
+)
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_NO_PYTHON_THREADS:BOOL=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_VERSION:STRING=3
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_WINDOWS_PYTHON_DEBUGGABLE:BOOL=OFF
+
+REM Java settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_WRAP_JAVA:BOOL=OFF
+
+REM MPI settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_USE_MPI:BOOL=OFF
+
+REM HDF5 settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_DIR:PATH=%HDF5_ROOT_DIR:\=/%/cmake/hdf5
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_INCLUDE_DIRS:PATH=%HDF5_ROOT_DIR:\=/%/include
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF
+
+REM CGNS
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_INCLUDE_DIR:PATH=%CGNS_ROOT_DIR:\=/%/include
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_LIBRARY:STRING=%CGNS_ROOT_DIR:\=/%/lib/cgnsdll.lib
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSReader:INTERNAL=YES
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSWriter:INTERNAL=YES
+
+REM VisIt Database bridge settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS%  -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON
+
+REM Boost settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="1.67.0 1.67"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_SYSTEM_PATHS:BOOL=ON
+
+REM libxml2 settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_INCLUDE_DIR:STRING=%LIBXML2_ROOT_DIR:\=/%/include
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_LIBRARIES:STRING=%LIBXML2_ROOT_DIR:\=/%/lib/libxml2.lib
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_XMLLINT_EXECUTABLE=%LIBXML2_ROOT_DIR:\=/%/bin/xmllint.exe
+
+REM gl2ps settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF
+
+REM freetype settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFREETYPE_INCLUDE_DIRS:PATH=%FREETYPE_ROOT_DIR:\=/%/include
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFREETYPE_INCLUDE_DIR_freetype2:PATH=%FREETYPE_ROOT_DIR:\=/%/include/freetype2
+if %SAT_DEBUG% == 0 (
+  set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFREETYPE_LIBRARY:STRING=%FREETYPE_ROOT_DIR:\=/%/lib/freetype.lib
+) else (
+  set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFREETYPE_LIBRARY:STRING=%FREETYPE_ROOT_DIR:\=/%/lib/freetyped.lib
+)
+REM ZLIB settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON 
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_INCLUDE_DIR:STRING=%ZLIB_ROOT_DIR:\=/%/include
+if %SAT_DEBUG% == 0 (
+  set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/lib/zlib.lib 
+) else (
+  set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/lib/zlibd.lib 
+)
+
+REM Extra options (switch off non-used Paraview plug-ins)
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_SierraPlotTools:BOOL=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF
+
+REM allow additional plugins
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON
+
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+
+cd %BUILD_DIR%
+echo.
+echo INFO: running command: %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
+
+%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
+if NOT %ERRORLEVEL% == 0 (
+    echo "ERROR on cmake"
+    exit 1
+)
+
+REM 
+REM see https://gitlab.kitware.com/paraview/paraview/-/issues/19488
+if %SAT_DEBUG% == 1 (
+  del /Q Directory.Build.props
+  echo > Directory.Build.props
+  echo ^<Project^> > Directory.Build.props
+  echo     ^<ItemDefinitionGroup^> >> Directory.Build.props
+  echo       ^<Link^> >> Directory.Build.props
+  echo         ^<AdditionalLibraryDirectories^>%PYTHON_ROOT_DIR:\=/%/libs^;%%(AdditionalLibraryDirectories)^</AdditionalLibraryDirectories^> >> Directory.Build.props
+  echo      ^</Link^> >> Directory.Build.props
+  echo    ^</ItemDefinitionGroup^> >> Directory.Build.props
+  echo ^</Project^> >> Directory.Build.props
+)
+
+echo.
+echo --------------------------------------------------------------------------
+echo *** msbuild %MAKE_OPTIONS% ALL_BUILD.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64
+echo --------------------------------------------------------------------------
+
+msbuild %MAKE_OPTIONS% ALL_BUILD.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on msbuild ALL_BUILD.vcxproj
+    exit 2
+)
+
+echo.
+echo --------------------------------------------------------------------------
+echo *** msbuild %MAKE_OPTIONS% INSTALL.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64
+echo --------------------------------------------------------------------------
+
+msbuild %MAKE_OPTIONS% INSTALL.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on msbuild INSTALL.vcxproj
+    exit 3
+)
+
+REM in order to fullfill some prerequistes by GUI!
+cd %PRODUCT_INSTALL%\bin
+mkdir Lib
+MOVE /Y site-packages Lib\site-packages
+
+REM move 
+set MSBUILDDISABLENODEREUSE=1
+
+REM In debug mode, we need to rename all .pyd to _d.pyd... don't ask why. Seems like a known bug in OmniORB.
+if %SAT_DEBUG% == 1 (
+  cd %PRODUCT_INSTALL%\bin\Lib\site-packages
+  powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) {  $_ | Copy-Item -Destination {$_.Name  -replace '.pyd','_d.pyd'}}}"
+)
+
+echo.
+echo --------------------------------------------------------------------------
+echo *** Post processing
+echo --------------------------------------------------------------------------
+echo.
+
+echo
+echo "########## END"
+

diff --git a/products/compil_scripts/PyQt-5.15.bat b/products/compil_scripts/PyQt-5.15.bat
new file mode 100644 (file)
index 0000000..b1b2313
--- /dev/null
+++ b/products/compil_scripts/PyQt-5.15.bat
@@ -0,0 +1,80 @@
+@echo off
+
+echo ##########################################################################
+echo PyQt %VERSION%
+echo ##########################################################################
+
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+
+cd %SOURCE_DIR%
+
+call :NORMALIZEPATH "%PRODUCT_INSTALL%\..\Python"
+set python_exe=%RETVAL%\python.exe
+set python_name=python%PYTHON_VERSION%
+
+call :NORMALIZEPATH "%PRODUCT_INSTALL%\..\sip"
+set sip_incdir=%RETVAL%\include\%python_name%
+
+echo.
+echo --------------------------------------------------------------------------
+echo *** python configure.py
+echo --------------------------------------------------------------------------
+
+set PRODUCT_BUILD_TYPE=
+if %SAT_DEBUG% == 1 (
+   python configure.py --confirm-license --no-designer-plugin --debug --bindir=%PRODUCT_INSTALL%\bin --destdir=%PRODUCT_INSTALL%\lib\%python_name%\site-packages --sipdir=%PRODUCT_INSTALL%\sip --spec=win32-msvc --sip-incdir=%sip_incdir% --pyuic5-interpreter=%python_exe% --disable QtNfc --disable=QtNetwork --disable=QtWebSockets 2>&1
+) else (
+   python configure.py --confirm-license --no-designer-plugin --bindir=%PRODUCT_INSTALL%\bin --destdir=%PRODUCT_INSTALL%\lib\%python_name%\site-packages --sipdir=%PRODUCT_INSTALL%\sip --spec=win32-msvc --sip-incdir=%sip_incdir% --pyuic5-interpreter=%python_exe% --disable QtNfc --disable=QtNetwork --disable=QtWebSockets 2>&1
+) 
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on python configure.py
+    exit 1
+)
+
+REM Compilation
+echo.
+echo --------------------------------------------------------------------------
+echo *** nmake
+echo --------------------------------------------------------------------------
+
+nmake VERBOSE=1
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on nmake
+    exit 2
+)
+
+REM Installation
+echo.
+echo --------------------------------------------------------------------------
+echo *** nmake install
+echo --------------------------------------------------------------------------
+
+nmake install
+if NOT %ERRORLEVEL% == 0 (
+    echo "ERROR on nmake install"
+    exit 3
+)
+
+REM In debug mode, we need to rename all .pyd to _d.pyd.
+if %SAT_DEBUG% == 1 (
+  cd %PRODUCT_INSTALL%\lib\%python_name%\site-packages\PyQt5
+  powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) {  $_ | Copy-Item -Destination {$_.Name  -replace '.pyd','_d.pyd'}}}"
+  powershell -Command "Get-ChildItem -File -Recurse *_d.pyd| ForEach-Object {if (($_.Name.EndsWith('_d.pyd'))) {  $_ | Copy-Item -Destination {$_.Name  -replace '_d.pyd','.pyd'}}}"
+)
+
+echo.
+echo ########## END
+
+:: ========== FUNCTIONS ==========
+EXIT /B
+
+:NORMALIZEPATH
+  SET RETVAL=%~dpfn1
+  EXIT /B

diff --git a/products/compil_scripts/qt-5.12.10.bat b/products/compil_scripts/qt-5.12.10.bat
new file mode 100644 (file)
index 0000000..0626f75
--- /dev/null
+++ b/products/compil_scripts/qt-5.12.10.bat
@@ -0,0 +1,65 @@
+@echo off
+
+echo ##########################################################################
+echo Qt %VERSION%
+echo ##########################################################################
+
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+SET PRODUCT_BUILD_TYPE=-release
+if %SAT_DEBUG% == 1 (
+  set PRODUCT_BUILD_TYPE=-debug-and-release
+)
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+
+cd %SOURCE_DIR%
+
+REM Configure
+echo.
+echo --------------------------------------------------------------------------
+echo *** configure  
+echo --------------------------------------------------------------------------
+set QT_OPTIONS=-platform win32-msvc2017
+set QT_OPTIONS=%QT_OPTIONS% -opensource -confirm-license %PRODUCT_BUILD_TYPE%
+set QT_OPTIONS=%QT_OPTIONS% -no-angle -opengl desktop -nomake examples -nomake tests 
+set QT_OPTIONS=%QT_OPTIONS% -skip qtwebengine  -skip wayland -skip qtgamepad -no-openssl
+set QT_OPTIONS=%QT_OPTIONS% -mp
+set QT_OPTIONS=%QT_OPTIONS% -prefix %PRODUCT_INSTALL%
+
+echo **** call %SOURCE_DIR%\configure  %QT_OPTIONS%
+call %SOURCE_DIR%\configure.bat  %QT_OPTIONS%
+if NOT %ERRORLEVEL% == 0 (
+    echo "ERROR on configure"
+    exit 1
+)
+
+nmake
+if NOT %ERRORLEVEL% == 0 (
+  exit 2
+)
+
+REM Installation
+echo.
+echo --------------------------------------------------------------------------
+echo *** nmake install
+echo --------------------------------------------------------------------------
+
+nmake install
+if NOT %ERRORLEVEL% == 0 (
+    echo "ERROR on nmake install"
+    exit 3
+)
+
+echo "*** Adding qt.conf file in order to be able to compile using the moved Qt installation"
+echo [Paths] >  %PRODUCT_INSTALL%\bin\qt.conf
+echo Prefix=../ >> %PRODUCT_INSTALL%\bin\qt.conf
+
+echo.
+echo ########## END
+

diff --git a/products/compil_scripts/sip-5.5.0.bat b/products/compil_scripts/sip-5.5.0.bat
new file mode 100644 (file)
index 0000000..54cea46
--- /dev/null
+++ b/products/compil_scripts/sip-5.5.0.bat
@@ -0,0 +1,66 @@
+@echo off
+
+echo ##########################################################################
+echo  SIP + PyQt5_sip %VERSION%
+echo ##########################################################################
+
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+cd %SOURCE_DIR%
+xcopy * %BUILD_DIR%\ /E /I /Q
+cd %BUILD_DIR%\sip-5.5.0
+
+
+set python_name=python%PYTHON_VERSION%
+
+rem mkdir %PRODUCT_INSTALL%\lib\%python_name%\site-packages
+set PATH=%CWD%\bin;%PATH%
+REM set PYTHONPATH=%PRODUCT_INSTALL%\lib\%python_name%\site-packages;%PYTHONPATH%
+
+echo.
+echo *** build with %PYTHONBIN%
+%PYTHONBIN% setup.py build
+if NOT %ERRORLEVEL% == 0 (
+  echo ERROR on SIP running  %PYTHONBIN% setup.py build...
+  exit 1
+)
+
+echo.
+echo *** install with %PYTHONBIN%
+%PYTHONBIN% setup.py install --prefix=%PRODUCT_INSTALL%\lib\%python_name%\site-packages
+if NOT %ERRORLEVEL% == 0 (
+  echo ERROR on SIP running  %PYTHONBIN% setup.py install --prefix=%PRODUCT_INSTALL:\=/%
+  exit 2
+)
+
+cd %BUILD_DIR%\PyQt5_sip-12.8.1
+
+echo.
+echo *** build with %PYTHONBIN%
+%PYTHONBIN% setup.py build
+if NOT %ERRORLEVEL% == 0 (
+  echo ERROR on PyQt5_sip running  %PYTHONBIN% setup.py build...
+  exit 3
+)
+
+echo.
+echo *** install with %PYTHONBIN%
+%PYTHONBIN% setup.py install --prefix=%PRODUCT_INSTALL:\=/%
+if NOT %ERRORLEVEL% == 0 (
+  echo ERROR on PyQt5_sip running  %PYTHONBIN% setup.py install --prefix=%PRODUCT_INSTALL:\=/%
+  exit 4
+)
+
+mkdir %PRODUCT_INSTALL%\include
+xcopy /q /r /Y *.h %PRODUCT_INSTALL%\include
+
+
+echo
+echo ########## END

diff --git a/products/qt.pyconf b/products/qt.pyconf
index 2ec66763f4a4b0735885b165289ead110c9ff885..f31d2ddcc854606f3c54632351bf5cb2d73c4487 100644 (file)
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -34,13 +34,13 @@ default_win:
 
 version_5_15_2 :
 {
-  compil_script : "qt-5.15.2.sh"
+  compil_script : "qt-5.15.2" + $VARS.scriptExtension
   depend : ["freetype", 'llvm']
 }
 
 version_5_12_10 :
 {
-  compil_script : "qt-5.12.10.sh"
+  compil_script : "qt-5.12.10" + $VARS.scriptExtension
   depend : ["freetype", 'llvm']
 }
 

diff --git a/products/sip.pyconf b/products/sip.pyconf
index 3a32bd0d8048aad0b99b639a0cf67e1d39eaa4e5..58c058afa5c915fe0650235291986456464418e8 100644 (file)
--- a/products/sip.pyconf
+++ b/products/sip.pyconf
@@ -27,12 +27,12 @@ default :
 
 version_5_5_0 :
 {
-    compil_script :  'sip-5.5.0.sh'
+    compil_script :  'sip-5.5.0' + $VARS.scriptExtension
     archive_info : {archive_name : "sip-5.5.0-PyQt5_sip-12.8.1.tar.gz"}
 }
 
 version_4_19_24 :
 {
-    compil_script :  'sip.sh'
+    compil_script :  'sip' + $VARS.scriptExtension
 #    archive_info : {archive_name : "sip-4.19.24_PyQt5-12.8.1.tar.gz"}
 }