Merge bug fixes from SALOME_3_DS branch

[tools/install.git] / config_files / HappyDoc-r2_1.sh

diff --git a/config_files/HappyDoc-r2_1.sh b/config_files/HappyDoc-r2_1.sh
index 2fc19ce50df64abf9a8f79ac03659754718536eb..03ad524bc42dc86154b395bfbf8200c92f07526a 100755 (executable)
--- a/config_files/HappyDoc-r2_1.sh
+++ b/config_files/HappyDoc-r2_1.sh
@@ -1,14 +1,16 @@
 #!/bin/sh
 
 check_version(){
-check_lib_version happydoc ${PYTHONHOME}/bin
+check_lib_version happydoc $PATH
 if [ "$?" -ne "0" ]; then
    return 1
 fi
-ver=`happydoc | grep "HappyDoc version 2.1"`  
-if [ -n "$ver" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
+happydoc 2&> /dev/null
+if [ "$?" -eq "0" ]; then
+    ver=`happydoc | grep "HappyDoc version 2.1" | sort -u | awk '{print $NF}'`
+    if [ "$ver" == "2.1" ]; then
+       return 0
+    fi
 fi
 return 1
 }
@@ -17,7 +19,7 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PATH=\${INSTALL_ROOT}/${PRODUCT}/bin:\${PATH}
-export PYTHONPATH=\${INSTALL_ROOT}/${PRODUCT}/lib/python2.2/site-packages:\${PYTHONPATH}
+export PYTHONPATH=\${INSTALL_ROOT}/${PRODUCT}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -28,6 +30,7 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 try_native(){
 happydoc="`find_in_path happydoc ${PATH}`"
 if [ -n "${happydoc}" ] ; then
+    ver=`happydoc | grep "HappyDoc version 2.1" | sort -u | awk '{print $NF}'`
     cat > ${INSTALL_WORK}/try_native.py <<EOF 
 import sys
 try :
@@ -37,10 +40,12 @@ except ImportError, r :
     sys.exit(1)
 EOF
     python ${INSTALL_WORK}/try_native.py
-    if [ $? -eq 0 ] ; then
+    if [ $? -eq 0 ] && [ "$ver" == "2.1" ] ; then
        tmp="${happydoc} ${happydoc} \${PATH} ${PATH}";  
        path=`sort_path ${tmp}`
-       pythonpath="`find_in_path happydocset ${PYTHONPATH}`"
+       pythonpath=`python -c "import happydoclib; print happydoclib.__file__" 2>/dev/null`
+       pythonpath=`dirname $pythonpath`
+       pythonpath=`dirname $pythonpath`
        tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}";  
        pythonpath=`sort_path ${tmp}`
        cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
@@ -73,7 +78,7 @@ check_jb tar xfz ${SOURCE_DIR}/HappyDoc_r2_1.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
 check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_DIR}
-#file_pth=${PRODUCT_DIR}/lib/python2.2/site-packages/happydoclib.pth
+#file_pth=${PRODUCT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/happydoclib.pth
 #if [ ! -f ${file_pth} ] ; then
 #    touch ${file_pth}
 #    cat > ${file_pth} <<EOF 
@@ -81,12 +86,16 @@ check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_
 #EOF
 #fi
 
-rm -fr ${PRODUCT_WORK}
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 print_env
 }
 
 install_binary()
 {
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
 check_jb tar xfz ${SOURCE_DIR}/HappyDoc-r2_1.tar.gz -C ${INSTALL_ROOT}
 
 print_env