Ensure CATALYST is detected - fix installation path for PyQt if Python is native

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 330f4164c1780b71293bcc1a5ee2f428c59750b4..3321db46a6595c4ae0c93adb52428781012006b7 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -130,6 +130,7 @@ APPLICATION :
         tbb : 'native'
         tcl : 'native'
         tk : 'native'
+        toml: 'native'
         urllib3 : 'native'
         zeromq: '4.3.1'
         URANIE : '4.5.0'
@@ -239,6 +240,7 @@ __overwrite__ :
         'APPLICATION.products.cminpack': 'native'
         'APPLICATION.products.PyFMI'   : {tag:'2.6',        base: 'no',  section: 'version_2_6_no_pip'             }
         'APPLICATION.products.qt'      : '5.12.10'
+        'APPLICATION.products.qwt'     : '6.1.2'
         'APPLICATION.products.PyQt'    : '5.15.3'
         'APPLICATION.products.sip'     : '5.5.0'
     }

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index e780ded115b8d0a542f71eb8fc981377018b1be3..0e2c052740fa4285a51985f9a3dcce2e6003a795 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -159,6 +159,19 @@ version_5_11_0_MPI :
     #            'paraview.0020.findMPI.patch',
     #            'paraview.0021-FindGDAL.patch'
     #           ]
+    depend : [
+              'Python',
+              'hdf5',
+              'qt',
+              'PyQt',
+              'sip',
+              'boost',
+              'libxml2',
+              'freetype',
+              'matplotlib',
+              'cgns',
+              'Pygments'
+              ]
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst']
 }
 

diff --git a/products/catalyst.pyconf b/products/catalyst.pyconf
index 4e765b3a47de4ab4d2a38256e4653bea9aba0356..08bd4213d75d0226b04e052c9968eeb84623f388 100644 (file)
--- a/products/catalyst.pyconf
+++ b/products/catalyst.pyconf
@@ -2,8 +2,8 @@ default :
 {
     name : "catalyst"
     build_source : "cmake"
+    cmake_options: " -DCMAKE_INSTALL_LIBDIR:STRING=lib "
     get_source : "archive"
-    archive_info : {archive_name : "catalyst-2.0-431a8a1.tar.gz"}
     environ :
     {
        env_script : $name + ".py"
@@ -29,3 +29,9 @@ default :
       incremental : "yes"
     }
 }
+
+version_2_0:
+{
+    archive_info : {archive_name : "catalyst-2.0-431a8a1.tar.gz"}
+}
+  
\ No newline at end of file

diff --git a/products/compil_scripts/ParaView-5.11.0.sh b/products/compil_scripts/ParaView-5.11.0.sh
index 6f57dc2c9c1d64e154d71acbe0899771a1194f53..bb078bf890cce11fcb7396a05976b0654dfe46c7 100755 (executable)
--- a/products/compil_scripts/ParaView-5.11.0.sh
+++ b/products/compil_scripts/ParaView-5.11.0.sh
@@ -110,6 +110,7 @@ if [ "${SAT_Python_IS_NATIVE}" != "1" ]
 then
     CMAKE_OPTIONS+=" -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
     CMAKE_OPTIONS+=" -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
+    CMAKE_OPTIONS+=" -DPython3_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python${PYTHON_VERSION}"
 fi
 CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON"
 CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"

diff --git a/products/compil_scripts/PyQt-5.15.sh b/products/compil_scripts/PyQt-5.15.sh
index 0dcc255a13717ef883d6ed7ea38ad83be00e2932..a85c630947e21a7813c9c8dce923c8cfee832370 100755 (executable)
--- a/products/compil_scripts/PyQt-5.15.sh
+++ b/products/compil_scripts/PyQt-5.15.sh
@@ -4,37 +4,31 @@ echo "##########################################################################
 echo "PyQt" $VERSION
 echo "##########################################################################"
 
-
-
 python_name=python$PYTHON_VERSION
 
-# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
-#                               On fait tout dans les sources
-#CURRENT_DIR=`pwd`
 cd $SOURCE_DIR
-if [ $? -ne 0 ]
+
+if [ "${SAT_Python_IS_NATIVE}" == "1" ]
 then
-    echo "ERROR on $SOURCE_DIR access"
-    exit 1
+    # if not set, will try to install in system path...
+    mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
+    export PATH=$(pwd)/bin:$PATH
+    export PYTHONPATH=$(pwd):$PYTHONPATH
+    export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
 fi
 
-
 echo
-echo "*** configure.py --confirm-license --no-designer-plugin --verbose --bindir=${PRODUCT_INSTALL}/bin --destdir=${PRODUCT_INSTALL}/lib/$python_name/site-packages --sipdir=${SIP_ROOT_DIR} --disable=QtNetwork --disable=QtWebSockets"
+echo "*** configure.py --confirm-license --no-designer-plugin --verbose --bindir=${PRODUCT_INSTALL}/bin --destdir=${PRODUCT_INSTALL}/lib/$python_name/site-packages --stubsdir=${PRODUCT_INSTALL}/lib/$python_name/site-packages --sipdir=${SIP_ROOT_DIR} --disable=QtNetwork --disable=QtWebSockets"
 $PYTHONBIN ./configure.py --confirm-license --no-designer-plugin --verbose \
     --bindir=${PRODUCT_INSTALL}/bin \
     --destdir=${PRODUCT_INSTALL}/lib/$python_name/site-packages \
+    --stubsdir=${PRODUCT_INSTALL}/lib/$python_name/site-packages \
     --sipdir=${SIP_ROOT_DIR} \
     --disable=QtNetwork --disable=QtWebSockets 2>&1
-#    --disable=QtNetwork --disable=QtWebSockets --disable=QtWebKit  --disable=QtWebKitWidgets --disable=QAxContainer --disable=QtMacExtras --disable=QtWinExtras --disable=QtX11Extras --disable=Enginio 2>&1
 
 if [ $? -ne 0 ]
 then
     echo "ERROR on configure"
-# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
-#                               On fait tout dans les sources
-#    exit 1
-#    cd $CURRENT_DIR
     exit 2
 fi
 
@@ -44,10 +38,6 @@ make $MAKE_OPTIONS
 if [ $? -ne 0 ]
 then
     echo "ERROR on make"
-# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
-#                               On fait tout dans les sources
-#    exit 2
-#    cd $CURRENT_DIR
     exit 3
 fi
 
@@ -57,22 +47,15 @@ make install
 if [ $? -ne 0 ]
 then
     echo "ERROR on make install"
-# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
-#                               On fait tout dans les sources
-#    exit 3
-#    cd $CURRENT_DIR
     exit 4
 fi
 
-# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
-#                               Ajout du make clean
 echo
 echo "*** make clean"
 make clean
 if [ $? -ne 0 ]
 then
     echo "ERROR on make clean"
-#    cd $CURRENT_DIR
     exit 5
 fi
 

diff --git a/products/env_scripts/catalyst.py b/products/env_scripts/catalyst.py
index c374a8b697141e47c6e0e95c479350729392ce46..bf89fab37f0363201cbbdba5f28b0959716dfc55 100644 (file)
--- a/products/env_scripts/catalyst.py
+++ b/products/env_scripts/catalyst.py
@@ -6,8 +6,9 @@ import platform
 
 def set_env(env, prereq_dir, version):
   env.set('CATALYST_ROOT_DIR', prereq_dir)
-  env.set('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib'))
-  env.set('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib', 'catalyst'))
-  
+  env.set('catalyst_DIR', os.path.join(prereq_dir, 'lib', 'cmake', 'catalyst-{}'.format(version)))  
+  env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib'))
+  env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib', 'catalyst'))
+
 def set_nativ_env(env):
   pass

diff --git a/products/sip.pyconf b/products/sip.pyconf
index bc8459240b4c3fe96fe41ddf863b1b0ed892d5aa..d5dfda957229931b99c59e59231dd1390c83bd5a 100644 (file)
--- a/products/sip.pyconf
+++ b/products/sip.pyconf
@@ -31,7 +31,8 @@ version_6_6_2 :
     compil_script :  'sip-6.6.2' + $VARS.scriptExtension
     archive_info : {archive_name : "sip-6.6.2-PyQt5_sip-12.11.0.tar.gz"}
     patches : []
-    depend : ['Python', 'qt', 'toml']
+    depend : ['Python', 'qt']
+    opt_depend: ['toml']
 }
 
 version_5_5_0 :
@@ -39,11 +40,11 @@ version_5_5_0 :
     compil_script :  'sip-5.5.0' + $VARS.scriptExtension
     archive_info : {archive_name : "sip-5.5.0-PyQt5_sip-12.8.1.tar.gz"}
     patches : ['sip-5.5.0-sipSetBool.patch']
-    depend : ['Python', 'qt', 'toml']
+    depend : ['Python', 'qt']
+    opt_depend: ['toml']
 }
 
 version_4_19_24 :
 {
     compil_script :  'sip' + $VARS.scriptExtension
-#    archive_info : {archive_name : "sip-4.19.24_PyQt5-12.8.1.tar.gz"}
 }