windows debug: do not build with scipy

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 9fb46667ddd833d9abc036faaa35ce803195cba1..18e641279e016414906edf05d5873ae022f80677 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -199,7 +199,7 @@ __overwrite__ :
 [
   {
     __condition__ : "APPLICATION.debug == 'yes'"
-    'APPLICATION.rm_products' : ['matplotlib', 'openturns']
+    'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow']
     'APPLICATION.products.numpy'      : {tag: '1.16.4',  base: 'no', section : 'version_1_16_4_win_dbg'     }
     'APPLICATION.products.Cython'     : {tag: '0.29.12', base: 'no', section : 'version_0_29_12_win_dbg'    }
     'APPLICATION.products.sphinxintl' : {tag: '2.0.0',   base: 'no', section : 'version_2_0_0_win_dbg'      }

diff --git a/products/ADAO.pyconf b/products/ADAO.pyconf
index ccbb5fff70cec71c54f5a6084b9c7ee6336e18df..a42feb10deb65105381a80392fc7e29642ca7801 100644 (file)
--- a/products/ADAO.pyconf
+++ b/products/ADAO.pyconf
@@ -18,7 +18,6 @@ default :
         "docutils",
         "Sphinx",
         "setuptools",
-        "scipy",
         "Python",
         "nlopt",
         "omniORB",
@@ -29,6 +28,7 @@ default :
         "EFICAS_TOOLS",
         "YACS"
         ]
+    opt_depend : ["scipy"]
     build_depend : ["cmake", "swig", "cppunit"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name

diff --git a/products/compil_scripts/omniORBpy.bat b/products/compil_scripts/omniORBpy.bat
index 5debf61efead218184cf126ab269a0891161b0bd..419c790db43c7134bb49b54443832c43afe940dc 100755 (executable)
--- a/products/compil_scripts/omniORBpy.bat
+++ b/products/compil_scripts/omniORBpy.bat
@@ -41,8 +41,16 @@ if NOT %ERRORLEVEL% == 0 (
 )\r
 \r
 if %SAT_DEBUG% == 1 (\r
-  cd %PRODUCT_INSTALL%\r
+  cd %OMNIORB_ROOT_DIR%\r
   powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) {  $_ | Copy-Item -Destination {$_.Name  -replace '.pyd','_d.pyd'}}}"\r
 )\r
+\r
+if %SAT_DEBUG% == 1 (\r
+  cd %OMNIORB_ROOT_DIR%\lib\x86_win32\r
+  copy /B /Y _omnicodesets.pyd _omnicodesets_d.pyd\r
+  copy /B /Y _omniConnMgmt.pyd _omniConnMgmt_d.pyd\r
+  copy /B /Y _omnipy.pyd _omnipy_d.pyd\r
+)\r
+\r
 echo.\r
 echo ########## END\r

diff --git a/products/compil_scripts/psutil-5.7.2.bat b/products/compil_scripts/psutil-5.7.2.bat
index e54a83b8aa95add354579ecc157aa515014a90c2..19ceb67e2feab813e50f11fd8e852a77c917f581 100644 (file)
--- a/products/compil_scripts/psutil-5.7.2.bat
+++ b/products/compil_scripts/psutil-5.7.2.bat
@@ -4,6 +4,9 @@ echo ##########################################################################
 echo psutil %VERSION%
 echo ##########################################################################
 
+REM install in python directly
+SET INSTALL_CENTRALLY=1
+
 IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
@@ -26,7 +29,11 @@ set PYTHONPATH=%PYTHONPATH%;%PRODUCT_INSTALL%\Lib\site-packages
 
 echo.
 echo *** 
-%PYTHONBIN% setup.py build %BUILD_OPT% install --prefix=%PRODUCT_INSTALL%
+if %INSTALL_CENTRALLY% == 1 (
+    %PYTHONBIN% setup.py build %BUILD_OPT% install
+) else (
+    %PYTHONBIN% setup.py build %BUILD_OPT% install --prefix=%PRODUCT_INSTALL%
+)
 if NOT %ERRORLEVEL% == 0 (
   echo ERROR on psutil running %PYTHONBIN% setup.py build %BUILD_OPT% install --prefix=%PRODUCT_INSTALL%
   exit 1

diff --git a/products/pmml.pyconf b/products/pmml.pyconf
index 90a35a42cb99b71adefccd26141a1899b869bd1d..c9c15da34b7d8b5c2ba690847557a4f8249bf417 100644 (file)
--- a/products/pmml.pyconf
+++ b/products/pmml.pyconf
@@ -27,9 +27,11 @@ default :
 
 default_win :
 {
+    cmake_options : "-DCPPUNIT_ROOT_DIR=%CPPUNIT_ROOT_DIR:\=/%"
     properties :
     {
       incremental : "yes"
       single_install_dir : "yes"
     }
+    build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }