From: Nabil Ghodbane Date: Thu, 13 Apr 2023 07:11:13 +0000 (+0200) Subject: openturns/persalys scripts on Windows - ongoing X-Git-Tag: V9_11_0~56 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8c78ee737797637337bd902e27030f2e3b0ef68c;p=tools%2Fsat_salome.git openturns/persalys scripts on Windows - ongoing --- diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index bc26e51..5175e5e 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -54,7 +54,7 @@ default_win : { properties : { - single_install_dir : "yes" + single_install_dir : "no" incremental : "yes" } } @@ -64,11 +64,60 @@ version_v14_0_1 : patches : [] } +version_v14_0_1_win : +{ + depend : ['Python', + 'hdf5', + 'cgns', + 'tbb', + 'nlopt', + 'libxml2', + 'eigen', + 'boost', + 'ADAO', + 'KERNEL', + 'GUI', + 'Sphinx', + 'qwt', + 'qt', + 'ParaView', + 'openturns', + 'YACS', + 'YDEFX', + 'CAS', + 'CONFIGURATION' + ] +} + version_v13_0 : { patches : [] } +version_v13_0_win : +{ + depend : ['Python', + 'hdf5', + 'cgns', + 'tbb', + 'nlopt', + 'libxml2', + 'eigen', + 'boost', + 'ADAO', + 'KERNEL', + 'GUI', + 'Sphinx', + 'qwt', + 'qt', + 'ParaView', + 'openturns', + 'YACS', + 'YDEFX', + 'CAS', + 'CONFIGURATION' + ] +} version_v12_0 : { patches : ['PERSALYS-v12-002.patch', 'PERSALYS-v12-003.patch'] diff --git a/products/PY2CPP.pyconf b/products/PY2CPP.pyconf index dfb846c..8f36b33 100644 --- a/products/PY2CPP.pyconf +++ b/products/PY2CPP.pyconf @@ -33,6 +33,6 @@ default_win : properties: { incremental : "yes" - single_install_dir : "yes" # aimed to solve sat #18914 + single_install_dir : "no" # aimed to solve sat #18914 } } diff --git a/products/env_scripts/PY2CPP.py b/products/env_scripts/PY2CPP.py index 5b0b76c..cc2d887 100644 --- a/products/env_scripts/PY2CPP.py +++ b/products/env_scripts/PY2CPP.py @@ -6,7 +6,10 @@ import platform def set_env(env, product_dir, version): env.set('PY2CPP_ROOT_DIR', product_dir) env.set('Py2cpp_DIR', os.path.join(product_dir, 'lib', 'cmake', 'py2cpp')) - env.prepend('LD_LIBRARY_PATH', os.path.join(product_dir, 'lib')) + if not platform.system() == "Windows" : + env.prepend('LD_LIBRARY_PATH', os.path.join(product_dir, 'lib')) + else: + env.prepend('PATH', os.path.join(product_dir, 'bin')) def set_nativ_env(env): pass