From 284ae987edcec64a9850b6d341d7c5dd5a844f2e Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 20 Jan 2022 17:17:13 +0100
Subject: [PATCH] windows debug mode

---
 products/Cython.pyconf                   |  2 +-
 products/ParaView.pyconf                 |  3 ++-
 products/compil_scripts/PyQt-5.15.bat    | 21 ++++++++++++---------
 products/compil_scripts/psutil-5.7.2.bat |  9 +++++++--
 products/compil_scripts/sip-5.5.0.bat    | 12 ++++++++----
 products/sphinxintl.pyconf               |  2 +-
 products/zlib.pyconf                     | 10 ++++++++++
 7 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/products/Cython.pyconf b/products/Cython.pyconf
index 007d5fe..f2aead4 100755
--- a/products/Cython.pyconf
+++ b/products/Cython.pyconf
@@ -46,7 +46,7 @@ version_0_29_12_win_dbg :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python', 'setuptools']
+    depend : ['Python', 'setuptools', 'sip'] # in debug mode
     opt_depend: ['psutil']
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 00903ec..5ea3126 100755
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -216,7 +216,8 @@ version_5_9_0_win :
                'paraview.0008-ParaView_coincident_rendering.patch',
                'paraview.0011-ParaView_protobuf_crash.patch',
                'paraview.0018-spns-26351-autoconvert.patch',
-               'paraview.0019-spns-26344-VTK-OpenMP.patch'
+               'paraview.0019-spns-26344-VTK-OpenMP.patch',
+               'paraview.0015-Paraview_VTKM_ioss.patch'
               ]
 }
 
diff --git a/products/compil_scripts/PyQt-5.15.bat b/products/compil_scripts/PyQt-5.15.bat
index 747ecf3..02d1263 100644
--- a/products/compil_scripts/PyQt-5.15.bat
+++ b/products/compil_scripts/PyQt-5.15.bat
@@ -20,21 +20,24 @@ echo.
 echo --------------------------------------------------------------------------
 echo *** python configure.py
 echo --------------------------------------------------------------------------
+
 SET BUILD_OPTIONS=
-SET BUILD_OPTIONS=%BUILD_OPTIONS% -b %PRODUCT_INSTALL%/bin 
-SET BUILD_OPTIONS=%BUILD_OPTIONS% -d %PRODUCT_INSTALL%
-SET BUILD_OPTIONS=%BUILD_OPTIONS% -v %PRODUCT_INSTALL%/sip
-SET BUILD_OPTIONS=%BUILD_OPTIONS% --stubsdir=%PRODUCT_INSTALL%/lib/site-packages
-SET BUILD_OPTIONS=%BUILD_OPTIONS% --designer-plugindir=%PRODUCT_INSTALL%/plugins/designer
-SET BUILD_OPTIONS=%BUILD_OPTIONS% --qml-plugindir=%PRODUCT_INSTALL%/plugins/qml
+if %SAT_DEBUG% == 1 (
+ SET BUILD_OPTIONS= --debug --no-dist-info -u
+)
+
+SET BUILD_OPTIONS=%BUILD_OPTIONS% -b %PRODUCT_INSTALL:\=/%/bin
+SET BUILD_OPTIONS=%BUILD_OPTIONS% -d %PRODUCT_INSTALL:\=/%
+SET BUILD_OPTIONS=%BUILD_OPTIONS% -v %PRODUCT_INSTALL:\=/%/sip
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --stubsdir=%PRODUCT_INSTALL:\=/%/lib/site-packages
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --designer-plugindir=%PRODUCT_INSTALL:\=/%/plugins/designer
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --qml-plugindir=%PRODUCT_INSTALL:\=/%/plugins/qml
 SET BUILD_OPTIONS=%BUILD_OPTIONS% --no-qsci-api
 SET BUILD_OPTIONS=%BUILD_OPTIONS% --spec=win32-msvc
 SET BUILD_OPTIONS=%BUILD_OPTIONS% --confirm-license
 SET BUILD_OPTIONS=%BUILD_OPTIONS% --disable=QtNfc --disable=QtNetwork --disable=QtWebSockets 
 SET BUILD_OPTIONS=%BUILD_OPTIONS% --target-py-version=%PYTHON_VERSION%
-if %SAT_DEBUG% == 1 (
- SET BUILD_OPTIONS=%BUILD_OPTIONS% -u
-)
+
 %PYTHONBIN% configure.py %BUILD_OPTIONS:\=/% 
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on python configure.py %BUILD_OPTIONS:\=/% 
diff --git a/products/compil_scripts/psutil-5.7.2.bat b/products/compil_scripts/psutil-5.7.2.bat
index f980aca..e54a83b 100644
--- a/products/compil_scripts/psutil-5.7.2.bat
+++ b/products/compil_scripts/psutil-5.7.2.bat
@@ -8,6 +8,11 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+set BUILD_OPT=
+if %SAT_DEBUG% == 1 (
+   set BUILD_OPT=--debug
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
@@ -21,9 +26,9 @@ set PYTHONPATH=%PYTHONPATH%;%PRODUCT_INSTALL%\Lib\site-packages
 
 echo.
 echo *** 
-%PYTHONBIN% setup.py build --debug install --prefix=%PRODUCT_INSTALL%
+%PYTHONBIN% setup.py build %BUILD_OPT% install --prefix=%PRODUCT_INSTALL%
 if NOT %ERRORLEVEL% == 0 (
-  echo ERROR on psutil running %PYTHONBIN% setup.py build --debug install --prefix=%PRODUCT_INSTALL%
+  echo ERROR on psutil running %PYTHONBIN% setup.py build %BUILD_OPT% install --prefix=%PRODUCT_INSTALL%
   exit 1
 )
 echo.
diff --git a/products/compil_scripts/sip-5.5.0.bat b/products/compil_scripts/sip-5.5.0.bat
index 3048aca..1ac425e 100644
--- a/products/compil_scripts/sip-5.5.0.bat
+++ b/products/compil_scripts/sip-5.5.0.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+set BUILD_OPT=
+if %SAT_DEBUG% == 1 (
+   set BUILD_OPT=--debug
+)
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
@@ -22,15 +26,15 @@ set PYTHONPATH=%PYTHONPATH%;%PRODUCT_INSTALL%\Lib\site-packages
 
 echo.
 echo *** 
-%PYTHONBIN% setup.py build install --prefix=%PRODUCT_INSTALL%
+%PYTHONBIN% setup.py build  %BUILD_OPT% install --prefix=%PRODUCT_INSTALL%
 if NOT %ERRORLEVEL% == 0 (
-  echo ERROR on SIP running  %PYTHONBIN% setup.py  build install   --prefix=%PRODUCT_INSTALL%
+  echo ERROR on SIP running  %PYTHONBIN% setup.py  build  %BUILD_OPT% install   --prefix=%PRODUCT_INSTALL%
   exit 1
 )
 cd %BUILD_DIR%\PyQt5_sip-12.8.1
-%PYTHONBIN% setup.py build install --prefix=%PRODUCT_INSTALL%
+%PYTHONBIN% setup.py build  %BUILD_OPT% install --prefix=%PRODUCT_INSTALL%
 if NOT %ERRORLEVEL% == 0 (
-  echo ERROR on PYQT_SIP running  %PYTHONBIN% setup.py  build install  --prefix=%PRODUCT_INSTALL%
+  echo ERROR on PYQT_SIP running  %PYTHONBIN% setup.py  build  %BUILD_OPT% install  --prefix=%PRODUCT_INSTALL%
   exit 2
 )
 
diff --git a/products/sphinxintl.pyconf b/products/sphinxintl.pyconf
index 4e9337f..c81fff9 100644
--- a/products/sphinxintl.pyconf
+++ b/products/sphinxintl.pyconf
@@ -15,7 +15,7 @@ default :
     {
         env_script : "sphinxintl.py"
     }
-    depend : ['Python', 'setuptools', 'click', 'Sphinx','Babel','six','pytz']
+    depend : ['Python', 'setuptools', 'click', 'Sphinx','Babel','six','pytz', 'colorama']
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'
diff --git a/products/zlib.pyconf b/products/zlib.pyconf
index 3d6e7a0..93a9ac1 100755
--- a/products/zlib.pyconf
+++ b/products/zlib.pyconf
@@ -37,3 +37,13 @@ version_1_2_11_win:
    archive_info : {archive_name : "zlib-" + $APPLICATION.products.zlib + ".tar.gz"}
    compil_script : 'zlib-1.2.11.bat'
 }
+
+version_1_2_5:
+{
+}
+
+version_1_2_5_win:
+{
+   archive_info : {archive_name : "zlib-" + $APPLICATION.products.zlib + ".tar.gz"}
+   compil_script : 'zlib-1.2.5.bat'
+}
-- 
2.39.2