Inicio Explorar Axuda
Iniciar sesión
RONCC
/
Geografic-Information-System
Seguir 1
Destacar 0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Clean up HTML generation rules
Add missing $(PGM).html files for r.colors.out and ximgview
Fix name of pngdriver.html


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32773 15284696-431f-4ddb-bdfa-cd5b030d7da7

Glynn Clements %!s(int64=17) %!d(string=hai) anos
pai
2014e73a43
achega
f9f4e293b1
Modificáronse 6 ficheiros con 62 adicións e 18 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 14 15
      include/Make/Html.make
  2. 1 1
      lib/pngdriver/Makefile
  3. 18 0
      raster/r.colors.out/r.colors.out.html
  4. 3 0
      tools/mkftcap/Makefile
  5. 0 2
      tools/mkhtml.sh
  6. 26 0
      visualization/ximgview/ximgview.html

+ 14 - 15
include/Make/Html.make
Ver ficheiro 

@@ -18,27 +18,26 @@ htmlmulti:
 
 
 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
 
-
 
-$(HTMLDIR)/$(PGM).html: $(HTMLSRC)
 
-	if [ "$(HTMLSRC)" != "" ] ; then $(call htmldesc,$<) ; fi
 
-	$(call htmlgen)
 
+$(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
 
 
 # html rules for cmd commands
 
 htmlcmd:

+ 1 - 1
lib/pngdriver/Makefile
Ver ficheiro 

@@ -6,7 +6,7 @@ EXTRA_CFLAGS=$(GETHOSTNAME) $(ZLIBINCPATH) $(PNGINC) -I../driver
 
 
 EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(PNGLIB)
 
 LIB_NAME = $(PNGDRIVER_LIBNAME)
 
-PGM = cairodriver
 
+PGM = pngdriver
 
 
 LIB_OBJS =	\
 
 	Box.o			\

+ 18 - 0
raster/r.colors.out/r.colors.out.html
Ver ficheiro 

@@ -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>

+ 3 - 0
tools/mkftcap/Makefile
Ver ficheiro 

@@ -10,3 +10,6 @@ default: script
 
 
 $(CAPFILE): $(SCRIPTDIR)/$(PGM)
 
 	$< > $@
 
+
 
+htmlscript:
 
+	@true

+ 0 - 2
tools/mkhtml.sh
Ver ficheiro 

@@ -21,8 +21,6 @@ fi
 
 
 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

+ 26 - 0
visualization/ximgview/ximgview.html
Ver ficheiro 

@@ -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>