%define name myplc-docs
%define version 5.0
-%define taglevel 13
+%define taglevel 19
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
rm -rf $RPM_BUILD_ROOT
# using the new lowercase names, and handling legacy
+[ -d myplc ] || ln -s MyPLC myplc
[ -d plcapi ] || ln -s PLCAPI plcapi
-[ -d monitor ] || ln -s Monitor monitor
[ -d nodemanager ] || ln -s NodeManager nodemanager
-[ -d myplc ] || ln -s MyPLC myplc
+[ -d monitor ] || ln -s Monitor monitor
pushd plcapi
+# june2011 & f12, latex issues weird warnings, might need to try twice
+make -C doc PLCAPI.pdf || make -C doc PLCAPI.pdf
# beware that making the pdf file somehow overwrites the html
-make -C doc PLCAPI.pdf
rm -f doc/PLCAPI.html
-make -C doc PLCAPI.html
+make -C doc PLCAPI.html || make -C doc PLCAPI.html
popd
pushd nodemanager
# beware that making the pdf file somehow overwrites the html
-make -C doc NMAPI.pdf
+make -C doc NMAPI.pdf || make -C doc NMAPI.pdf
rm -f doc/NMAPI.html
-make -C doc NMAPI.html
+make -C doc NMAPI.html || make -C doc NMAPI.html
popd
+# not everyone rebuilds monitor, so make it optional
+if [ -d monitor ] ; then
pushd monitor
# beware that making the pdf file somehow overwrites the html
-make -C docs Monitor.pdf
+make -C docs Monitor.pdf || make -C docs Monitor.pdf
rm -f docs/Monitor.html
-make -C docs Monitor.html
+make -C docs Monitor.html || make -C docs Monitor.html
popd
+fi
%install
for ext in pdf html; do
install -D -m 444 plcapi/doc/PLCAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.$ext
install -D -m 444 nodemanager/doc/NMAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.$ext
+ if [ -d monitor ] ; then
install -D -m 444 monitor/docs/Monitor.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.$ext
+ fi
done
./myplc/docbook2drupal.sh "PLC API Documentation (%{pldistro})" \
./myplc/docbook2drupal.sh "Node Manager API Documentation (%{pldistro})" \
$RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.html \
$RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.php
+if [ -d monitor ] ; then
./myplc/docbook2drupal.sh "Monitor API Documentation (%{pldistro})" \
$RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.html \
$RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.php
+fi
%clean
rm -rf $RPM_BUILD_ROOT
/var/www/html/planetlab/doc/
%changelog
+* Mon Sep 26 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-19
+- new maintenance/monitoring script spot-aliens to look for glitches in refreshpeer+sfa
+
+* Tue Jun 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-18
+- new settings for myslice (comon&tophat) and monitor (db)
+- removed mentions of chroot in description
+- can redo myplc-docs on broken f12-latex
+- set short_open_tag in php.ini
+- fixes in gen-sites-xml (is that still used ?)
+- partial-repo.sh has moved to 'build' where it more belongs
+- tweaks in convenience tool 'mtail'
+
+* Tue Mar 22 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-17
+- fixed changelog, no change from 5.0-16
+
+* Mon Mar 21 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-16
+- requires ed for the plc.d/packages step
+- sirius initscript to handle stop and restart
+
+* Fri Feb 04 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-15
+- ignore steps in db-config.d if they have a '.' or '~' in their name
+
+* Wed Jan 26 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-14
+- can redo myplc-docs without the doc for monitor
+
* Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-13
- no semantic change - just fixed specfile for git URL