Skip to contentSkip to conversation

Collected fixes to the eclipe help generation

PATCH New [email protected] 1 participant 4 messages Dec 6, 2012

lore
Share & tools
lore
#0 lore raw

cover Collected fixes to the eclipe help generation

From: Timo Mueller <[email protected]>

Hi,

these are some minor fixes for the eclipse help generation currently located in the timo branch of the yocto-docs repository.

1: Fixes an issue with the figures folder when eclipse target was called consecutively without cleaning in between
2: Whitespace fix
3: Enable chunk.quietly to provide cleaner console logs

Best regards,
Timo

Timo Mueller (3):
documentation/Makefile: Fix copying of figures folder documentation/tools/eclipse-help.sed: Fix whitespace
documentation: Add chunk.quietly option to eclipse processing

 documentation/Makefile                             |    2 +-
 .../adt-manual-eclipse-customization.xsl           |    1 +
 .../bsp-guide/bsp-guide-eclipse-customization.xsl  |    1 +
 .../dev-manual-eclipse-customization.xsl           |    1 +
 .../kernel-manual-eclipse-customization.xsl        |    1 +
 .../poky-ref-manual-eclipse-customization.xsl      |    1 +
 documentation/tools/eclipse-help.sed               |    4 ++--
 .../yocto-project-qs-eclipse-customization.xsl     |    1 +
 8 files changed, 9 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.7.6
#1 lore raw

PATCH 1/3 documentation/Makefile: Fix copying of figures folder

From: Timo Mueller <[email protected]>

When calling the eclipse target twice without calling clean in between the figures folder was copied as a subfolder of the existing figures folder. This patch fixes the copy command to correctly copy the figures folder.

---
 documentation/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
documentation/Makefile +1 -1
index 7da14a4..ddef079 100644
@@ -291,7 +291,7 @@ else
 				-o eclipse/$(DOC).html \
 				$(DOC)-eclipse-customization.xsl $(DOC).xml && \
 		mv eclipse/toc.xml eclipse/$(DOC)-toc.xml && \
-		cp -rf $(FIGURES) eclipse/$(BASE_DIR)/$(FIGURES) && \
+		cp -rf $(FIGURES) eclipse/$(BASE_DIR) && \
 		cd ..;
 
 	$(call modify-eclipse)
Signature · 1 line
1.7.7.6
#2 lore raw

PATCH 2/3 documentation/tools/eclipse-help.sed: Fix whitespace

From: Timo Mueller <[email protected]>

---
 documentation/tools/eclipse-help.sed |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
documentation/tools/eclipse-help.sed +2 -2
index 71d3395..38690bc 100644
@@ -1,12 +1,12 @@
 # Processes poky-ref-manual and yocto-project-qs manual (<word>-<word>-<word> style)
 # For example:
-#   "ulink" href="http://www.yoctoproject.org/docs/1.3/poky-ref-manual/poky-ref-manual.html#faq" 
+#   "ulink" href="http://www.yoctoproject.org/docs/1.3/poky-ref-manual/poky-ref-manual.html#faq"
 #   -> "link" href="../poky-ref-manual/faq.html"
 s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/[^\/]*\/\([a-z]*-[a-z]*-[a-z]*\)\/[a-z]*-[a-z]*-[a-z]*.html#\([^\"]*\)\"/\"link\" href=\"\.\.\/\1\/\2.html\"/g
 
 # Processes all other manuals (<word>-<word> style)
 # For example:
-#   "ulink" href="http://www.yoctoproject.org/docs/1.3/kernel-manual/kernel-manual.html#faq" 
+#   "ulink" href="http://www.yoctoproject.org/docs/1.3/kernel-manual/kernel-manual.html#faq"
 #   -> "link" href="../kernel-manual/faq.html"
 s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/[^\/]*\/\([a-z]*-[a-z]*\)\/[a-z]*-[a-z]*.html#\([^\"]*\)\"/\"link\" href=\"\.\.\/\1\/\2.html\"/g
 
Signature · 1 line
1.7.7.6
#3 lore raw

PATCH 3/3 documentation: Add chunk.quietly option to eclipse processing

From: Timo Mueller <[email protected]>

The chunk.quietly option disables the output of the docbook chunker. Creation of a new html file is now longer printed to the console. This provides a much cleaner output of the eclipse makefile target.

---
 .../adt-manual-eclipse-customization.xsl           |    1 +
 .../bsp-guide/bsp-guide-eclipse-customization.xsl  |    1 +
 .../dev-manual-eclipse-customization.xsl           |    1 +
 .../kernel-manual-eclipse-customization.xsl        |    1 +
 .../poky-ref-manual-eclipse-customization.xsl      |    1 +
 .../yocto-project-qs-eclipse-customization.xsl     |    1 +
 6 files changed, 6 insertions(+), 0 deletions(-)
documentation/adt-manual/adt-manual-eclipse-customization.xsl +1 -0
index ff1464e..d16ffbb 100644
@@ -9,6 +9,7 @@
 	  href="http://docbook.sourceforge.net/release/xsl/current/eclipse/eclipse3.xsl" />
 
   <xsl:param name="chunker.output.indent" select="'yes'"/>
+  <xsl:param name="chunk.quietly" select="1"/>
   <xsl:param name="chunk.first.sections" select="1"/>
   <xsl:param name="chunk.section.depth" select="10"/>
   <xsl:param name="use.id.as.filename" select="1"/>
documentation/bsp-guide/bsp-guide-eclipse-customization.xsl +1 -0
index b9aceb2..1c80bee 100644
@@ -9,6 +9,7 @@
 	  href="http://docbook.sourceforge.net/release/xsl/current/eclipse/eclipse3.xsl" />
 
   <xsl:param name="chunker.output.indent" select="'yes'"/>
+  <xsl:param name="chunk.quietly" select="1"/>
   <xsl:param name="chunk.first.sections" select="1"/>
   <xsl:param name="chunk.section.depth" select="10"/>
   <xsl:param name="use.id.as.filename" select="1"/>
documentation/dev-manual/dev-manual-eclipse-customization.xsl +1 -0
index ff1de89..8ac4c18 100644
@@ -9,6 +9,7 @@
 	  href="http://docbook.sourceforge.net/release/xsl/current/eclipse/eclipse3.xsl" />
 
   <xsl:param name="chunker.output.indent" select="'yes'"/>
+  <xsl:param name="chunk.quietly" select="1"/>
   <xsl:param name="chunk.first.sections" select="1"/>
   <xsl:param name="chunk.section.depth" select="10"/>
   <xsl:param name="use.id.as.filename" select="1"/>
documentation/kernel-manual/kernel-manual-eclipse-customization.xsl +1 -0
index 70a1e19..7992173 100644
@@ -9,6 +9,7 @@
 	  href="http://docbook.sourceforge.net/release/xsl/current/eclipse/eclipse3.xsl" />
 
   <xsl:param name="chunker.output.indent" select="'yes'"/>
+  <xsl:param name="chunk.quietly" select="1"/>
   <xsl:param name="chunk.first.sections" select="1"/>
   <xsl:param name="chunk.section.depth" select="10"/>
   <xsl:param name="use.id.as.filename" select="1"/>
documentation/poky-ref-manual/poky-ref-manual-eclipse-customization.xsl +1 -0
index 4e31193..3412208 100644
@@ -9,6 +9,7 @@
 	  href="http://docbook.sourceforge.net/release/xsl/current/eclipse/eclipse3.xsl" />
 
   <xsl:param name="chunker.output.indent" select="'yes'"/>
+  <xsl:param name="chunk.quietly" select="1"/>
   <xsl:param name="chunk.first.sections" select="1"/>
   <xsl:param name="chunk.section.depth" select="10"/>
   <xsl:param name="use.id.as.filename" select="1"/>
documentation/yocto-project-qs/yocto-project-qs-eclipse-customization.xsl +1 -0
index 468508b..f8f8930 100644
@@ -10,6 +10,7 @@
   <xsl:import href="yocto-project-qs-titlepage.xsl"/>
 
   <xsl:param name="chunker.output.indent" select="'yes'"/>
+  <xsl:param name="chunk.quietly" select="1"/>
   <xsl:param name="use.id.as.filename" select="1"/>
   <xsl:param name="ulink.target" select="'_self'" />
   <xsl:param name="base.dir" select="'html/yocto-project-qs/'"/>
Signature · 1 line
1.7.7.6