X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FNumeric-22.0.sh;h=3921a1c97fd3c3e2e8d0daa37f77f166412e45d0;hb=3fc3493387b534f9e0c536de985ac0af3413ae7a;hp=10e14baf35a254c0776554ad8737a6bcec1a602a;hpb=6c445ecdd1e1075fea6dab383d49310c4e2f0a29;p=tools%2Finstall.git

diff --git a/config_files/Numeric-22.0.sh b/config_files/Numeric-22.0.sh
index 10e14ba..3921a1c 100755
--- a/config_files/Numeric-22.0.sh
+++ b/config_files/Numeric-22.0.sh
@@ -1,12 +1,9 @@
 #!/bin/sh
 
 check_version(){
-if [ -d "${PYTHONHOME}/lib/python2.2/site-packages/Numeric" ]; then
-   check_lib_version _numpy.so ${PYTHONHOME}/lib/python2.2/site-packages/Numeric
-   if [ "$?" -eq "0" ]; then
-      #echo "The product ${PRODUCT} has been already installed on yours system"
-      return 0
-   fi
+ver=`python -c 'import Numeric; print Numeric.__version__' 2>/dev/null`
+if [ "$ver" == "22.0" ]; then
+   return 0
 fi
 return 1
 }
@@ -14,7 +11,7 @@ return 1
 print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export PYTHONPATH=\${INSTALL_ROOT}/${PRODUCT}/lib/python2.2/site-packages/Numeric:\${PYTHONPATH}
+export PYTHONPATH=\${INSTALL_ROOT}/${PRODUCT}/lib/python\${PYTHON_VERSION}/site-packages/Numeric:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -23,29 +20,26 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-cat > ${INSTALL_WORK}/try_native.py <<EOF 
-import sys
-try :
-    import Numeric
-    sys.exit(0)    
-except ImportError, r :
-    sys.exit(1)
-EOF
-python ${INSTALL_WORK}/try_native.py
-if [ $? -eq 0 ] ; then
-    pythonpath="`find_in_path _numpy.so ${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}"
-    rm -f ${INSTALL_WORK}/try_native.py
-    return 0
+	make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+	if [ $ver -eq 2200 ] ; then
+	    return 0
+	else
+	    return 2
+	fi
+    fi
 fi
-rm -f ${INSTALL_WORK}/try_native.py
 return 1
 }
 
@@ -66,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
 }