diff --git a/general/genutils/graphviz.xml b/general/genutils/graphviz.xml index 22b32410f7..896b891b9e 100644 --- a/general/genutils/graphviz.xml +++ b/general/genutils/graphviz.xml @@ -133,11 +133,13 @@ commands: -./configure --prefix=/usr && +sed "s:ruby-1.9:ruby-2.2:g" -i configure && +./configure --prefix=/usr && make - This package does not come with a test suite that provides meaningful results. + This package does not come with a test suite that provides + meaningful results. @@ -159,6 +161,17 @@ make + + Command Explanations + + + sed "s:ruby-1.9:ruby-2.2:g" -i configure: Use this + command, if ruby-2.2.0 is installed and you wish + Graphviz built with support for it. + + + + Configuring Graphviz diff --git a/general/prog/doxygen.xml b/general/prog/doxygen.xml index b0ffa29499..dfe9dce69e 100644 --- a/general/prog/doxygen.xml +++ b/general/prog/doxygen.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -92,9 +92,11 @@ , , - , - (for doxywizard) and - + (with clang), + or , + (for doxywizard), + , and + (for doxyindexer) User Notes: @@ -142,15 +144,25 @@ make Command Explanations - : Use this parameter if - Qt4 is installed and you wish to build the - GUI front-end. If both Qt4 and - Qt5 are installed, use - source setqt4. If Qt4 is - installed in /opt, issue - export QTDIR=$QT4DIR. + : Use this switch if + Qt4 is installed and you wish to build the GUI + front-end. If both Qt4 and + Qt5 are installed, use source + setqt4. If Qt4 is installed in + /opt, issue export + QTDIR=$QT4DIR. + + : Use this switch if + xapian is installed and you wish to build + external search tools (doxysearch and doxyindexer). + + + + : Use this switch if + llvm with clang are + installed, to add support for libclang parsing. @@ -179,7 +191,8 @@ make - doxygen and optionally, doxywizard + doxygen and optionally, + doxywizard, doxyindexer and doxysearch.cgi None @@ -223,6 +236,34 @@ make + + doxyindexer + + + generates a search index called doxysearch.db + from one or more search data files produced by + doxygen. See, e.g. . + + + doxyindexer + + + + + + doxysearch.cgi + + + is a CGI program to search the data indexed by + doxyindexer. + + + doxysearch.cgi + + + + diff --git a/general/prog/ruby.xml b/general/prog/ruby.xml index c08c1dfa3b..143e360cec 100644 --- a/general/prog/ruby.xml +++ b/general/prog/ruby.xml @@ -11,8 +11,8 @@ --> - - + + ]> @@ -96,13 +96,27 @@ Install Ruby by running the following - commands: + command: ./configure --prefix=/usr \ --enable-shared \ - --docdir=/usr/share/doc/ruby-&ruby-version; && -make + --docdir=/usr/share/doc/ruby-&ruby-version; + + + Optionally, build the CAPI documents by running the following + commands: + + +cp -v template/Doxyfile.tmpl Doxyfile && +doxygen + + + Compile and link Ruby by running the following + command: + + +make To test the results, issue: make test. diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 783e113877..99c747cb5a 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -47,6 +47,17 @@ December 28th, 2014 + + [fernando] - ruby-2.2.0: fix build of capi docs and statistics + to make explicit docs part. + + + [fernando] - graphviz-2.38.0: fix build with ruby-2.2.0. + + + [fernando] - Update to doxygen-1.8.9. Fixes + #5983. + [igor] - Update to links-2.9. Fixes #5980. diff --git a/packages.ent b/packages.ent index 5c5fbb0bd7..938ed2577a 100644 --- a/packages.ent +++ b/packages.ent @@ -251,7 +251,7 @@ - +