X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fdoxygen-1.3-rc2.sh;h=315ffd29374811c3919eca7cb6eb4f00f5da1a3c;hb=af1decc59e3bb8733afff4553de107330335513a;hp=0fe4380e0b76adf6109b881d30d433aaf7f5f692;hpb=35c39e5b8ddf0e868a37c0c8dd7511d857486581;p=tools%2Finstall.git

diff --git a/config_files/doxygen-1.3-rc2.sh b/config_files/doxygen-1.3-rc2.sh
index 0fe4380..315ffd2 100755
--- a/config_files/doxygen-1.3-rc2.sh
+++ b/config_files/doxygen-1.3-rc2.sh
@@ -15,9 +15,12 @@ if [ "$?" -ne "0" ]; then
    return 1
 fi
 check_lib_version doxywizard $PATH
-if [ "$?" -eq "0" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+ver=`doxygen --version`
+if [ "$ver" == "1.3-rc2" ]; then
+    return 0
 fi
 return 1
 }
@@ -58,7 +61,7 @@ return $?
 
 install_source()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" env_${PRODUCT_TYPE}.sh
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3-rc2.tar.gz -C ${INSTALL_WORK}
@@ -68,7 +71,7 @@ makedir ${PRODUCT_DIR}
 # vsr: fix bug - configure fails on Red Hat 9 because of incorrect autodetect check for install tool
 # so it is necessary to put it directly
 f_install="--install "`which install`
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --with-doxywizard --prefix ${PRODUCT_DIR} $f_install
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --with-doxywizard --prefix ${PRODUCT_DIR} $f_install
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -93,7 +96,7 @@ doxygen documentation will not be built!
 SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!
 EOF
     check_job ${PRODUCT_DIR}/MAKEDOCS.LOG make docs
-    rm -fr ${PRODUCT_WORK}
+#    rm -fr ${PRODUCT_WORK}
 #    echo -e "Can't find \"epstopdf\" and \"latex\" or another executables on the computer."
 #    echo -e "doxygen documentation will not be built!"
 #    echo -e "SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!"
@@ -106,13 +109,14 @@ EOF
 #    fi
 fi
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }
 
 install_binary()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" env_${PRODUCT_TYPE}.sh
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3-rc2.tar.gz -C ${INSTALL_ROOT}
@@ -130,7 +134,7 @@ doxygen documentation will not be built!
 SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!
 EOF
     check_job ${PRODUCT_DIR}/DOCS.LOG make
-    rm -fr ${PRODUCT_WORK}
+#    rm -fr ${PRODUCT_WORK}
 #    echo -e "Can't find \"epstopdf\" and \"latex\" or another executables on the computer."
 #    echo -e "doxygen documentation will not be built!"
 #    echo -e "SALOME DOCUMENTATION ALSO CAN NOT BE BUILT!"