[gnomemm-website] Again renerate html in en/

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnomemm-website] Again renerate html in en/
Date: Wed, 24 Nov 2010 11:09:47 +0000 (UTC)
commit 1eef10a63d1a9a3594fbf57cc1a0c1e0f976b7a0
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Nov 24 12:09:23 2010 +0100

    Again renerate html in en/
    
    * Move param.xsl, style.css, and images to docs/html.
    * docs/Makefile.am: Generate the html in html/en, with shared style/images
    stuff (for all locales) in html/.
    This is more like the generation before I rearranged it. I still need to
    re-add generation of translated content.

 ChangeLog                                          |   10 ++++
 docs/Makefile.am                                   |   47 ++++++++------------
 {html => docs/html}/images/GNOME-logo.png          |  Bin 2789 -> 2789 bytes
 {html => docs/html}/images/active.gif              |  Bin 141 -> 141 bytes
 {html => docs/html}/images/anvil24.gif             |  Bin 215 -> 215 bytes
 {html => docs/html}/images/blank.gif               |  Bin 252 -> 252 bytes
 {html => docs/html}/images/bug.gif                 |  Bin 261 -> 261 bytes
 {html => docs/html}/images/gtk-logo.png            |  Bin 3871 -> 3871 bytes
 {html => docs/html}/images/gtkmm_logo.gif          |  Bin 4416 -> 4416 bytes
 {html => docs/html}/images/gtkmm_logo.png          |  Bin 4268 -> 4268 bytes
 {html => docs/html}/images/gtkmm_logo.xcf          |  Bin 32214 -> 32214 bytes
 {html => docs/html}/images/gtkmm_logo_old.gif      |  Bin 707 -> 707 bytes
 {html => docs/html}/images/gtkmm_logo_small.png    |  Bin 7988 -> 7988 bytes
 {html => docs/html}/images/home.gif                |  Bin 265 -> 265 bytes
 {html => docs/html}/images/inactive.gif            |  Bin 129 -> 129 bytes
 {html => docs/html}/images/layers300x300.gif       |  Bin 40092 -> 40092 bytes
 {html => docs/html}/images/logo.gif                |  Bin 11037 -> 11037 bytes
 {html => docs/html}/images/mail.gif                |  Bin 661 -> 661 bytes
 {html => docs/html}/images/news.gif                |  Bin 115 -> 115 bytes
 {html => docs/html}/images/save.gif                |  Bin 308 -> 308 bytes
 {html => docs/html}/images/top.gif                 |  Bin 260 -> 260 bytes
 {html => docs/html}/images/vdiv.gif                |  Bin 1036 -> 1036 bytes
 docs/{ => html}/style.css                          |   12 +++---
 .../html/style_images}/banner-gradient.gif         |  Bin 116 -> 116 bytes
 .../html/style_images}/content-gradient-top.gif    |  Bin 116 -> 116 bytes
 .../html/style_images}/header-gradient.gif         |  Bin 333 -> 333 bytes
 .../html/style_images}/highlight-stripe.gif        |  Bin 89 -> 89 bytes
 .../html/style_images}/sidebar-stripe.gif          |  Bin 85 -> 85 bytes
 param.xsl => docs/param.xsl                        |    2 +-
 29 files changed, 36 insertions(+), 35 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 915a574..c350095 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-11-24  Murray Cumming  <murrayc murrayc com>
 
+	Again renerate html in en/
+
+	* Move param.xsl, style.css, and images to docs/html.
+	* docs/Makefile.am: Generate the html in html/en, with shared style/images
+	stuff (for all locales) in html/.
+	This is more like the generation before I rearranged it. I still need to
+	re-add generation of translated content.
+
+2010-11-24  Murray Cumming  <murrayc murrayc com>
+
 	Re-Add the jhbuild graph generation.
 
 	* docs/Makefile.am: Re-Add the jhbuild graph generation.
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2aba207..9d0322c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -7,7 +7,6 @@ gnomemmwebsite_docdir = $(datadir)/doc/gnomemmwebsite-2.4
 vpath_srclist = $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/,$(1))))
 vpath_listall = $(sort $(wildcard $(1)) $(if $(srcdir:.=),$(vpath_srclist)))
 
-DOCBOOK_STYLESHEET_HTML ?= http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
 XMLLINT = xmllint
 XSLTPROC = xsltproc
 
@@ -18,32 +17,14 @@ DOC_FIGURES =
 
 DOC_LINGUAS = zh_CN
 
-MAINTAINERCLEANFILES = html/*.html $(srcdir)/html/*.html
-
-# Set the use.id.as.filename param so that we don't use the chapter / section
-# number as the filename, otherwise the url will change every time anything is
-# re-ordered or inserted in the documentation
-xslt_params = $(strip						\
-	--param       toc.section.depth		1		\
-	--stringparam html.stylesheet		'style.css'	\
-	--stringparam admon.graphics		'1'		\
-	--stringparam admon.graphics.path	'icons/'	\
-	--stringparam admon.graphics.extension	'.png'		\
-	--stringparam chunker.output.indent	'yes'		\
-	--stringparam chunker.output.encoding	'UTF-8'		\
-	--stringparam navig.graphics		'yes'		\
-	--stringparam navig.graphics.extension	'.png'		\
-	--stringparam navig.graphics.path	'icons/'	\
-	--stringparam toc.list.type		'ul'		\
-	--stringparam use.id.as.filename	'1'		\
-	)
+MAINTAINERCLEANFILES = html/en/*.html $(srcdir)/html/en/*.html
 
 tutorialdir         = $(gnomemmwebsite_docdir)/tutorial
 tutorial_htmldir    = $(tutorialdir)/html
 tutorial_figuresdir = $(tutorial_htmldir)/figures
 tutorial_iconsdir   = $(tutorial_htmldir)/icons
 
-tutorial_html_files = $(call vpath_listall,html/*.html) style.css
+tutorial_html_files = $(call vpath_listall,html/en/*.html) html/style.css
 tutorial_html_inst  = $(foreach\
 	file,$(tutorial_html_files),$(or $(wildcard $(file)),$(srcdir)/$(file)))
 
@@ -62,22 +43,21 @@ dist_tutorial_icons_DATA =
 
 include $(top_srcdir)/build/gnome-doc-utils.make
 
-all-local: $(DOC_LINGUAS) $(addsuffix /gnomemm-website.xml,C $(DOC_LINGUAS)) html/index.html
+all-local: $(DOC_LINGUAS) $(addsuffix /gnomemm-website.xml,C $(DOC_LINGUAS)) html/en/index.html
 
 $(DOC_LINGUAS):
 	@$(MKDIR_P) $@
 
 # Create a html generation of the C locale's version of the DocBook,
 # using our custom stylesheet and graphics:
-html/index.html: $(srcdir)/C/gnomemm-website.xml
-	$(AM_V_at)rm -fr html
-	$(AM_V_at)$(MKDIR_P) html
-	$(AM_V_GEN)$(XSLTPROC) $(xslt_params) -o html/ --xinclude --catalogs \
-		'$(DOCBOOK_STYLESHEET_HTML)' $<
+html/en/index.html: $(srcdir)/C/gnomemm-website.xml
+	$(AM_V_at)rm -fr html/en
+	$(AM_V_at)$(MKDIR_P) html/en
+	$(AM_V_GEN)$(XSLTPROC) -o html/en/ --xinclude param.xsl $<
 
 # Make sure that the documentation will always have been generated before
 # executing the commands of a rule that depends on files in html/.
-html/chapter-%.html html/sec-%.html: | html/index.html
+html/chapter-%.html html/sec-%.html: | html/en/index.html
 
 validate: $(srcdir)/C/gnomemm-website.xml
 	$(XMLLINT) --xinclude --postvalid --noout $<
@@ -110,3 +90,14 @@ dependencies_gnomemm:
 dependencies_gnome_desktop:
 	jhbuild dot meta-gnome-desktop > html/jhbuild_gnome_desktop.dot
 	dot jhbuild_gnome_desktop.dot -Tpng > html/jhbuild_dot_gnome_desktop.png
+
+
+
+
+#Upload:
+
+web_path = /home/murrayc/gtkmm.org/
+
+#post-html: dependencies_gtkmm dependencies_gnomemm dependencies_gnome_desktop
+post-html:
+	rsync -avz --rsh ssh --cvs-exclude  html/.htaccess html/* $$USER www gtkmm org:$(web_path)
diff --git a/html/images/GNOME-logo.png b/docs/html/images/GNOME-logo.png
similarity index 100%
rename from html/images/GNOME-logo.png
rename to docs/html/images/GNOME-logo.png
diff --git a/html/images/active.gif b/docs/html/images/active.gif
similarity index 100%
rename from html/images/active.gif
rename to docs/html/images/active.gif
diff --git a/html/images/anvil24.gif b/docs/html/images/anvil24.gif
similarity index 100%
rename from html/images/anvil24.gif
rename to docs/html/images/anvil24.gif
diff --git a/html/images/blank.gif b/docs/html/images/blank.gif
similarity index 100%
rename from html/images/blank.gif
rename to docs/html/images/blank.gif
diff --git a/html/images/bug.gif b/docs/html/images/bug.gif
similarity index 100%
rename from html/images/bug.gif
rename to docs/html/images/bug.gif
diff --git a/html/images/gtk-logo.png b/docs/html/images/gtk-logo.png
similarity index 100%
rename from html/images/gtk-logo.png
rename to docs/html/images/gtk-logo.png
diff --git a/html/images/gtkmm_logo.gif b/docs/html/images/gtkmm_logo.gif
similarity index 100%
rename from html/images/gtkmm_logo.gif
rename to docs/html/images/gtkmm_logo.gif
diff --git a/html/images/gtkmm_logo.png b/docs/html/images/gtkmm_logo.png
similarity index 100%
rename from html/images/gtkmm_logo.png
rename to docs/html/images/gtkmm_logo.png
diff --git a/html/images/gtkmm_logo.xcf b/docs/html/images/gtkmm_logo.xcf
similarity index 100%
rename from html/images/gtkmm_logo.xcf
rename to docs/html/images/gtkmm_logo.xcf
diff --git a/html/images/gtkmm_logo_old.gif b/docs/html/images/gtkmm_logo_old.gif
similarity index 100%
rename from html/images/gtkmm_logo_old.gif
rename to docs/html/images/gtkmm_logo_old.gif
diff --git a/html/images/gtkmm_logo_small.png b/docs/html/images/gtkmm_logo_small.png
similarity index 100%
rename from html/images/gtkmm_logo_small.png
rename to docs/html/images/gtkmm_logo_small.png
diff --git a/html/images/home.gif b/docs/html/images/home.gif
similarity index 100%
rename from html/images/home.gif
rename to docs/html/images/home.gif
diff --git a/html/images/inactive.gif b/docs/html/images/inactive.gif
similarity index 100%
rename from html/images/inactive.gif
rename to docs/html/images/inactive.gif
diff --git a/html/images/layers300x300.gif b/docs/html/images/layers300x300.gif
similarity index 100%
rename from html/images/layers300x300.gif
rename to docs/html/images/layers300x300.gif
diff --git a/html/images/logo.gif b/docs/html/images/logo.gif
similarity index 100%
rename from html/images/logo.gif
rename to docs/html/images/logo.gif
diff --git a/html/images/mail.gif b/docs/html/images/mail.gif
similarity index 100%
rename from html/images/mail.gif
rename to docs/html/images/mail.gif
diff --git a/html/images/news.gif b/docs/html/images/news.gif
similarity index 100%
rename from html/images/news.gif
rename to docs/html/images/news.gif
diff --git a/html/images/save.gif b/docs/html/images/save.gif
similarity index 100%
rename from html/images/save.gif
rename to docs/html/images/save.gif
diff --git a/html/images/top.gif b/docs/html/images/top.gif
similarity index 100%
rename from html/images/top.gif
rename to docs/html/images/top.gif
diff --git a/html/images/vdiv.gif b/docs/html/images/vdiv.gif
similarity index 100%
rename from html/images/vdiv.gif
rename to docs/html/images/vdiv.gif
diff --git a/docs/style.css b/docs/html/style.css
similarity index 89%
rename from docs/style.css
rename to docs/html/style.css
index d054b4f..83bac19 100644
--- a/docs/style.css
+++ b/docs/html/style.css
@@ -21,7 +21,7 @@ body    {
     color: white;
     padding: 0em 2em;
     text-align: left;
-    background-image: url("images/banner-gradient.gif");
+    background-image: url("../style_images/banner-gradient.gif");
     background-repeat: repeat-x;
     background-position: 0% 100%;
 }
@@ -53,7 +53,7 @@ body    {
 #header .content    {
     background-color: #7f201f;
     color: white;
-    background-image: url("images/header-gradient.gif");
+    background-image: url("../style_images/header-gradient.gif");
     background-repeat: repeat-x;
     padding: 1em 2em;
     font-size: 120%;
@@ -72,7 +72,7 @@ body    {
 /* wrappers around the content and sidebar.  This is to enable drop-shadow
 * effects via background-image directives */
 #content-wrapper    {
-    background-image: url("images/content-gradient-top.gif");
+    background-image: url("../style_images/content-gradient-top.gif");
     background-repeat: repeat-x;
     background-position: 0% 0%;
 }
@@ -95,7 +95,7 @@ body    {
     padding: 1em 2em;
     margin: 1em 0em 2em 0em;
     background-color: #ccff99;
-    background-image: url("images/highlight-stripe.gif");
+    background-image: url("../style_images/highlight-stripe.gif");
     border: 1px solid #87a865;
 }
 
@@ -115,7 +115,7 @@ a:active    {
     padding: 1em 1.5em;
     font-size: 90%;
     background-color: #f6f6f6;
-    background-image: url("images/sidebar-stripe.gif");
+    background-image: url("../style_images/sidebar-stripe.gif");
     border: 1px solid #eeeeee;
 }
 
@@ -154,7 +154,7 @@ h2  {
 #footer {
     background-color: #7f201f;
     color: white;
-    background-image: url("images/header-gradient.gif");
+    background-image: url("../style_images/header-gradient.gif");
     background-repeat: repeat-x;
     text-align: center;
     padding: 2em 2em 5em 2em;
diff --git a/html/style/images/banner-gradient.gif b/docs/html/style_images/banner-gradient.gif
similarity index 100%
rename from html/style/images/banner-gradient.gif
rename to docs/html/style_images/banner-gradient.gif
diff --git a/html/style/images/content-gradient-top.gif b/docs/html/style_images/content-gradient-top.gif
similarity index 100%
rename from html/style/images/content-gradient-top.gif
rename to docs/html/style_images/content-gradient-top.gif
diff --git a/html/style/images/header-gradient.gif b/docs/html/style_images/header-gradient.gif
similarity index 100%
rename from html/style/images/header-gradient.gif
rename to docs/html/style_images/header-gradient.gif
diff --git a/html/style/images/highlight-stripe.gif b/docs/html/style_images/highlight-stripe.gif
similarity index 100%
rename from html/style/images/highlight-stripe.gif
rename to docs/html/style_images/highlight-stripe.gif
diff --git a/html/style/images/sidebar-stripe.gif b/docs/html/style_images/sidebar-stripe.gif
similarity index 100%
rename from html/style/images/sidebar-stripe.gif
rename to docs/html/style_images/sidebar-stripe.gif
diff --git a/param.xsl b/docs/param.xsl
similarity index 98%
rename from param.xsl
rename to docs/param.xsl
index 732cfcc..7a3154f 100644
--- a/param.xsl
+++ b/docs/param.xsl
@@ -4,7 +4,7 @@ xmlns="http://www.w3.org/1999/xhtml";
 version="1.0">
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"; />
 
-<xsl:param name="html.stylesheet" select="'../style/style.css'" />
+<xsl:param name="html.stylesheet" select="'../style.css'" />
 <xsl:param name="chunker.output.encoding" select="'utf-8'" />
 <xsl:param name="chunker.output.indent" select="'yes'" />
 <xsl:param name="chunk.section.depth" select="0" />
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]