* doc/Doxyfile.in, * doc/Makefile.am, * doc/header.html, * doc/mainpage.dox: Here. --- ChangeLog | 9 +++++++++ doc/Doxyfile.in | 6 +++--- doc/Makefile.am | 15 +++++++++++---- doc/header.html | 2 +- doc/mainpage.dox | 4 ++-- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff27a41..4316d83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-04-12 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Use relative paths in documentation. + + * doc/Doxyfile.in, + * doc/Makefile.am, + * doc/header.html, + * doc/mainpage.dox: Here. + 2013-04-10 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * doc/Makefile.am: Fix permissions on documentation files. diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 2e7c939..6cb8bfb 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -21,7 +21,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "Olena" -PROJECT_NUMBER = "@PACKAGE_VERSION@" +PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@" PROJECT_BRIEF = "An Image Processing Platform" PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp @@ -320,8 +320,8 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = @builddir@/../scribo/doc/scribo.tag=../../scribo/doc/user-refman/html \ - @builddir@/../milena/doc/milena.tag=../../milena/doc/user-refman/html +TAGFILES = @builddir@/../scribo/doc/scribo.tag=../../../scribo/doc/user-refman/html \ + @builddir@/../milena/doc/milena.tag=../../../milena/doc/user-refman/html GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES diff --git a/doc/Makefile.am b/doc/Makefile.am index bcc06af..cc41520 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -121,7 +121,7 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(DOXYGEN) $(DOXYFILE_USER) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(abs_top_srcdir)/,g" \ + sed -i -e "s,\@relcommondocpath\@,../../,g" \ -e "s,\@userrefman\@,$(USER_REFMAN),g" \ `find $(USER_REFMAN).tmp/html -name '*.html'` ## FIXME: Moving directories between file systems is not portable. @@ -212,9 +212,9 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) # Fix documentation paths chmod -R u+w $(DESTDIR)$(htmldir)/$(USER_REFMAN) - sed -i -e "s,$(abs_top_srcdir)/milena/doc,../milena,g" \ - -e "s,$(abs_top_srcdir)/scribo/doc,../scribo,g" \ - -e "s,$(abs_top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ + sed -i -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g" \ + -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g" \ + -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` ## Try GNU chmod's X mode before resorting to something slower but ## more standard. @@ -227,3 +227,10 @@ uninstall-local: # reference manual. chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN) rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) + + +doc-teamcity: + sed -i -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc/,g" \ + -e "s,../../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc/,g" \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc/,g" \ + `find $(USER_REFMAN).tmp/html -name '*.html'` diff --git a/doc/header.html b/doc/header.html index 7e9e03a..5373947 100644 --- a/doc/header.html +++ b/doc/header.html @@ -25,7 +25,7 @@ $extrastylesheet <tbody> <tr style="height: 56px;"> <!--BEGIN PROJECT_LOGO--> - <td id="projectlogo"><a href="@relcommondocpath@doc/@userrefman@/html/index.html"><img alt="Logo" src="$relpath$$projectlogo"/></a></td> + <td id="projectlogo"><a href="$relpath$@relcommondocpath@@userrefman@/html/index.html"><img alt="Logo" src="$relpath$$projectlogo"/></a></td> <!--END PROJECT_LOGO--> <!--BEGIN PROJECT_NAME--> <td style="padding-left: 0.5em;"> diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 65e5177..52f9c1e 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -19,8 +19,8 @@ </td> <td> \li \ref moduleslist - \li <a class="el" href="@relcommondocpath@milena/doc/user-refman/html/index.html">Milena</a> - \li <a class="el" href="@relcommondocpath@scribo/doc/user-refman/html/index.html">Scribo</a> + \li <a class="el" href="@relcommondocpath@../milena/doc/user-refman/html/index.html">Milena</a> + \li <a class="el" href="@relcommondocpath@../scribo/doc/user-refman/html/index.html">Scribo</a> \li Swilena </td> <td> -- 1.7.2.5