spns #40695: add windows scripts Python 3.9.X compliant

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index f016bc7ce65ba98cf7c1845f6084a036922d2c02..fb16ae6fd86c974698ef07e67ba2fee2a476470d 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -123,7 +123,7 @@ APPLICATION :
         sip : '5.5.0'
         six : '1.12.0'
         snowballstemmer : '2.2.0'
-        Sphinx : '2.1.2'
+        Sphinx : '3.5.4'
         sphinxcontrib_applehelp : '1.0.1'
         sphinxcontrib_devhelp : '1.0.1'
         sphinxcontrib_jsmath : '1.0.1'

diff --git a/products/compil_scripts/Python-3.9.bat b/products/compil_scripts/Python-3.9.bat
index b2ff5c4c608aa1a12301798a583c6cd87c4ee8a7..eeafa1a3f0cc76fec27943a88ab62a6ddf409e95 100644 (file)
--- a/products/compil_scripts/Python-3.9.bat
+++ b/products/compil_scripts/Python-3.9.bat
@@ -184,10 +184,12 @@ if NOT %ERRORLEVEL% == 0 (
 REM some prequistes if compiled in Debug mode require the lib to be in folder libs
 REM other ones require these static lib to be in the root directory
 REM on purpose we don't use mklink, since this requires the user to have his node set in developer mode.
-xcopy  /Y %PRODUCT_INSTALL%\*.lib %PRODUCT_INSTALL%\libs\
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR could not copy static libraries
-    exit 6
+if %SAT_DEBUG% == 1 (
+  xcopy  /Y %PRODUCT_INSTALL%\*.lib %PRODUCT_INSTALL%\libs\
+  if NOT %ERRORLEVEL% == 0 (
+     echo ERROR could not copy static libraries
+     exit 6
+  )
 )
 
 REM on purpose, we don't use mklink - requires admin rights...

diff --git a/products/env_scripts/omniORB.py b/products/env_scripts/omniORB.py
index 78356b6b8509a7d3ef3a7dd473a3c9dcb6b38ac4..02bee4760ba9489926c0d601fba695f99f692ec7 100644 (file)
--- a/products/env_scripts/omniORB.py
+++ b/products/env_scripts/omniORB.py
@@ -12,6 +12,8 @@ def set_env(env, prereq_dir, version):
         env.prepend('PATH',os.path.join(prereq_dir, 'lib', 'x86_win32'))
         env.prepend( 'PYTHONPATH', os.path.join(prereq_dir, 'lib', 'python'))
         env.prepend( 'PYTHONPATH', os.path.join(prereq_dir, 'lib', 'x86_win32'))
+        env.set('OMNIORB_LIB_DIR',os.path.join(prereq_dir, 'lib', 'x86_win32'))
+        env.set('OMNIORB_BIN_DIR',os.path.join(prereq_dir, 'bin', 'x86_win32'))
         env.set("OMNIORB_USER_PATH", "%APPDATA%")
     else:
         env.prepend('PATH', os.path.join(prereq_dir, 'bin'))

diff --git a/products/matplotlib.pyconf b/products/matplotlib.pyconf
index e06066907393e1672c967b18f46a6098ae684209..d486f39da81b7cc0897256360ab7a672bd466d24 100755 (executable)
--- a/products/matplotlib.pyconf
+++ b/products/matplotlib.pyconf
@@ -41,6 +41,24 @@ default_win :
    }
 }
 
+version_3_3_4 :
+{
+    properties:
+    {
+      pip : "yes"
+      incremental : "yes"
+    }
+}
+version_3_3_4_win :
+{
+    archive_info : {archive_name : "matplotlib-3.3.4.tar.gz"}
+    properties:
+    {
+      pip : "yes"
+      incremental : "yes"
+    }
+}
+
 version_2_2_2 :
 {
     properties:

diff --git a/products/opencv.pyconf b/products/opencv.pyconf
index 6e4bdbbd6aef1c5cf69595fbaea6a406b37c3905..c59b9b73577f88160fb4d23cd129bbe85558e349 100644 (file)
--- a/products/opencv.pyconf
+++ b/products/opencv.pyconf
@@ -66,7 +66,7 @@ version_3_2_0_DB12 :
 
 version_3_2_0_win :
 {
-    patches : ["opencv-3.2.0-ccache.patch","opencv-3.2.0_windows.patch"]
+    patches : ["opencv-3.2.0-ccache.patch","opencv-3.2.0_windows.patch", "SPNS-29988-opencv-3.2.0-cv2.patch"]
 }
 
 version_3_2_0_with_ffmpeg :