From ade9eeeda0e50b76c948aacfda9e20593043d4af Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Tue, 16 May 2006 15:10:28 +0000
Subject: [PATCH] New version of doxygen (1.4.6) is introduced

---
 config.xml                                    |   6 +-
 config_Debian_3.1.xml                         |   6 +-
 config_Mandriva_2006.0.xml                    |   8 +-
 config_files/doxygen-1.4.2.sh                 | 145 ------------------
 .../{doxygen-1.4.4.sh => doxygen-1.4.6.sh}    |   8 +-
 5 files changed, 14 insertions(+), 159 deletions(-)
 delete mode 100755 config_files/doxygen-1.4.2.sh
 rename config_files/{doxygen-1.4.4.sh => doxygen-1.4.6.sh} (96%)

diff --git a/config.xml b/config.xml
index eba502d..e9a3c60 100644
--- a/config.xml
+++ b/config.xml
@@ -177,15 +177,15 @@
 	   temporarydiskspace="44340"
 	   script="graphviz-2.2.1.sh"/>
   <product name="Doxygen"
-           version="1.4.2" 
+           version="1.4.6" 
            description="Documentation system for C++, C, Java, IDL, etc."
-           install="use native"
+           install="install binaries"
 	   supported="use native,install sources,install binaries"
 	   disable="false"
 	   dependancies="gcc,Qt,Graphviz"
 	   installdiskspace="5116"
 	   temporarydiskspace="38060"
-	   script="doxygen-1.4.2.sh"/>
+	   script="doxygen-1.4.6.sh"/>
   <product name="netgen" 
            version="4.5" 
            description="Quadrangle meshing algorithmic tool"
diff --git a/config_Debian_3.1.xml b/config_Debian_3.1.xml
index 269aab8..4c8dc05 100755
--- a/config_Debian_3.1.xml
+++ b/config_Debian_3.1.xml
@@ -177,15 +177,15 @@
 	   temporarydiskspace="44340"
 	   script="graphviz-2.2.1.sh"/>
   <product name="Doxygen"
-           version="1.4.2" 
+           version="1.4.6" 
            description="Documentation system for C++, C, Java, IDL, etc."
            install="install binaries"
-	   supported="use native,install sources,install binaries"
+	   supported="use native,install binaries"
 	   disable="false"
 	   dependancies="gcc,Qt,Graphviz"
 	   installdiskspace="5116"
 	   temporarydiskspace="38060"
-	   script="doxygen-1.4.2.sh"/>
+	   script="doxygen-1.4.6.sh"/>
   <product name="netgen" 
            version="4.5" 
            description="Quadrangle meshing algorithmic tool"
diff --git a/config_Mandriva_2006.0.xml b/config_Mandriva_2006.0.xml
index 8be98a4..f47ce29 100755
--- a/config_Mandriva_2006.0.xml
+++ b/config_Mandriva_2006.0.xml
@@ -20,7 +20,7 @@
            version="8.4.5" 
            description="Tcl/Tk library"
            install="use native"
-	   supported="use native,install sources,install binaries"
+	   supported="use native,install binaries"
 	   disable="false"
 	   dependancies="gcc"
 	   installdiskspace="23060"
@@ -177,15 +177,15 @@
 	   temporarydiskspace="44340"
 	   script="graphviz-2.2.1.sh"/>
   <product name="Doxygen"
-           version="1.4.4" 
+           version="1.4.6" 
            description="Documentation system for C++, C, Java, IDL, etc."
-           install="use native"
+           install="install binaries"
 	   supported="use native,install sources,install binaries"
 	   disable="false"
 	   dependancies="gcc,Qt,Graphviz"
 	   installdiskspace="6090"
 	   temporarydiskspace="32355"
-	   script="doxygen-1.4.4.sh"/>
+	   script="doxygen-1.4.6.sh"/>
   <product name="netgen" 
            version="4.5"
            description="Quadrangle meshing algorithmic tool"
diff --git a/config_files/doxygen-1.4.2.sh b/config_files/doxygen-1.4.2.sh
deleted file mode 100755
index ed32de1..0000000
--- a/config_files/doxygen-1.4.2.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-check_version()
-{
-check_lib_version doxygen $PATH
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-check_lib_version doxytag $PATH
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-check_lib_version doxywizard $PATH
-if [ "$?" -ne "0" ]; then
-   return 1
-fi
-ver=`doxygen --version`
-if [ "$ver" == "1.4.2" ]; then
-    return 0
-fi
-return 1
-}
-
-print_env()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export PATH=\${INSTALL_ROOT}/${PRODUCT}/bin:\${PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-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
-    doxygen="`find_in_path doxygen ${PATH}`"
-    tmp="${doxygen} ${doxygen} \${PATH} ${PATH}";  
-    path=`sort_path ${tmp}`
-    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export PATH=${path}
-##
-EOF
-    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    return 0
-fi
-return 1;
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-return $?
-}
-
-install_source()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/doxygen-1.4.2.tar.gz -C ${INSTALL_WORK}
-
-cd ${PRODUCT_WORK}
-makedir ${PRODUCT_DIR}
-# vsr: fix a bug on Mandrake-10.1: wrong qt library reference
-sed -e "s/-lqt$/-lqt-mt/g" ./tmake/lib/linux-g++/tmake.conf > ./tmake/lib/linux-g++/tmake.conf.new
-mv ./tmake/lib/linux-g++/tmake.conf.new ./tmake/lib/linux-g++/tmake.conf
-# 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`
-# vsr: fix bug on debianex: problem on with unistd.h file
-(cd src; mv unistd.h unistd.h.backup)
-files=`egrep -R -e "^[[:space:]]*unistd" * | awk -F: '{print $1}'`
-for f in $files ; do
-  sed -e '/^[[:space:]]*unistd/d' $f > $f"_"
-  mv $f"_" $f
-done
-# configuring
-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
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-
-# vsr: skip installing docs (problems on Debian)
-#which epstopdf >/dev/null 2>&1;  ISFOUND=$?
-#if [ ${ISFOUND} -eq 0 ] ; then  which makeindex >/dev/null 2>&1; ISFOUND=$?; fi
-#if [ ${ISFOUND} -eq 0 ] ; then  which latex >/dev/null 2>&1; ISFOUND=$?; fi
-##if [ ${ISFOUND} -eq 0 ] ; then  which latex2html >/dev/null 2>&1; ISFOUND=$?; fi
-#if [ ${ISFOUND} -eq 0 ] ; then  which pdflatex >/dev/null 2>&1; ISFOUND=$?; fi
-#if [ ${ISFOUND} -eq 0 ] ; then  which pslatex >/dev/null 2>&1; ISFOUND=$?; fi
-##if [ ${ISFOUND} -eq 0 ] ; then  which pstoimg >/dev/null 2>&1; ISFOUND=$?; fi
-#if [ ${ISFOUND} -eq 0 ] ; then
-#    check_job ${PRODUCT_DIR}/MAKEDOCS.LOG make docs
-#    check_job ${PRODUCT_DIR}/MAKEINSTALLDOCS.LOG make install_docs
-#else
-#    cat >> ${PRODUCT_DIR}/MAKEDOCS.LOG <<EOF
-#Can't find \"epstopdf\" and \"latex\" or another executables on the computer.
-#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}
-##    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!"
-##    echo -n "Would you like continue : (Y,N) [Y] : "
-##    read rep;
-##    rep=`echo $rep  | tr "[A-Z]" "[a-z]"`
-##    if test -z $rep || [ $rep != "y" ] ; then
-##	rm -fr ${PRODUCT_WORK}
-##	exit 1
-##    fi
-#fi
-
-#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}/doxygen-1.4.2.tar.gz -C ${INSTALL_ROOT}
-
-print_env
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="doxygen" ; fi
-export PRODUCT="doxygen-1.4.2"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/doxygen-1.4.4.sh b/config_files/doxygen-1.4.6.sh
similarity index 96%
rename from config_files/doxygen-1.4.4.sh
rename to config_files/doxygen-1.4.6.sh
index 9a891d7..31c9c2a 100755
--- a/config_files/doxygen-1.4.4.sh
+++ b/config_files/doxygen-1.4.6.sh
@@ -15,7 +15,7 @@ if [ "$?" -ne "0" ]; then
    return 1
 fi
 ver=`doxygen --version`
-if [ "$ver" == "1.4.4" ]; then
+if [ "$ver" == "1.4.6" ]; then
     return 0
 fi
 return 1
@@ -60,7 +60,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/doxygen-1.4.4.tar.gz -C ${INSTALL_WORK}
+check_jb tar xfz ${SOURCE_DIR}/doxygen-1.4.6.tar.gz -C ${INSTALL_WORK}
 
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
@@ -115,7 +115,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/doxygen-1.4.4.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/doxygen-1.4.6.tar.gz -C ${INSTALL_ROOT}
 which epstopdf >/dev/null 2>&1;  ISFOUND=$?
 if [ ${ISFOUND} -eq 0 ] ; then  which makeindex >/dev/null 2>&1; ISFOUND=$?; fi
 if [ ${ISFOUND} -eq 0 ] ; then  which latex >/dev/null 2>&1; ISFOUND=$?; fi
@@ -152,7 +152,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="doxygen" ; fi
-export PRODUCT="doxygen-1.4.4"
+export PRODUCT="doxygen-1.4.6"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
-- 
2.39.2