bos #42835: support FD32

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 5b4ed72b3c31ba160a3f91a9dad1fca7e1a64501..4ecee1c4958488ae9eca9e5c98f82b443edaf9ee 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -414,6 +414,8 @@ __overwrite__ :
         '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'}
         'APPLICATION.products.YACS'             : {tag: 'master', base: 'no', section: 'version_master_FD32'  }
+        'APPLICATION.products.poetry_core'      : {tag: '1.9.0',  base: 'no', section: 'version_1_9_0_x86_64' }
+        'APPLICATION.products.poetry'           : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_x86_64' }
     }
     {
         __condition__ : "VARS.dist in ['FD34']"

diff --git a/products/compil_scripts/poetry-1.5.1.sh b/products/compil_scripts/poetry-1.5.1.sh
index 391840fd9cdcd3cb94d6bd7a3d3b725dea31ff79..216cba5fabd673eb5acb795b045f350ad06413fc 100755 (executable)
--- a/products/compil_scripts/poetry-1.5.1.sh
+++ b/products/compil_scripts/poetry-1.5.1.sh
@@ -14,28 +14,17 @@ mkdir -p $BUILD_DIR/cache/pip
 cd $BUILD_DIR
 
 USE_WHEELS=true
-case $LINUX_DISTRIBUTION in
-    DB10|UB20*|DB12)
-       export WHEELS=('poetry-1.5.1-py3-none-any.whl')
-       ;;
-    *)
-       exit 1
-       ;;
-esac
-if $USE_WHEELS == true ; then
-    for WHEEL in "${WHEELS[@]}"; do
-       echo $WHELL
-       ${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
-else
-    echo "Not implemented"
-fi
-if [ -d ${PRODUCT_INSTALL}/lib/python3.7/site-packages/bin ];then
-    mv ${PRODUCT_INSTALL}/lib/python3.7/site-packages/bin* ${PRODUCT_INSTALL}/bin
+export WHEELS=('poetry-1.5.1-py3-none-any.whl')
+for WHEEL in "${WHEELS[@]}"; do
+    echo $WHELL
+    ${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}/lib/python$PYTHON_VERSION/site-packages/bin ];then
+    mv ${PRODUCT_INSTALL}/lib/python$PYTHON_VERSION/site-packages/bin* ${PRODUCT_INSTALL}/bin
 fi
 
 echo

diff --git a/products/compil_scripts/poetry_core-1.9.0.sh b/products/compil_scripts/poetry_core-1.9.0.sh
new file mode 100755 (executable)
index 0000000..cd06f5c
--- /dev/null
+++ b/products/compil_scripts/poetry_core-1.9.0.sh
@@ -0,0 +1,30 @@
+#!/bin/bash                                                                                                                                                                              
+
+echo "##########################################################################"
+echo "poetry_core " $VERSION
+echo "##########################################################################"
+
+LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+echo "*** check installation"
+export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
+export PATH=${PRODUCT_INSTALL}/bin:$PATH
+mkdir -p ${PRODUCT_INSTALL}
+rm -rf $BUILD_DIR
+mkdir -p $BUILD_DIR/cache/pip
+cd $BUILD_DIR
+
+export WHEELS=('poetry_core-1.9.0-py3-none-any.whl')
+for WHEEL in "${WHEELS[@]}"; do
+         echo $WHELL
+         ${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}/lib/python$PYTHON_VERSION/site-packages/bin ];then
+    mv ${PRODUCT_INSTALL}/lib/python$PYTHON_VERSION/site-packages/bin* ${PRODUCT_INSTALL}/bin
+fi
+
+echo
+echo "########## END"

diff --git a/products/poetry_core.pyconf b/products/poetry_core.pyconf
index 0fb195d63998d877f1de324aef23cef604a744cd..294c6a192b19ab66ba6f90f2696e2254ff482fb2 100644 (file)
--- a/products/poetry_core.pyconf
+++ b/products/poetry_core.pyconf
@@ -27,3 +27,9 @@ default :
       pip : "no"
     }
 }
+
+version_1_9_0_x86_64:
+{
+      compil_script: "poetry_core-1.9.0.sh"
+      archive_info : {archive_name : "poetry-1.9.0-x86_64.tar.gz"}
+}