* doc/Doxyfile.in * doc/Makefile.am * doc/license.dox * doc/license_commercial.dox * doc/mainpage.dox --- ChangeLog | 10 ++++++++++ doc/Doxyfile.in | 3 ++- doc/Makefile.am | 2 ++ doc/license.dox | 15 +++++++++++++++ doc/license_commercial.dox | 6 ++++++ doc/mainpage.dox | 4 ++-- 6 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 doc/license.dox create mode 100644 doc/license_commercial.dox diff --git a/ChangeLog b/ChangeLog index 98ad275..2344721 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2012-02-27 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Add details about licensing. + + * doc/Doxyfile.in + * doc/Makefile.am + * doc/license.dox + * doc/license_commercial.dox + * doc/mainpage.dox + +2012-02-27 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * doc/Doxyfile.in: Do not warn if undocumented. 2012-02-01 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 8474dc6..b53bbe8 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -100,7 +100,8 @@ EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = *spe.hh EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::* EXAMPLE_PATH = @top_srcdir@/doc/ \ - @builddir@ + @builddir@ \ + @top_srcdir@ EXAMPLE_PATTERNS = *.cc \ *.cc.raw \ *.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index 1bf95d5..410316b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,6 +62,8 @@ REFMAN_deps = $(srcdir)/footer.html \ $(srcdir)/olena.bib \ $(srcdir)/contributors.dox \ $(srcdir)/bibliography.dox \ + $(srcdir)/license.dox \ + $(srcdir)/license_commercial.dox \ contributors.html \ lrde_olena.html diff --git a/doc/license.dox b/doc/license.dox new file mode 100644 index 0000000..eb9a8e4 --- /dev/null +++ b/doc/license.dox @@ -0,0 +1,15 @@ +/*! \page gplv2 "GNU General Public License (GPL)" + +Olena and its modules are Copyright (C) 2011 EPITA Research and +Development Laboratory (LRDE). +<br>Olena and its modules are released under GNU GPL v2. + + +\section gplv2sec "The GNU General Public License (Version 2)" + +Reference : <a href="http://www.gnu.org/licenses/gpl.html">GNU General +Public License</a> + +\verbinclude COPYING + +*/ \ No newline at end of file diff --git a/doc/license_commercial.dox b/doc/license_commercial.dox new file mode 100644 index 0000000..0ece2b5 --- /dev/null +++ b/doc/license_commercial.dox @@ -0,0 +1,6 @@ +/*! \page commercial "Commercial Use" + + < Under construction > + + Please contact us : olena(a)lrde.epita.fr +*/ \ No newline at end of file diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 8f49ca3..ea15c32 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -42,8 +42,8 @@ \li Online Resources </td> <td> - \li GNU GPL - \li Commercial Use + \li \ref gplv2 "GNU GPL" + \li \ref commercial "Commercial Use" </td> <td>&nbsp;</td> </tr> -- 1.7.2.5