spns #41854: FD36

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 8aea8668d586283b447c0574703be1ff9f98484a..9b94a979c2099fcef529c28acb33e6bea7d33c14 100644 (file)
--- 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 d2ad2db165e603407037702ca7c25910c34eb2ff..992b129178646c7e9f8b38bb58d81c4dc7aaec4a 100755 (executable)
--- 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 8fbed504a91a0afc1ca154236bc2a47dd7da43cc..b5a55411e0873aec716141ea7bf512b88982068b 100755 (executable)
--- 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 073c95f5cb14c5d845d185cb4add14c3bd012750..0d4310b1cce5226b499518616aa469e71d6b22e9 100755 (executable)
--- 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 9287c6c75eb10defc80333fe1e779063062ba9c5..dbc1023e89b4e099820dbff40be3eb846fd13cbb 100755 (executable)
--- 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 90d878712c3af338d79cf8f013ca5c9d91e88244..62bb0116603958c58741e49e2e13078ca5a43362 100755 (executable)
--- 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 ef343d48239314b67e0b5cc5e7f9f5748cea8cab..05fdbedd340f917ce47f61d730e8b19164ce6208 100755 (executable)
--- 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