]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
openturns 1.22: fix dependencies path (use pip install instead of easy_install)
authorGuytri KASTANE <guytri.kastane@cea.fr>
Tue, 16 Jul 2024 12:11:26 +0000 (14:11 +0200)
committerGuytri KASTANE <guytri.kastane@cea.fr>
Tue, 16 Jul 2024 12:11:34 +0000 (14:11 +0200)
products/compil_scripts/openturns-1.22.sh

index 98ccb5461278e0349e705fa2fd416041b7062afe..1c7bc3fb4a4247e71ebaa357702f024b2c44845a 100755 (executable)
@@ -462,27 +462,12 @@ if [[ -d "$SOURCE_DIR/otfftw-0.14" ]]; then
         cd ${BUILD_DIR}/$k
         cp -R $SOURCE_DIR/$k-${OTP[$k]}/* .
         #
-        if [ $k == "otpod" ]; then
-            ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip . --no-deps  --prefix=$PRODUCT_INSTALL
-            if [ $? -ne 0 ]; then
-                echo "ERROR on ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip . --no-deps  --prefix=$PRODUCT_INSTALL"
-                exit 4
-            fi
-        else
-            $PYTHONBIN setup.py build
-            if [ $? -ne 0 ]
-            then
-                echo "ERROR on ${PYTHONBIN} setup.py  build"
-                exit 4
-            fi
-            #
-            $PYTHONBIN setup.py install --prefix=$PRODUCT_INSTALL
-            if [ $? -ne 0 ]
-            then
-                echo "ERROR on ${PYTHONBIN} setup.py  install --prefix=$PRODUCT_INSTALL"
-                exit 5
-            fi
+        ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip . --no-deps  --prefix=$PRODUCT_INSTALL
+        if [ $? -ne 0 ]; then
+           echo "ERROR on ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip . --no-deps  --prefix=$PRODUCT_INSTALL"
+           exit 4
         fi
+        #
         echo "INFO: check presence of $PRODUCT_INSTALL/local"
         if [ -d "$PRODUCT_INSTALL/local" ]; then
             echo "INFO: $PRODUCT_INSTALL/local is present -  reearrange ..."