openturns/persalys scripts on Windows - ongoing

diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf
index bc26e515330fd34dd0889441c6be29bce8bdee4b..5175e5ea8ff49e131328c0e612b72a944c580196 100644 (file)
--- 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 dfb846c718a8f4b59b4c945d8189676756b45490..8f36b33b99c352dc9a3d0c83a7089ec4fd512d44 100644 (file)
--- 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 5b0b76c6fb548f31f43c221634ef1a62d8fe9936..cc2d88787b1e3c78472cd0d36cd3c069a95efb77 100644 (file)
--- 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