From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 21 Jun 2022 16:14:00 +0000 (+0200)
Subject: sat #30348  use PARAVISADDONS.py environment file until fixed
X-Git-Tag: V9_11_0~353
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=68a1e6b9e1d4b7edcc46085239af2a09c236529b;p=tools%2Fsat_salome.git

sat #30348  use PARAVISADDONS.py environment file until fixed
---

diff --git a/products/PARAVISADDONS.pyconf b/products/PARAVISADDONS.pyconf
index a546be0..d192044 100644
--- a/products/PARAVISADDONS.pyconf
+++ b/products/PARAVISADDONS.pyconf
@@ -1,62 +1,62 @@
 #!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
-  default :
-  {
+default :
+{
     name : 'PARAVISADDONS'
     build_source : 'cmake'
     cmake_options : ''
     get_source : "git"
     git_info :
     {
-      repo : $PROJECTS.projects.salome.git_info.default_git_server + 'modules/paravisaddons_common.git'
-      repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + 'paravisaddons_common.git'
+        repo : $PROJECTS.projects.salome.git_info.default_git_server + 'modules/paravisaddons_common.git'
+        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + 'paravisaddons_common.git'
     }
     environ :
     {
-      PARAVISADDONS : $install_dir
-      PV_PLUGIN_PATH_ : $install_dir + $VARS.sep + 'lib' + $VARS.sep + 'paraview'
+        env_script : $name + ".py"
     }
     depend :
     [
-      'KERNEL'
-      'GUI'
-      'MEDCOUPLING'
-      'PARAVIS'
-      'FIELDS'
-      'GEOM'
-      'SMESH'
-      'Python'
-      'qt'
-      'boost'
-      'hdf5'
-      'medfile'
-      'ParaView'
-      'CAS'
-      'omniORB'
-      'docutils'
-      'libxml2'
-      'six'
-      'pytz'
+        'KERNEL'
+        'GUI'
+        'MEDCOUPLING'
+        'PARAVIS'
+        'FIELDS'
+        'GEOM'
+        'SMESH'
+        'Python'
+        'qt'
+        'boost'
+        'hdf5'
+        'medfile'
+        'ParaView'
+        'CAS'
+        'omniORB'
+        'docutils'
+        'libxml2'
+        'six'
+        'pytz'
     ]
     opt_depend : ['openmpi']
     build_depend :
     [
-      'cmake'
-      'swig'
-      'cppunit'
+        'cmake'
+        'swig'
+        'cppunit'
     ]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     properties :
     {
-      incremental : 'yes'
+        incremental : 'yes'
     }
-  }
-  default_win :
-  {
+}
+
+default_win :
+{
     depend :
     [
-      'PARAVIS'
+        'PARAVIS'
     ]
-  }
+}
diff --git a/products/compil_scripts/ADAO.bat b/products/compil_scripts/ADAO.bat
index c21b76b..4b42406 100644
--- a/products/compil_scripts/ADAO.bat
+++ b/products/compil_scripts/ADAO.bat
@@ -41,7 +41,7 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 
diff --git a/products/env_scripts/PARAVISADDONS.py b/products/env_scripts/PARAVISADDONS.py
new file mode 100644
index 0000000..d338697
--- /dev/null
+++ b/products/env_scripts/PARAVISADDONS.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import os.path
+
+def set_env(env, prereq_dir, version):
+    env.set('PARAVISADDONS', prereq_dir)
+    env.append('PV_PLUGIN_PATH', os.path.join(prereq_dir, 'lib','paraview'))
+
+def set_nativ_env(env):
+    pass