X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FNumeric-22.0.sh;h=3921a1c97fd3c3e2e8d0daa37f77f166412e45d0;hb=66b6c764c24199f26b09a828caea783f93aa8139;hp=c9850350685e5372f9b83957d872931006e83ebb;hpb=15d500ad3ebc31eec8b286677cf4cee0e9899307;p=tools%2Finstall.git

diff --git a/config_files/Numeric-22.0.sh b/config_files/Numeric-22.0.sh
index c985035..3921a1c 100755
--- a/config_files/Numeric-22.0.sh
+++ b/config_files/Numeric-22.0.sh
@@ -20,18 +20,25 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-check_version
-if [ $? -eq 0 ] ; then
-    pythonpath="`find_in_path Numeric.py ${PYTHONPATH}`"
-    tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}";  
-    pythonpath=`sort_path ${tmp}`
-    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+numpath=`python -c "import Numeric; print Numeric.__file__" 2>/dev/null`
+if [ -n "${numpath}" ] ; then
+    numpath=`dirname ${numpath}`
+    ver=`python -c 'import Numeric; print Numeric.__version__' 2>/dev/null | awk -F. '{v=0;for(i=1;i<=NF;i++)v=v*100+$i;print v}'`
+    if [ $ver -ge 2200 ] ; then
+	tmp="${numpath} ${numpath} \${PYTHONPATH} ${PYTHONPATH}";  
+	pythonpath=`sort_path ${tmp}`
+	cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONPATH=${pythonpath}
 ##
 EOF
-    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    return 0
+	make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+	if [ $ver -eq 2200 ] ; then
+	    return 0
+	else
+	    return 2
+	fi
+    fi
 fi
 return 1
 }
@@ -53,7 +60,8 @@ cd ${PRODUCT_WORK}
 
 check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
-rm -fr ${PRODUCT_WORK}
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 print_env
 }