merge from master

[tools/sat_salome.git] / products / compil_scripts / C3PO.sh

diff --git a/products/compil_scripts/C3PO.sh b/products/compil_scripts/C3PO.sh
index 5a3a503820591dbe045ff61ee4c672f7916ac7b2..6d9801a260d7d9754a82316f99423335cb90d9b3 100755 (executable)
--- a/products/compil_scripts/C3PO.sh
+++ b/products/compil_scripts/C3PO.sh
@@ -9,10 +9,16 @@ mkdir $BUILD_DIR
 cd $BUILD_DIR
 cp -r $SOURCE_DIR/* .
 
-mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages
+# spns #29973
+for X in env.sh runAllTests.sh; do
+    echo "INFO: remove $X if present..."
+    find . -name $X |xargs rm -f
+done
+
+mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
 export PATH=${PRODUCT_INSTALL}/bin:$PATH
 export PYTHONPATH=$PWD:$PYTHONPATH
-export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH
+export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
 
 echo
 echo "*** build and install with $PYTHONBIN sources/setup.py install --prefix=$PRODUCT_INSTALL"
@@ -45,7 +51,7 @@ fi
 if [ $? -ne 0 ]
 then
     echo "ERROR on ctest"
-    exit 4
+    exit 5
 fi
 
 echo