From: inv Date: Mon, 2 Apr 2012 12:23:25 +0000 (+0000) Subject: SALOME 6.5.0 preparation: doxygen 1.7.3 -> 1.8.0 X-Git-Tag: V6_5_0b1~63 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=53418353b12914a3fcd4faaf0840ac429e2fb30e;p=tools%2Finstall.git SALOME 6.5.0 preparation: doxygen 1.7.3 -> 1.8.0 --- diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index 4128dc2..e7a75e2 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -612,10 +612,10 @@ type="prerequisite" description="Documentation system for C++, C, Java, IDL, etc."> + script="doxygen.sh"/> + script="doxygen.sh"/> + script="doxygen.sh"/> + script="doxygen.sh"/> + script="doxygen.sh"/> + script="doxygen.sh"/> + script="doxygen.sh"/> + script="doxygen.sh"/> + script="doxygen.sh"/> + script="doxygen.sh"/> + script="doxygen.sh"/> 0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` -min_ver=`echo $ver | awk -F. '{if(NF>1) print $2; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` -rel_ver=`echo $ver | awk -F. '{if(NF>2) print $3; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` -let ver=$maj_ver*10000+$min_ver*100+$rel_ver -if [ $ver -eq ${DOXYGEN_XVERSION} ] ; then - return 0 -fi -return 1 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE.LOG <0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` +min_ver=`echo $ver | awk -F. '{if(NF>1) print $2; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` +rel_ver=`echo $ver | awk -F. '{if(NF>2) print $3; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` +let ver=$maj_ver*10000+$min_ver*100+$rel_ver +if [ $ver -eq ${DOXYGEN_XVERSION} ] ; then + return 0 +fi +return 1 +} + +print_env_bin() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE.LOG <" << endl; - m_nts << "" << endl; -diff -Naur doxygen-1.7.3_orig/src/doxygen.cpp doxygen-1.7.3_new/src/doxygen.cpp ---- doxygen-1.7.3_orig/src/doxygen.cpp 2010-12-21 23:41:44.000000000 +0300 -+++ doxygen-1.7.3_new/src/doxygen.cpp 2011-04-08 15:33:52.000000000 +0400 -@@ -7940,7 +7940,7 @@ - - QCString title=root->args.stripWhiteSpace(); - if (title.isEmpty()) title=theTranslator->trMainPage(); -- QCString name = Config_getBool("GENERATE_TREEVIEW")?"main":"index"; -+ QCString name = /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index"; - addRefItem(root->sli, - name, - "page", -@@ -7965,7 +7965,7 @@ - { - //printf("Found main page! \n======\n%s\n=======\n",root->doc.data()); - QCString title=root->args.stripWhiteSpace(); -- QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index"; -+ QCString indexName= /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index"; - Doxygen::mainPage = new PageDef(root->fileName,root->startLine, - indexName, root->brief+root->doc+root->inbodyDocs,title); - //setFileNameForSections(root->anchors,"index",Doxygen::mainPage); -diff -Naur doxygen-1.7.3_orig/src/latexgen.cpp doxygen-1.7.3_new/src/latexgen.cpp ---- doxygen-1.7.3_orig/src/latexgen.cpp 2010-12-26 18:35:34.000000000 +0300 -+++ doxygen-1.7.3_new/src/latexgen.cpp 2011-04-08 15:36:06.000000000 +0400 -@@ -1005,7 +1005,7 @@ - break; - case isMainPage: - { -- QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index"; -+ QCString indexName= /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index"; - t << "}\n\\label{index}"; - if (Config_getBool("PDF_HYPERLINKS")) t << "\\hypertarget{index}{}"; - t << "\\input{" << indexName << "}\n"; -diff -Naur doxygen-1.7.3_orig/src/resize.js doxygen-1.7.3_new/src/resize.js ---- doxygen-1.7.3_orig/src/resize.js 2010-12-12 21:53:19.000000000 +0300 -+++ doxygen-1.7.3_new/src/resize.js 2011-04-08 19:04:50.000000000 +0400 -@@ -1,5 +1,6 @@ - var cookie_namespace = 'doxygen'; - var sidenav,navtree,content,header; -+var navrows = new Array(); - - function readCookie(cookie) - { -@@ -36,27 +37,45 @@ - - function resizeWidth() - { -- var windowWidth = $(window).width() + "px"; -+ var windowWidth = $(window).width(); - var sidenavWidth = $(sidenav).width(); - content.css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar -+ for(var i = 1; i <= 4;i++) { -+ if(navrows[i] != null) -+ navrows[i].css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar -+ navrows[i].css({width:windowWidth-parseInt(sidenavWidth) - 6 + "px"}); -+ } -+ - writeCookie('width',sidenavWidth, null); - } - - function restoreWidth(navWidth) - { -- var windowWidth = $(window).width() + "px"; -+ var windowWidth = $(window).width(); - content.css({marginLeft:parseInt(navWidth)+6+"px"}); - sidenav.css({width:navWidth + "px"}); -+ for(var i = 1; i <= 4;i++) { -+ if(navrows[i] != null) -+ navrows[i].css({marginLeft:parseInt(navWidth)+6+"px"}); -+ navrows[i].css({width:windowWidth-parseInt(navWidth) - 6 + "px"}); -+ } - } - - function resizeHeight() - { - var headerHeight = header.height(); - var footerHeight = footer.height(); -+ var navrowsH = 0; -+ for(var i = 1; i <= 4;i++) { -+ if(navrows[i] != null) -+ navrowsH = navrowsH + navrows[i].height(); -+ } -+ - var windowHeight = $(window).height() - headerHeight - footerHeight; -+ var treeH = windowHeight + navrowsH; - content.css({height:windowHeight + "px"}); -- navtree.css({height:windowHeight + "px"}); -- sidenav.css({height:windowHeight + "px",top: headerHeight+"px"}); -+ navtree.css({height:treeH +"px"}); -+ sidenav.css({height:treeH +"px", top: headerHeight+"px"}); - } - - function initResizable() -@@ -66,6 +85,10 @@ - content = $("#doc-content"); - navtree = $("#nav-tree"); - footer = $("#nav-path"); -+ for(var i = 1; i <= 4;i++) { -+ navrows[i] = $("#navrow"+i); -+ } -+ - $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } }); - $(window).resize(function() { resizeHeight(); }); - var width = readCookie('width'); -diff -Naur doxygen-1.7.3_orig/src/rtfgen.cpp doxygen-1.7.3_new/src/rtfgen.cpp ---- doxygen-1.7.3_orig/src/rtfgen.cpp 2010-06-17 15:49:09.000000000 +0400 -+++ doxygen-1.7.3_new/src/rtfgen.cpp 2011-04-08 15:34:30.000000000 +0400 -@@ -612,7 +612,8 @@ - t << "{\\tc \\v " << substitute(Doxygen::mainPage->title(),"%","") << "}"<< endl; - } - t << "{\\field\\fldedit{\\*\\fldinst INCLUDETEXT \""; -- if (Config_getBool("GENERATE_TREEVIEW")) t << "main"; else t << "index"; -+ //if (Config_getBool("GENERATE_TREEVIEW")) t << "main"; else -+ t << "index"; - t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n"; - break; - //case isPackageIndex: - diff --git a/config_files/patches/doxygen-1.8.0.patch b/config_files/patches/doxygen-1.8.0.patch new file mode 100755 index 0000000..a2423ff --- /dev/null +++ b/config_files/patches/doxygen-1.8.0.patch @@ -0,0 +1,71 @@ +diff -Naur doxygen-1.7.3_orig/src/resize.js doxygen-1.7.3_new/src/resize.js +--- doxygen-1.7.3_orig/src/resize.js 2010-12-12 21:53:19.000000000 +0300 ++++ doxygen-1.7.3_new/src/resize.js 2011-04-08 19:04:50.000000000 +0400 +@@ -1,5 +1,6 @@ + var cookie_namespace = 'doxygen'; + var sidenav,navtree,content,header; ++var navrows = new Array(); + + function readCookie(cookie) + { +@@ -36,27 +37,45 @@ + + function resizeWidth() + { +- var windowWidth = $(window).width() + "px"; ++ var windowWidth = $(window).width(); + var sidenavWidth = $(sidenav).width(); + content.css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar ++ for(var i = 1; i <= 4;i++) { ++ if(navrows[i] != null) ++ navrows[i].css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar ++ navrows[i].css({width:windowWidth-parseInt(sidenavWidth) - 6 + "px"}); ++ } ++ + writeCookie('width',sidenavWidth, null); + } + + function restoreWidth(navWidth) + { +- var windowWidth = $(window).width() + "px"; ++ var windowWidth = $(window).width(); + content.css({marginLeft:parseInt(navWidth)+6+"px"}); + sidenav.css({width:navWidth + "px"}); ++ for(var i = 1; i <= 4;i++) { ++ if(navrows[i] != null) ++ navrows[i].css({marginLeft:parseInt(navWidth)+6+"px"}); ++ navrows[i].css({width:windowWidth-parseInt(navWidth) - 6 + "px"}); ++ } + } + + function resizeHeight() + { + var headerHeight = header.height(); + var footerHeight = footer.height(); ++ var navrowsH = 0; ++ for(var i = 1; i <= 4;i++) { ++ if(navrows[i] != null) ++ navrowsH = navrowsH + navrows[i].height(); ++ } ++ + var windowHeight = $(window).height() - headerHeight - footerHeight; ++ var treeH = windowHeight + navrowsH; + content.css({height:windowHeight + "px"}); +- navtree.css({height:windowHeight + "px"}); +- sidenav.css({height:windowHeight + "px",top: headerHeight+"px"}); ++ navtree.css({height:treeH +"px"}); ++ sidenav.css({height:treeH +"px", top: headerHeight+"px"}); + } + + function initResizable() +@@ -66,6 +85,10 @@ + content = $("#doc-content"); + navtree = $("#nav-tree"); + footer = $("#nav-path"); ++ for(var i = 1; i <= 4;i++) { ++ navrows[i] = $("#navrow"+i); ++ } ++ + $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } }); + $(window).resize(function() { resizeHeight(); }); + var width = readCookie('width');