From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 14 May 2024 14:55:36 +0000 (+0200)
Subject: spns #41854: FD36
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b6887622dde7af40242153f1fb0fcaf0e3b89d41;p=tools%2Fsat_salome.git

spns #41854: FD36
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 8aea866..9b94a97 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -376,6 +376,11 @@ __overwrite__ :
         'APPLICATION.products.PyFMI'            : {tag: '2.6',       base: 'no', section: 'version_2_6_no_pip'                  }
         'APPLICATION.products.root'             : {tag: '6.22.02',   base: 'no', section: 'version_6_22_02_FD36'                }
         'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD36'                  }
+        'APPLICATION.products.mdurl'            : {tag: '0.1.2',  base: 'no', section: 'version_0_1_2_no_pip' }
+        'APPLICATION.products.markdown_it_py'   : {tag: '3.0.0',  base: 'no', section: 'version_3_0_0_no_pip' }
+        'APPLICATION.products.rich'             : {tag: '13.7.1', base: 'no', section: 'version_13_7_1_no_pip'}
+        'APPLICATION.products.meshio'           : {tag: '5.3.5' , base: 'no', section: 'version_5_3_5_no_pip' }
+        'APPLICATION.products.h5py'             : {tag: '3.11.0', base: 'no', section: 'version_3_11_0_no_pip'}
     }
 
     {
diff --git a/products/compil_scripts/h5py-3.11.0.sh b/products/compil_scripts/h5py-3.11.0.sh
index d2ad2db..992b129 100755
--- a/products/compil_scripts/h5py-3.11.0.sh
+++ b/products/compil_scripts/h5py-3.11.0.sh
@@ -19,32 +19,28 @@ export PATH=${PRODUCT_INSTALL}/bin:$PATH
 case $LINUX_DISTRIBUTION in
     FD32|UB20*)
         WHEELS=('h5py-3.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl')
-        for WHEEL in "${WHEELS[@]}"; do
-            ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
-            if [ $? -ne 0 ]; then
-                echo "ERROR: could not install $WHEEL"
-                exit 1
-            fi
-        done
-        if [ -d ${PRODUCT_INSTALL}/lib64 ]; then
-            mv ${PRODUCT_INSTALL}/lib64 ${PRODUCT_INSTALL}/lib
-        fi
         ;;
     FD34)
         WHEELS=('h5py-3.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl')
-        for WHEEL in "${WHEELS[@]}"; do
-            ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --target=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages
-            if [ $? -ne 0 ]; then
-                echo "ERROR: could not install $WHEEL"
-                exit 1
-            fi
-        done
+        ;;
+    FD36)
+        WHEELS=('h5py-3.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl')
         ;;
     *)
         echo "Not implemented"
         exit 1
         ;;
 esac
+for WHEEL in "${WHEELS[@]}"; do
+    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
+    if [ $? -ne 0 ]; then
+        echo "ERROR: could not install $WHEEL"
+        exit 1
+    fi
+done
+if [ -d ${PRODUCT_INSTALL}/lib64 ]; then
+    mv ${PRODUCT_INSTALL}/lib64 ${PRODUCT_INSTALL}/lib
+fi
 
 echo
 echo "########## END"
diff --git a/products/compil_scripts/markdown-it-py-2.2.0.sh b/products/compil_scripts/markdown-it-py-2.2.0.sh
index 8fbed50..b5a5541 100755
--- a/products/compil_scripts/markdown-it-py-2.2.0.sh
+++ b/products/compil_scripts/markdown-it-py-2.2.0.sh
@@ -17,7 +17,7 @@ export PATH=${PRODUCT_INSTALL}/bin:$PATH
 
 WHEELS=('markdown_it_py-2.2.0-py3-none-any.whl')
 for WHEEL in "${WHEELS[@]}"; do
-    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
+    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
     if [ $? -ne 0 ]; then
         echo "ERROR: could not install $WHEEL"
         exit 1
diff --git a/products/compil_scripts/markdown-it-py-3.0.0.sh b/products/compil_scripts/markdown-it-py-3.0.0.sh
index 073c95f..0d4310b 100755
--- a/products/compil_scripts/markdown-it-py-3.0.0.sh
+++ b/products/compil_scripts/markdown-it-py-3.0.0.sh
@@ -17,7 +17,7 @@ export PATH=${PRODUCT_INSTALL}/bin:$PATH
 
 WHEELS=('markdown_it_py-3.0.0-py3-none-any.whl')
 for WHEEL in "${WHEELS[@]}"; do
-    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
+    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
     if [ $? -ne 0 ]; then
         echo "ERROR: could not install $WHEEL"
         exit 1
diff --git a/products/compil_scripts/mdurl-0.1.2.sh b/products/compil_scripts/mdurl-0.1.2.sh
index 9287c6c..dbc1023 100755
--- a/products/compil_scripts/mdurl-0.1.2.sh
+++ b/products/compil_scripts/mdurl-0.1.2.sh
@@ -17,7 +17,7 @@ export PATH=${PRODUCT_INSTALL}/bin:$PATH
 
 WHEELS=('mdurl-0.1.2-py3-none-any.whl')
 for WHEEL in "${WHEELS[@]}"; do
-    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
+    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
     if [ $? -ne 0 ]; then
         echo "ERROR: could not install $WHEEL"
         exit 1
diff --git a/products/compil_scripts/meshio-5.3.5.sh b/products/compil_scripts/meshio-5.3.5.sh
index 90d8787..62bb011 100755
--- a/products/compil_scripts/meshio-5.3.5.sh
+++ b/products/compil_scripts/meshio-5.3.5.sh
@@ -15,36 +15,16 @@ cd $BUILD_DIR
 export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
 export PATH=${PRODUCT_INSTALL}/bin:$PATH
 
-case $LINUX_DISTRIBUTION in
-    CO9|FD32|FD34|FD38|UB20*)
-        WHEELS=('typing_extensions-4.11.0-py3-none-any.whl'
-                'meshio-5.3.5-py3-none-any.whl'
-               )
-        for WHEEL in "${WHEELS[@]}"; do
-            ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
-            if [ $? -ne 0 ]; then
-                echo "ERROR: could not install $WHEEL"
-                exit 1
-            fi
-        done
-        ;;
-    DB11)
-        WHEELS=('typing_extensions-4.11.0-py3-none-any.whl'
-                'meshio-5.3.5-py3-none-any.whl'
-               )
-        for WHEEL in "${WHEELS[@]}"; do
-            ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
-            if [ $? -ne 0 ]; then
-                echo "ERROR: could not install $WHEEL"
-                exit 1
-            fi
-        done
-        ;;
-    *)
-        echo "not implemented"
+WHEELS=('typing_extensions-4.11.0-py3-none-any.whl'
+        'meshio-5.3.5-py3-none-any.whl'
+       )
+for WHEEL in "${WHEELS[@]}"; do
+    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
+    if [ $? -ne 0 ]; then
+        echo "ERROR: could not install $WHEEL"
         exit 1
-        ;;
-esac
+    fi
+done
 
 echo
 echo "########## END"
diff --git a/products/compil_scripts/rich-13.7.1.sh b/products/compil_scripts/rich-13.7.1.sh
index ef343d4..05fdbed 100755
--- a/products/compil_scripts/rich-13.7.1.sh
+++ b/products/compil_scripts/rich-13.7.1.sh
@@ -16,14 +16,17 @@ cd $BUILD_DIR
 
 WHEELS=('rich-13.7.1-py3-none-any.whl')
 for WHEEL in "${WHEELS[@]}"; do
-    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
+    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
     if [ $? -ne 0 ]; then
         echo "ERROR: could not install $WHEEL"
         exit 1
     fi
 done
+ls -ltr $PRODUCT_INSTALL/
 if [ -d ${PRODUCT_INSTALL}/lib64 ]; then
     mv ${PRODUCT_INSTALL}/lib64 ${PRODUCT_INSTALL}/lib
+elif [ -d ${PRODUCT_INSTALL}/local ]; then
+    mv ${PRODUCT_INSTALL}/local ${PRODUCT_INSTALL}/lib
 fi
 
 echo