[svn:parrot] r37744 - in trunk: config/gen/makefiles lib/Parrot/Docs/Section tools/docs

[fperrad at svn.parrot.org]

Author: fperrad
Date: Thu Mar 26 11:58:42 2009
New Revision: 37744
URL: https://trac.parrot.org/parrot/changeset/37744

Log:
[chm] the book is now a regular section
code from bsdz++ in TT #492

Modified:
   trunk/config/gen/makefiles/docs.in
   trunk/lib/Parrot/Docs/Section/Parrot.pm
   trunk/tools/docs/mk_chm.pl

Modified: trunk/config/gen/makefiles/docs.in
==============================================================================
--- trunk/config/gen/makefiles/docs.in	Thu Mar 26 11:01:47 2009	(r37743)
+++ trunk/config/gen/makefiles/docs.in	Thu Mar 26 11:58:42 2009	(r37744)
@@ -49,30 +49,7 @@
 html-clean:
 	$(RM_RF) html
 
-BOOK:= \
-  ch01_overview.pod \
-  ch02_getting_started.pod \
-  ch03_pir_basics.pod \
-  ch04_pir_subroutines.pod \
-  ch05_pasm.pod \
-  ch06_library.pod \
-  ch07_testing_and_debugging.pod \
-  ch08_architecture.pod \
-  ch09_pct.pod \
-  ch10_hlls.pod \
-  ch11_pmcs.pod \
-  ch12_opcodes.pod \
-  ch13_reference.pod \
-  appX_patch_submission.pod
-
-book: book-dummy
-book-dummy:
-	cd book && ppod2html $(BOOK)
-
-book-clean:
-	$(RM_F) "book/*.html"
-
-htmlhelp: book html
+htmlhelp: html
 #IF(win32):	cd .. && $(PERL) tools/docs/mk_chm.pl
 #IF(win32):	-cd html && hhc parrot.hhp
 

Modified: trunk/lib/Parrot/Docs/Section/Parrot.pm
==============================================================================
--- trunk/lib/Parrot/Docs/Section/Parrot.pm	Thu Mar 26 11:01:47 2009	(r37743)
+++ trunk/lib/Parrot/Docs/Section/Parrot.pm	Thu Mar 26 11:58:42 2009	(r37744)
@@ -94,6 +94,24 @@
             Parrot::Docs::Section::Tools->new,
             $self->new_item( 'Syntax Highlighting for Vim & Emacs', 'editor/README.pod'),
         ),
+        $self->new_group(
+            'Book',
+            '',
+            $self->new_item( 'Chapter 1 Overview', 'docs/book/ch01_overview.pod'),
+            $self->new_item( 'Chapter 2 Getting Started', 'docs/book/ch02_getting_started.pod'),
+            $self->new_item( 'Chapter 3 PIR Basics', 'docs/book/ch03_pir_basics.pod'),
+            $self->new_item( 'Chapter 4 PIR Subroutines', 'docs/book/ch04_pir_subroutines.pod'),
+            $self->new_item( 'Chapter 5 PASM', 'docs/book/ch05_pasm.pod'),
+            $self->new_item( 'Chapter 6 Library', 'docs/book/ch06_library.pod'),
+            $self->new_item( 'Chapter 7 Testing & Debugging', 'docs/book/ch07_testing_and_debugging.pod'),
+            $self->new_item( 'Chapter 8 Architecture', 'docs/book/ch08_architecture.pod'),
+            $self->new_item( 'Chapter 9 PCT', 'docs/book/ch09_pct.pod'),
+            $self->new_item( 'Chapter 10 HLL', 'docs/book/ch10_hlls.pod'),
+            $self->new_item( 'Chapter 11 PMCs', 'docs/book/ch11_pmcs.pod'),
+            $self->new_item( 'Chapter 12 Opcodes', 'docs/book/ch12_opcodes.pod'),
+            $self->new_item( 'Chapter 13 Reference', 'docs/book/ch13_reference.pod'),
+            $self->new_item( 'Appendix 1 Patch Submission', 'docs/book/appX_patch_submission.pod'),
+        ),
 
 #        Parrot::Docs::Section::C->new,
 #        Parrot::Docs::Section::IMCC->new,

Modified: trunk/tools/docs/mk_chm.pl
==============================================================================
--- trunk/tools/docs/mk_chm.pl	Thu Mar 26 11:01:47 2009	(r37743)
+++ trunk/tools/docs/mk_chm.pl	Thu Mar 26 11:58:42 2009	(r37744)
@@ -98,67 +98,6 @@
 </OBJECT>
 <UL>
 $toc
-	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="Book">
-		</OBJECT>
-	<UL>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Overview">
-			<param name="Local" value="../book/ch01_overview.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Getting Started">
-			<param name="Local" value="../book/ch02_getting_started.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="PIR Basics">
-			<param name="Local" value="../book/ch03_pir_basics.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="PIR Subroutines">
-			<param name="Local" value="../book/ch04_pir_subroutines.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="PASM">
-			<param name="Local" value="../book/ch05_pasm.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Library">
-			<param name="Local" value="../book/ch06_library.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Testing and Debugging">
-			<param name="Local" value="../book/ch07_testing_and_debugging.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Architecture">
-			<param name="Local" value="../book/ch08_architecture.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Parrot Compiler Toolkit">
-			<param name="Local" value="../book/ch09_pct.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="High Level Languages">
-			<param name="Local" value="../book/ch10_hlls.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="PMC">
-			<param name="Local" value="../book/ch11_pmcs.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Opcodes">
-			<param name="Local" value="../book/ch12_opcodes.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="References">
-			<param name="Local" value="../book/ch13_reference.html">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Appendix : Patch Submission">
-			<param name="Local" value="../book/appX_patch_submission.html">
-			</OBJECT>
-	</UL>
 -</UL>
 </BODY></HTML>
 TEXT