aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-10 10:13:29 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-10 10:13:44 +0100
commitb2d9a73e349719efd0f520607bffb08d717a2b30 (patch)
tree01a1693d1a472d72a4ed30fdedaf503afafbcd79
parentb1da40487a9ad8924e3736997182e1bfa09ea9ef (diff)
downloadpaludis-b2d9a73e349719efd0f520607bffb08d717a2b30.tar.gz
paludis-b2d9a73e349719efd0f520607bffb08d717a2b30.tar.xz
Add in basic cave HTML pages
-rw-r--r--.gitignore1
-rw-r--r--configure.ac6
-rw-r--r--doc/clients/Makefile.am10
-rw-r--r--doc/clients/index.html.part9
-rw-r--r--doc/clients/toplinks.html.part.in45
-rw-r--r--doc/index.html.part.in9
6 files changed, 65 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 24206a7..07360f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,6 +80,7 @@ paludis-*.*.*.tar.bz2
/doc/clients/accerso.html
/doc/clients/adjutrix.html
/doc/clients/appareo.html
+/doc/clients/cave.html
/doc/clients/contrarius.html
/doc/clients/footer.html.part
/doc/clients/header.html.part
diff --git a/configure.ac b/configure.ac
index 609f24a..424c28d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1415,11 +1415,7 @@ dnl {{{ clients
ALL_CLIENTS="accerso adjutrix appareo cave importare inquisitio instruo paludis reconcilio"
ALL_CLIENTS_HTML=""
for a in $ALL_CLIENTS ; do
- if test x$a = xcave ; then
- true
- else
- ALL_CLIENTS_HTML="$ALL_CLIENTS_HTML $a.html"
- fi
+ ALL_CLIENTS_HTML="$ALL_CLIENTS_HTML $a.html"
done
DEFAULT_CLIENTS="adjutrix importare paludis reconcilio"
AC_MSG_CHECKING([which clients to build...])
diff --git a/doc/clients/Makefile.am b/doc/clients/Makefile.am
index 23e7cd5..05b61f6 100644
--- a/doc/clients/Makefile.am
+++ b/doc/clients/Makefile.am
@@ -76,6 +76,16 @@ appareo.html : header.html.part footer.html.part
fi ; } && \
cat footer.html.part ; } > $@
+cave.html : header.html.part footer.html.part
+ { cat header.html.part && { \
+ if test -x $(top_builddir)/src/clients/cave/man-cave ; then \
+ $(top_builddir)/src/clients/cave/man-cave --html ; \
+ else \
+ echo "<h1>cave</h1>"; \
+ echo "<p>Sorry, documentation was generated without support for the cave client.</p>" ; \
+ fi ; } && \
+ cat footer.html.part ; } > $@
+
inquisitio.html : header.html.part footer.html.part
{ cat header.html.part && { \
if test -x $(top_builddir)/src/clients/inquisitio/man-inquisitio ; then \
diff --git a/doc/clients/index.html.part b/doc/clients/index.html.part
index b194f8a..69eab82 100644
--- a/doc/clients/index.html.part
+++ b/doc/clients/index.html.part
@@ -5,7 +5,14 @@
<p>For users:</p>
<ul>
- <li><a href="paludis.html">paludis</a>, the console package management client.</li>
+ <li><a href="cave.html">cave</a>, the new, improved and not yet entirely feature-complete console package management
+ client.</li>
+</ul>
+
+<p>Or for users who prefer to continue using the original clients for now:</p>
+
+<ul>
+ <li><a href="paludis.html">paludis</a>, the original console package management client.</li>
<li><a href="importare.html">importare</a>, the unpackaged package installer.</li>
<li><a href="inquisitio.html">inquisitio</a>, the search client.</li>
<li><a href="reconcilio.html">reconcilio</a>, a tool for rebuilding packages with broken linkage.</li>
diff --git a/doc/clients/toplinks.html.part.in b/doc/clients/toplinks.html.part.in
index 34cd8a5..0aa7c48 100644
--- a/doc/clients/toplinks.html.part.in
+++ b/doc/clients/toplinks.html.part.in
@@ -14,11 +14,15 @@
</td>
<td class="currentpage">
+ <a href="###TOPURI###clients/cave.html">cave</a>
+ </td>
+
+ <td class="currentpage">
<a href="###TOPURI###clients/paludis.html">paludis</a>
</td>
<td class="currentpage">
- <a href="###TOPURI###clients/appareo.html">appareo</a>
+ <a href="###TOPURI###clients/accerso.html">accerso</a>
</td>
</tr>
@@ -28,10 +32,15 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###clients/inquisitio.html">inquisitio</a>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ <a href="###TOPURI###clients/importare.html">importare</a>
</td>
<td class="currentpage">
+ <a href="###TOPURI###clients/adjutrix.html">adjutrix</a>
</td>
</tr>
@@ -41,11 +50,15 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###clients/importare.html">importare</a>
+ &nbsp;
</td>
<td class="currentpage">
- &nbsp;
+ <a href="###TOPURI###clients/inquisitio.html">inquisitio</a>
+ </td>
+
+ <td class="currentpage">
+ <a href="###TOPURI###clients/instruo.html">instruo</a>
</td>
</tr>
@@ -55,11 +68,15 @@
</td>
<td class="currentpage">
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
<a href="###TOPURI###clients/reconcilio.html">reconcilio</a>
</td>
<td class="currentpage">
- &nbsp;
+ <a href="###TOPURI###clients/appareo.html">appareo</a>
</td>
</tr>
@@ -69,7 +86,11 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###clients/accerso.html">accerso</a>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
</td>
<td class="currentpage">
@@ -83,7 +104,11 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###clients/adjutrix.html">adjutrix</a>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
</td>
<td class="currentpage">
@@ -97,7 +122,11 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###clients/instruo.html">instruo</a>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
</td>
<td class="currentpage">
diff --git a/doc/index.html.part.in b/doc/index.html.part.in
index 5bda657..66566e7 100644
--- a/doc/index.html.part.in
+++ b/doc/index.html.part.in
@@ -75,7 +75,14 @@ the exheres repository format.</p>
<p>For users:</p>
<ul>
- <li><a href="clients/paludis.html">paludis</a>, the console package management client.</li>
+ <li><a href="clients/cave.html">cave</a>, the new, improved and not yet entirely feature-complete console package
+ management client.</li>
+</ul>
+
+<p>Or for users who prefer to continue using the original clients for now:</p>
+
+<ul>
+ <li><a href="clients/paludis.html">paludis</a>, the original console package management client.</li>
<li><a href="clients/importare.html">importare</a>, the unpackaged package installer.</li>
<li><a href="clients/inquisitio.html">inquisitio</a>, the search client.</li>
<li><a href="clients/reconcilio.html">reconcilio</a>, a tool for rebuilding packages with broken linkage.</li>