Re: Cron <gnomeweb window> $HOME/bin/logify cvs-update-www.gnome.org

[Peter Williams <peter newton cx>]

OK, this is getting kind of annoying. The problem is that there are no
files in the directories
gnomeweb-wml/www.gnome.org/tour/docbook/nl/figures/ and
gnomeweb-wml/www.gnome.org/tour/docbook/sv/figures/. 

I assume this is because there hasn't been time to make translated
screenshots for these languages. The attached patch *ought* to make this
problem only result in a warning message, rather than a build error.
(Hard to test since I can't build the website with its /home/bmsmith XSL
stuff.) OK to commit?

(The patch also fixes an illegal leading space in a line higher up in
the Makefile.am)

Peter
 
On Wed, 2006-09-06 at 01:53 -0400, Cron Daemon wrote:
> Failure running:
> 
> cvs-update-www.gnome.org
> 
> Output can be seen at http://www.gnome.org/updatelogs/cvs-update-www.gnome.org.log
> _______________________________________________
> gnome-web-list mailing list
> gnome-web-list gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-web-list
> 
> 
-- 
Peter Williams / peter newton cx

? press-release.diff
? suppress-errors.diff
? xsltproc-small.diff
? www.gnome.org/community/Makefile
? www.gnome.org/community/Makefile.in
? www.gnome.org/projects/gdm/docs/2.13/Makefile
? www.gnome.org/projects/gdm/docs/2.13/Makefile.in
? www.gnome.org/projects/gdm/docs/2.14/Makefile
? www.gnome.org/projects/gdm/docs/2.14/Makefile.in
? www.gnome.org/projects/gdm/docs/2.15/Makefile
? www.gnome.org/projects/gdm/docs/2.15/Makefile.in
? www.gnome.org/projects/gdm/docs/2.8/Makefile
? www.gnome.org/projects/gdm/docs/2.8/Makefile.in
? www.gnome.org/projects/orca/Makefile
? www.gnome.org/projects/orca/Makefile.in
? www.gnome.org/projects/orca/images/Makefile
? www.gnome.org/projects/orca/images/Makefile.in
? www.gnome.org/projects/orca/pydoc/Makefile
? www.gnome.org/projects/orca/pydoc/Makefile.in
? www.gnome.org/projects/straw/Makefile
? www.gnome.org/projects/straw/Makefile.in
? www.gnome.org/projects/straw/images/Makefile
? www.gnome.org/projects/straw/images/Makefile.in
? www.gnome.org/projects/straw/images/shots/Makefile
? www.gnome.org/projects/straw/images/shots/Makefile.in
? www.gnome.org/projects/straw/images/thumbs/Makefile
? www.gnome.org/projects/straw/images/thumbs/Makefile.in
? www.gnome.org/start/2.12/tmp
? www.gnome.org/start/2.12/notes/gettext.pyc
? www.gnome.org/start/2.12/notes/docbook/bg/bg
? www.gnome.org/start/2.12/notes/docbook/de/de
? www.gnome.org/start/2.12/notes/docbook/en/en
? www.gnome.org/start/2.12/notes/docbook/et/et
? www.gnome.org/start/2.12/notes/docbook/id/id
? www.gnome.org/start/2.12/notes/docbook/ko/ko
? www.gnome.org/start/2.12/notes/docbook/lt/lt
? www.gnome.org/start/2.12/notes/docbook/mk/mk
? www.gnome.org/start/2.12/notes/docbook/pa/pa
? www.gnome.org/start/2.12/press_release/TEST
? www.gnome.org/start/2.12/press_release/docbook/bg/bg
? www.gnome.org/start/2.12/press_release/docbook/ca/ca
? www.gnome.org/start/2.12/press_release/docbook/cy/cy
? www.gnome.org/start/2.12/press_release/docbook/de/de
? www.gnome.org/start/2.12/press_release/docbook/el/el
? www.gnome.org/start/2.12/press_release/docbook/es/es
? www.gnome.org/start/2.12/press_release/docbook/fr/fr
? www.gnome.org/start/2.12/press_release/docbook/id/id
? www.gnome.org/start/2.12/press_release/docbook/it/it
? www.gnome.org/start/2.12/press_release/docbook/mk/mk
? www.gnome.org/start/2.12/press_release/docbook/nl/nl
? www.gnome.org/start/2.12/press_release/docbook/pa/pa
? www.gnome.org/start/2.12/press_release/docbook/pt_BR/pt_BR
? www.gnome.org/start/2.12/press_release/docbook/ru/ru
? www.gnome.org/start/2.12/press_release/docbook/th/th
? www.gnome.org/start/2.12/press_release/docbook/uk/uk
? www.gnome.org/start/2.12/press_release/docbook/vi/vi
? www.gnome.org/start/2.14/Makefile
? www.gnome.org/start/2.14/Makefile.in
? www.gnome.org/start/2.16/Makefile
? www.gnome.org/start/2.16/Makefile.in
? www.gnome.org/start/2.16/notes/Makefile
? www.gnome.org/start/2.16/notes/Makefile.in
? www.gnome.org/start/2.16/notes/docbook/Makefile
? www.gnome.org/start/2.16/notes/docbook/Makefile.in
? www.gnome.org/start/2.4/large/Makefile
? www.gnome.org/start/2.4/large/Makefile.in
? www.gnome.org/start/2.4/small/Makefile
? www.gnome.org/start/2.4/small/Makefile.in
? www.gnome.org/support/Makefile
? www.gnome.org/support/Makefile.in
? www.gnome.org/tour/gettext.pyc
? www.gnome.org/tour/mk
? www.gnome.org/tour/nl
? www.gnome.org/tour/sv
? www.gnome.org/tour/docbook/nl/.xml2po.mo
? www.gnome.org/tour/docbook/nl/communication.xml
? www.gnome.org/tour/docbook/nl/controlcenter.xml
? www.gnome.org/tour/docbook/nl/desktop.xml
? www.gnome.org/tour/docbook/nl/docs.xml
? www.gnome.org/tour/docbook/nl/games.xml
? www.gnome.org/tour/docbook/nl/i18n.xml
? www.gnome.org/tour/docbook/nl/installation.xml
? www.gnome.org/tour/docbook/nl/platform.xml
? www.gnome.org/tour/docbook/nl/rndesktop.xml
? www.gnome.org/tour/docbook/nl/sound_and_video.xml
? www.gnome.org/tour/docbook/nl/standards.xml
? www.gnome.org/tour/docbook/nl/sysadmin.xml
? www.gnome.org/tour/docbook/nl/tour.xml
? www.gnome.org/tour/docbook/nl/utilities.xml
? www.gnome.org/tour/docbook/sv/.xml2po.mo
? www.gnome.org/tour/docbook/sv/communication.xml
? www.gnome.org/tour/docbook/sv/controlcenter.xml
? www.gnome.org/tour/docbook/sv/desktop.xml
? www.gnome.org/tour/docbook/sv/docs.xml
? www.gnome.org/tour/docbook/sv/games.xml
? www.gnome.org/tour/docbook/sv/i18n.xml
? www.gnome.org/tour/docbook/sv/installation.xml
? www.gnome.org/tour/docbook/sv/platform.xml
? www.gnome.org/tour/docbook/sv/rndesktop.xml
? www.gnome.org/tour/docbook/sv/sound_and_video.xml
? www.gnome.org/tour/docbook/sv/standards.xml
? www.gnome.org/tour/docbook/sv/sysadmin.xml
? www.gnome.org/tour/docbook/sv/tour.xml
? www.gnome.org/tour/docbook/sv/utilities.xml
Index: www.gnome.org/tour/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnomeweb-wml/www.gnome.org/tour/ChangeLog,v
retrieving revision 1.12
diff -u -r1.12 ChangeLog
--- www.gnome.org/tour/ChangeLog	14 Aug 2006 17:51:46 -0000	1.12
+++ www.gnome.org/tour/ChangeLog	6 Sep 2006 06:18:38 -0000
@@ -1,3 +1,8 @@
+2006-09-05  Peter Williams  <peter newton cx>
+
+	* Makefile.am (install-data-local): Echo a warning if there are missing
+	figures in a translation directory, but don't make the build error out.
+
 2006-08-14  Vincent van Adrighem  <adrighem gnome org>
 
         * docbook/nl/nl.po: Dutch translation updated by Inge Loots.
Index: www.gnome.org/tour/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnomeweb-wml/www.gnome.org/tour/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- www.gnome.org/tour/Makefile.am	28 Nov 2005 08:20:36 -0000	1.14
+++ www.gnome.org/tour/Makefile.am	6 Sep 2006 06:18:38 -0000
@@ -31,7 +31,7 @@
 	  echo "Running xlstproc on: " docbook/$$docbookdir/$(ROOTDOC); \
 	  xsltproc --xinclude -o $$docbookdir/unused.html.ignore \
 	    --param yelp_max_chunk_depth 1 \
- 	    --stringparam admon.graphics.path ./images/ \
+	    --stringparam admon.graphics.path ./images/ \
 	    --stringparam http_root http://www.gnome.org \
 	    --stringparam http_prefix /tour/ \
 	    $(STYLE_PATH)db2html.xsl docbook/$$docbookdir/$(ROOTDOC); \
@@ -56,10 +56,19 @@
 	  $(INSTALL) -d $(pagedir)/$$docbookdir; \
 	  $(INSTALL_DATA) $(srcdir)/$$docbookdir/*.html $(pagedir)/$$docbookdir/; \
 	  $(INSTALL) -d $(pagedir)/$$docbookdir/images; \
-	  $(INSTALL_DATA) $(srcdir)/$$docbookdir/images/*.png $(pagedir)/$$docbookdir/images/; \
+	  if test "`echo $(srcdir)/$$docbookdir/images/*.png`" = $(srcdir)/$$docbookdir/images/'*.png' ; then \
+	    echo "WARNING: missing images/ subdir in $$docbookdir" ; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$docbookdir/images/*.png $(pagedir)/$$docbookdir/images/; \
+	  fi ; \
 	  $(INSTALL) -d $(pagedir)/$$docbookdir/figures; \
-	  $(INSTALL_DATA) $(srcdir)/$$docbookdir/figures/*.png $(pagedir)/$$docbookdir/figures/; \
+	  if test "`echo $(srcdir)/$$docbookdir/figures/*.png`" = $(srcdir)/$$docbookdir/figures/'*.png' ; then \
+	    echo "WARNING: missing figures/ subdir in $$docbookdir" ; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$docbookdir/figures/*.png $(pagedir)/$$docbookdir/figures/; \
+	  fi ; \
 	done
+