svn commit - mysqldoc@docsrva: r2837 - in trunk: . make.d tools

[paul]

Author: paul
Date: 2006-07-26 21:59:37 +0200 (Wed, 26 Jul 2006)
New Revision: 2837

Log:
 r11989@polar:  paul | 2006-07-26 14:39:45 -0500
 Remove unused stuff from chapter-generation script, make target.


Modified:
   trunk/make.d/fragment-files
   trunk/tools/chapterfmt.pl

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11974
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12737
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11989
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12737
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441


Modified: trunk/make.d/fragment-files
===================================================================
--- trunk/make.d/fragment-files	2006-07-26 18:35:03 UTC (rev 2836)
+++ trunk/make.d/fragment-files	2006-07-26 19:59:37 UTC (rev 2837)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 439 bytes

@@ -60,7 +60,7 @@
 		> $@
 
 ReadMe.html:: $(MANUAL_SRCS)
-	$(CHAPTERFMT) --no-rebuild mac-os-x-installation.html
+	$(CHAPTERFMT) mac-os-x-installation.html
 	mv mac-os-x-installation.html ReadMe.html
 
 clean::


Modified: trunk/tools/chapterfmt.pl
===================================================================
--- trunk/tools/chapterfmt.pl	2006-07-26 18:35:03 UTC (rev 2836)
+++ trunk/tools/chapterfmt.pl	2006-07-26 19:59:37 UTC (rev 2837)
Changed blocks: 5, Lines Added: 14, Lines Deleted: 28; 3662 bytes

@@ -3,13 +3,12 @@
 # chapterfmt.pl - format a single chapter (or section) from the manual.
 
 # Syntax: chapterfmt.pl node-id.{html,xhtml,pdf,...}
-#     or: chapterfmt.pl node-id.lang.{html,xhtml,pdf,...}
 
 # How it works:
-# - Builds the monolithic manual.xml or manual.lang.xml file (removes
+# - Builds the monolithic manual.xml or manual.xml file (removes
 #   it first to force it to be rebuilt)
-# - Copies manual{.lang}.xml to node-id{.lang}.xml.
-# - Invokes make to build rootid{.lang}.ofmt, where ofmt is the
+# - Copies manual.xml to node-id.xml.
+# - Invokes make to build rootid.ofmt, where ofmt is the
 #	output format.  The trick here is that we define
 #	XSLTPROC_EXTRA_FLAGS as "--stringparam rootid node-id",
 #	which causes xsltproc to read the entire input file but

@@ -32,6 +31,8 @@
 # - Remember to build the -toc-entries.xml file for .txt output.
 # 2006-07-18
 # - Add --doc-name option for specifying the document basename.
+# 2006-07-26
+# - Remove --no-rebuild option, it's no longer used.
 
 use Getopt::Long;
 $Getopt::Long::ignorecase = 0; # options are case sensitive

@@ -46,34 +47,25 @@
     Print this message
 --doc-name=name
     Specify the main document basename. (Default: manual)
---no-rebuild
-    Do not rebuild monolithic manual from split manual.
-    (Assume the monolithic manual is up to date.)
 
-Each target should be of the form chapter-name.ofmt or chapter-name.lang.ofmt
+Each target should be of the form chapter-name.ofmt
 
 ofmt is the output format: html, xhtml, pdf, etc.
-lang, if present, is the two-digit language code.  The English manual
-is used if omitted.
 EOF
 
 # Variables for command line options; most are undefined initially.
 my $help;
 my $doc_name = "manual";
-my $no_rebuild;
 
 GetOptions (
 	"help"			=> \$help,			# print help message
 	"doc-name:s"	=> \$doc_name,		# main document basename
-	"no-rebuild"	=> \$no_rebuild		# don't rebuild monolithic manual
 ) or die "$usage\n";
 
 die  "$usage\n" if defined $help;
 
 @ARGV or die "$usage\n";
 
-$no_rebuild = defined ($no_rebuild);	# convert defined/undefined to boolean
-
 format_target (shift @ARGV) while @ARGV;
 
 exit (0);

@@ -82,18 +74,12 @@
 {
 my $target = shift;
 my @parts = split (/\./, $target);
-my ($chapname, $lang, $ofmt);
+my ($chapname, $ofmt);
 
 	if (@parts == 2)
 	{
 		($chapname, $ofmt) = @parts;
-		$lang = "";
 	}
-	elsif (@parts == 3)
-	{
-		($chapname, $lang, $ofmt) = @parts;
-		$lang = ".$lang";
-	}
 	else
 	{
 		die "bad target name: $target\n$usage\n";

@@ -102,15 +88,15 @@
 
 	# We must be careful to use an XML file named chapter-$chapname.xml here
 	# to avoid overwriting any of the manual's actual chapter files!
-	system "cp $doc_name$lang.xml chapter-$chapname$lang.xml";
+	system "cp $doc_name.xml chapter-$chapname.xml";
 	if ($ofmt eq "txt")
 	{
-		system "make $doc_name$lang-toc-entries.xml";
-		system "cp $doc_name$lang-toc-entries.xml chapter-$chapname$lang-toc-entries.xml";
+		system "make $doc_name-toc-entries.xml";
+		system "cp $doc_name-toc-entries.xml chapter-$chapname-toc-entries.xml";
 	}
-	system "make chapter-$chapname$lang.$ofmt"
+	system "make chapter-$chapname.$ofmt"
 			. " XSLTPROC_EXTRA_FLAGS=\"--stringparam rootid $chapname\"";
-	system "mv chapter-$chapname$lang.$ofmt $chapname$lang.$ofmt";
-	system "rm -f chapter-$chapname$lang.xml";
-	system "rm -f chapter-$chapname$lang-prepped.xml";
+	system "mv chapter-$chapname.$ofmt $chapname.$ofmt";
+	system "rm -f chapter-$chapname.xml";
+	system "rm -f chapter-$chapname-prepped.xml";
 }