[GRASS-SVN] r32773 - in grass/trunk: include/Make lib/cairodriver
lib/db/sqlp lib/pngdriver lib/psdriver raster/r.colors.out
tools tools/mkftcap visualization/nviz visualization/ximgview
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Aug 15 04:35:12 EDT 2008
Author: glynn
Date: 2008-08-15 04:35:11 -0400 (Fri, 15 Aug 2008)
New Revision: 32773
Added:
grass/trunk/raster/r.colors.out/r.colors.out.html
grass/trunk/visualization/ximgview/ximgview.html
Modified:
grass/trunk/include/Make/Html.make
grass/trunk/lib/cairodriver/
grass/trunk/lib/db/sqlp/
grass/trunk/lib/pngdriver/
grass/trunk/lib/pngdriver/Makefile
grass/trunk/lib/psdriver/
grass/trunk/tools/mkftcap/Makefile
grass/trunk/tools/mkhtml.sh
grass/trunk/visualization/nviz/
Log:
Clean up HTML generation rules
Add missing $(PGM).html files for r.colors.out and ximgview
Fix name of pngdriver.html
Modified: grass/trunk/include/Make/Html.make
===================================================================
--- grass/trunk/include/Make/Html.make 2008-08-15 06:16:42 UTC (rev 32772)
+++ grass/trunk/include/Make/Html.make 2008-08-15 08:35:11 UTC (rev 32773)
@@ -18,28 +18,27 @@
else
-htmlgen = \
- $(MODULE_TOPDIR)/tools/mkhtml.sh $(PGM) ; \
- $(MKDIR) $(HTMLDIR) ; \
- $(INSTALL_DATA) $(PGM).tmp.html $(HTMLDIR)/$(PGM).html ; \
- for file in *.png *.jpg ; do \
+$(HTMLDIR)/$(PGM).html: $(PGM).html $(PGM).tmp.html
+ -$(MKDIR) $(HTMLDIR)
+ $(MODULE_TOPDIR)/tools/mkhtml.sh $(PGM)
+ $(INSTALL_DATA) $(PGM).tmp.html $@
+ -for file in *.png *.jpg ; do \
head -n 1 $$file | grep '^\#!' > /dev/null ; \
if [ $$? -ne 0 ] ; then \
$(INSTALL_DATA) $$file $(HTMLDIR) ; \
fi \
done 2> /dev/null ; true
-htmldesc = \
- GISRC=$(RUN_GISRC) \
- GISBASE=$(RUN_GISBASE) \
- PATH="$(BIN):$$PATH" \
- $(LD_LIBRARY_PATH_VAR)="$(BIN):$(ARCH_LIBDIR):$($(LD_LIBRARY_PATH_VAR))" \
- LC_ALL=C $(1) --html-description < /dev/null | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true
+$(PGM).tmp.html: $(HTMLSRC)
+ if [ "$(HTMLSRC)" != "" ] ; then \
+ GISRC=$(RUN_GISRC) \
+ GISBASE=$(RUN_GISBASE) \
+ PATH="$(BIN):$$PATH" \
+ $(LD_LIBRARY_PATH_VAR)="$(BIN):$(ARCH_LIBDIR):$($(LD_LIBRARY_PATH_VAR))" \
+ LC_ALL=C \
+ $(HTMLSRC) --html-description < /dev/null | grep -v '</body>\|</html>' > $@ ; \
+ fi
-$(HTMLDIR)/$(PGM).html: $(HTMLSRC)
- if [ "$(HTMLSRC)" != "" ] ; then $(call htmldesc,$<) ; fi
- $(call htmlgen)
-
# html rules for cmd commands
htmlcmd:
$(MAKE) $(HTMLDIR)/$(PGM).html HTMLSRC=$(BIN)/$(PGM)$(EXE)
Property changes on: grass/trunk/lib/cairodriver
___________________________________________________________________
Name: svn:ignore
- *OBJ*
+ *.tmp.html
*OBJ*
Property changes on: grass/trunk/lib/db/sqlp
___________________________________________________________________
Name: svn:ignore
- *OBJ*
y.tab.h
y.output
lex.yy.c
y.tab.c
+ *.tmp.html
*OBJ*
y.tab.h
y.output
lex.yy.c
y.tab.c
Property changes on: grass/trunk/lib/pngdriver
___________________________________________________________________
Name: svn:ignore
- *OBJ*
+ *.tmp.html
*OBJ*
Modified: grass/trunk/lib/pngdriver/Makefile
===================================================================
--- grass/trunk/lib/pngdriver/Makefile 2008-08-15 06:16:42 UTC (rev 32772)
+++ grass/trunk/lib/pngdriver/Makefile 2008-08-15 08:35:11 UTC (rev 32773)
@@ -6,7 +6,7 @@
EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(PNGLIB)
LIB_NAME = $(PNGDRIVER_LIBNAME)
-PGM = cairodriver
+PGM = pngdriver
LIB_OBJS = \
Box.o \
Property changes on: grass/trunk/lib/psdriver
___________________________________________________________________
Name: svn:ignore
- *OBJ*
+ *.tmp.html
*OBJ*
Added: grass/trunk/raster/r.colors.out/r.colors.out.html
===================================================================
--- grass/trunk/raster/r.colors.out/r.colors.out.html (rev 0)
+++ grass/trunk/raster/r.colors.out/r.colors.out.html 2008-08-15 08:35:11 UTC (rev 32773)
@@ -0,0 +1,18 @@
+<h2>DESCRIPTION</h2>
+
+<i>r.colors.out</i> allows the user to export the color table for a
+raster map layer to a file which is suitable as input to <em>
+<a href="r.colors.html">r.colors</a></em>.
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="r.colors.html">r.colors</a>,
+</em>
+
+
+<h2>AUTHOR</h2>
+Glynn Clements
+
+<p>
+<i>Last changed: $Date: 2008-08-15 07:16:42 +0100 (Fri, 15 Aug 2008) $</i>
Modified: grass/trunk/tools/mkftcap/Makefile
===================================================================
--- grass/trunk/tools/mkftcap/Makefile 2008-08-15 06:16:42 UTC (rev 32772)
+++ grass/trunk/tools/mkftcap/Makefile 2008-08-15 08:35:11 UTC (rev 32773)
@@ -10,3 +10,6 @@
$(CAPFILE): $(SCRIPTDIR)/$(PGM)
$< > $@
+
+htmlscript:
+ @true
Modified: grass/trunk/tools/mkhtml.sh
===================================================================
--- grass/trunk/tools/mkhtml.sh 2008-08-15 06:16:42 UTC (rev 32772)
+++ grass/trunk/tools/mkhtml.sh 2008-08-15 08:35:11 UTC (rev 32773)
@@ -21,8 +21,6 @@
if test -f ${PGM}.html ; then
cat ${PGM}.html >> ${PGM}.tmp.html
-elif test -f description.html ; then
- cat description.html >> ${PGM}.tmp.html
fi
if ! grep -i '<html>' ${PGM}.tmp.html > /dev/null ; then
Property changes on: grass/trunk/visualization/nviz
___________________________________________________________________
Name: svn:ignore
+ *.tmp.html
*OBJ*
Added: grass/trunk/visualization/ximgview/ximgview.html
===================================================================
--- grass/trunk/visualization/ximgview/ximgview.html (rev 0)
+++ grass/trunk/visualization/ximgview/ximgview.html 2008-08-15 08:35:11 UTC (rev 32773)
@@ -0,0 +1,26 @@
+<h2>DESCRIPTION</h2>
+
+<i>ximgview</i> is a simple X11 image viewer for 32-bpp BMP images, as
+can be created with the <em><a href="pngdriver.html">PNG</a></em> and
+<em><a href="cairodriver.html">cairo</a></em> drivers. The display is
+continually refreshed.
+
+<h2>NOTES</h2>
+
+The display driver must be configure to map the file, with
+<em>GRASS_PNG_MAPPED=TRUE</em>. This ensures that the file will remain
+a constant size, rather than being truncated whenever it is updated.
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="pngdriver.html">PNG driver</a>
+<a href="cairodriver.html">cairo driver</a>
+</em>
+
+
+<h2>AUTHOR</h2>
+Glynn Clements
+
+<p>
+<i>Last changed: $Date: 2008-08-15 07:16:42 +0100 (Fri, 15 Aug 2008) $</i>
More information about the grass-commit
mailing list