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 a74e9dcabfc870dcd413f9d4c0b4c4be2b789e6a..6d9801a260d7d9754a82316f99423335cb90d9b3 100755 (executable)
--- a/products/compil_scripts/C3PO.sh
+++ b/products/compil_scripts/C3PO.sh
@@ -4,28 +4,44 @@ echo "##########################################################################
 echo "C3PO" $VERSION
 echo "##########################################################################"
 
-echo  "*** build in SOURCE directory"
-cd $SOURCE_DIR
+rm -rf $BUILD_DIR
+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"
-$PYTHONBIN sources/setup.py install --prefix=$PRODUCT_INSTALL
+cd sources
+$PYTHONBIN ./setup.py build
 if [ $? -ne 0 ]
 then
-    echo "ERROR on build/install"
+    echo "ERROR on build"
     exit 3
 fi
-cd $SOURCE_DIR
+
+$PYTHONBIN ./setup.py install --prefix=$PRODUCT_INSTALL
+if [ $? -ne 0 ]
+then
+    echo "ERROR on install"
+    exit 4
+fi
 
 export LD_LIBRARY_PATH="${MEDCOUPLING_ROOT_DIR}/lib:${LD_LIBRARY_PATH}"
 export PYTHONPATH="${MEDCOUPLING_ROOT_DIR}/${PYTHON_LIBDIR}:${PYTHONPATH}"
 export PYTHONPATH="${MEDCOUPLING_ROOT_DIR}/lib:${PYTHONPATH}"
 export PYTHONPATH="${MEDCOUPLING_ROOT_DIR}/bin:${PYTHONPATH}"
+cd $BUILD_DIR
 if [ -n "$MPI_ROOT_DIR" ]; then
     ctest .
 else
@@ -35,7 +51,7 @@ fi
 if [ $? -ne 0 ]
 then
     echo "ERROR on ctest"
-    exit 4
+    exit 5
 fi
 
 echo