Author: paul
Date: 2006-07-21 20:54:32 +0200 (Fri, 21 Jul 2006)
New Revision: 2801
Log:
r12591@frost: paul | 2006-07-21 13:46:34 -0500
Factor out fragment-files target rules to make.d module.
Added:
trunk/make.d/fragment-files
Modified:
trunk/make.d/vars-docbook
trunk/refman-4.1/Makefile
trunk/refman-5.0/Makefile
trunk/refman-5.1/Makefile
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11816
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12586
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11816
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12591
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
Added: trunk/make.d/fragment-files
===================================================================
--- trunk/make.d/fragment-files (rev 0)
+++ trunk/make.d/fragment-files 2006-07-21 18:54:32 UTC (rev 2801)
Changed blocks: 1, Lines Added: 71, Lines Deleted: 0; 2156 bytes
@@ -0,0 +1,71 @@
+# This module is needed only for Reference Manual Makefiles
+
+# Fragment files that need to be generated for inclusion with MySQL
+# distributions. Most depend on manual.txt, one depends on the XML
+# sources.
+
+TEXT_FRAGMENT_FILES = \
+ INSTALL-SOURCE \
+ INSTALL-WIN-SOURCE \
+ INSTALL-BINARY \
+ COPYING \
+ EXCEPTIONS-CLIENT \
+ CHANGELOG \
+ ReadMe.txt
+
+HTML_FRAGMENT_FILES = \
+ ReadMe.html
+
+fragment-files:: $(TEXT_FRAGMENT_FILES) $(HTML_FRAGMENT_FILES)
+
+INSTALL-SOURCE:: manual.txt $(GENERATE_TEXT_FILES)
+ perl -w $(GENERATE_TEXT_FILES) manual.txt \
+ "Installing MySQL" \
+ "MySQL Tutorial" \
+ > $@
+
+INSTALL-WIN-SOURCE:: manual.txt $(GENERATE_TEXT_FILES)
+ perl -w $(GENERATE_TEXT_FILES) manual.txt \
+ "Installing MySQL from Source on Windows" \
+ "Post-Installation Setup and Testing" \
+ > $@
+
+INSTALL-BINARY:: manual.txt $(GENERATE_TEXT_FILES)
+ perl -w $(GENERATE_TEXT_FILES) manual.txt \
+ "Installing MySQL on Other Unix-Like Systems" \
+ "MySQL Installation Using a Source Distribution" \
+ > $@
+
+COPYING:: manual.txt $(GENERATE_TEXT_FILES)
+ perl -w $(GENERATE_TEXT_FILES) manual.txt \
+ "GNU General Public License" \
+ "MySQL FLOSS License Exception" \
+ > $@
+
+EXCEPTIONS-CLIENT:: manual.txt $(GENERATE_TEXT_FILES)
+ perl -w $(GENERATE_TEXT_FILES) manual.txt \
+ "MySQL FLOSS License Exception" \
+ > $@
+
+CHANGELOG:: manual.txt $(GENERATE_TEXT_FILES)
+ perl -w $(GENERATE_TEXT_FILES) manual.txt \
+ "MySQL Change History" \
+ "Porting to Other Systems" \
+ > $@
+
+ReadMe.txt:: manual.txt $(GENERATE_TEXT_FILES)
+ perl -w $(GENERATE_TEXT_FILES) manual.txt \
+ "Installing MySQL on Mac OS X" \
+ "Installing MySQL on NetWare" \
+ > $@
+
+ReadMe.html:: $(MANUAL_SRCS)
+ $(CHAPTERFMT) --no-rebuild mac-os-x-installation.html
+ mv mac-os-x-installation.html ReadMe.html
+
+clean::
+ $(RM) $(TEXT_FRAGMENT_FILES)
+ $(RM) $(HTML_FRAGMENT_FILES)
+
+help::
+ @echo "make fragment-files - generate refman 'fragment' files"
Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook 2006-07-21 17:42:27 UTC (rev 2800)
+++ trunk/make.d/vars-docbook 2006-07-21 18:54:32 UTC (rev 2801)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 0; 618 bytes
@@ -111,6 +111,15 @@
HTML_TO_TEXT ?= lynx -dump -width=70
+# Script that uses entire document but formats output just for a given
+# chapter (or section).
+
+CHAPTERFMT = $(TOOLS_DIR)/chapterfmt.pl
+
+# Script that extracts a piece of manual.txt
+
+GENERATE_TEXT_FILES = $(TOOLS_DIR)/generate-text-files.pl
+
# ----------------------------------------------------------------------
# Transforms
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2006-07-21 17:42:27 UTC (rev 2800)
+++ trunk/refman-4.1/Makefile 2006-07-21 18:54:32 UTC (rev 2801)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 69; 2154 bytes
@@ -72,73 +72,7 @@
mysql.info: manual.info
cp manual.info mysql.info
-# Fragment files that need to be generated for inclusion with
-# MySQL distributions. Most depend on manual.txt, one depends on XML
-# sources.
-
-TEXT_FRAGMENT_FILES = \
- INSTALL-SOURCE \
- INSTALL-WIN-SOURCE \
- INSTALL-BINARY \
- COPYING \
- EXCEPTIONS-CLIENT \
- CHANGELOG \
- ReadMe.txt
-
-HTML_FRAGMENT_FILES = \
- ReadMe.html
-
-fragment-files: $(TEXT_FRAGMENT_FILES) $(HTML_FRAGMENT_FILES)
-
-INSTALL-SOURCE: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL" \
- "MySQL Tutorial" \
- > $@
-
-INSTALL-WIN-SOURCE: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL from Source on Windows" \
- "Post-Installation Setup and Testing" \
- > $@
-
-INSTALL-BINARY: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL on Other Unix-Like Systems" \
- "MySQL Installation Using a Source Distribution" \
- > $@
-
-COPYING: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "GNU General Public License" \
- "MySQL FLOSS License Exception" \
- > $@
-
-EXCEPTIONS-CLIENT: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "MySQL FLOSS License Exception" \
- > $@
-
-CHANGELOG: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "MySQL Change History" \
- "Porting to Other Systems" \
- > $@
-
-ReadMe.txt: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL on Mac OS X" \
- "Installing MySQL on NetWare" \
- > $@
-
-ReadMe.html: $(MANUAL_SRCS)
- $(CHAPTERFMT) --no-rebuild mac-os-x-installation.html
- mv mac-os-x-installation.html ReadMe.html
- #$(RM) mac-os-x-installation.*
-
clean::
- $(RM) $(TEXT_FRAGMENT_FILES)
- $(RM) $(HTML_FRAGMENT_FILES)
$(RM) manual.txt
# Manual page generation
@@ -189,7 +123,5 @@
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-titles
+include $(MAKE_DIR)/fragment-files
include $(MAKE_DIR)/xml-depend
-
-CHAPTERFMT = $(TOOLS_DIR)/chapterfmt.pl
-GT = $(TOOLS_DIR)/generate-text-files.pl
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2006-07-21 17:42:27 UTC (rev 2800)
+++ trunk/refman-5.0/Makefile 2006-07-21 18:54:32 UTC (rev 2801)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 69; 2154 bytes
@@ -72,73 +72,7 @@
mysql.info: manual.info
cp manual.info mysql.info
-# Fragment files that need to be generated for inclusion with
-# MySQL distributions. Most depend on manual.txt, one depends on XML
-# sources.
-
-TEXT_FRAGMENT_FILES = \
- INSTALL-SOURCE \
- INSTALL-WIN-SOURCE \
- INSTALL-BINARY \
- COPYING \
- EXCEPTIONS-CLIENT \
- CHANGELOG \
- ReadMe.txt
-
-HTML_FRAGMENT_FILES = \
- ReadMe.html
-
-fragment-files: $(TEXT_FRAGMENT_FILES) $(HTML_FRAGMENT_FILES)
-
-INSTALL-SOURCE: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL" \
- "MySQL Tutorial" \
- > $@
-
-INSTALL-WIN-SOURCE: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL from Source on Windows" \
- "Post-Installation Setup and Testing" \
- > $@
-
-INSTALL-BINARY: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL on Other Unix-Like Systems" \
- "MySQL Installation Using a Source Distribution" \
- > $@
-
-COPYING: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "GNU General Public License" \
- "MySQL FLOSS License Exception" \
- > $@
-
-EXCEPTIONS-CLIENT: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "MySQL FLOSS License Exception" \
- > $@
-
-CHANGELOG: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "MySQL Change History" \
- "Porting to Other Systems" \
- > $@
-
-ReadMe.txt: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL on Mac OS X" \
- "Installing MySQL on NetWare" \
- > $@
-
-ReadMe.html: $(MANUAL_SRCS)
- $(CHAPTERFMT) --no-rebuild mac-os-x-installation.html
- mv mac-os-x-installation.html ReadMe.html
- #$(RM) mac-os-x-installation.*
-
clean::
- $(RM) $(TEXT_FRAGMENT_FILES)
- $(RM) $(HTML_FRAGMENT_FILES)
$(RM) manual.txt
# Manual page generation
@@ -189,7 +123,5 @@
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-titles
+include $(MAKE_DIR)/fragment-files
include $(MAKE_DIR)/xml-depend
-
-CHAPTERFMT = $(TOOLS_DIR)/chapterfmt.pl
-GT = $(TOOLS_DIR)/generate-text-files.pl
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2006-07-21 17:42:27 UTC (rev 2800)
+++ trunk/refman-5.1/Makefile 2006-07-21 18:54:32 UTC (rev 2801)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 69; 2154 bytes
@@ -72,73 +72,7 @@
mysql.info: manual.info
cp manual.info mysql.info
-# Fragment files that need to be generated for inclusion with
-# MySQL distributions. Most depend on manual.txt, one depends on XML
-# sources.
-
-TEXT_FRAGMENT_FILES = \
- INSTALL-SOURCE \
- INSTALL-WIN-SOURCE \
- INSTALL-BINARY \
- COPYING \
- EXCEPTIONS-CLIENT \
- CHANGELOG \
- ReadMe.txt
-
-HTML_FRAGMENT_FILES = \
- ReadMe.html
-
-fragment-files: $(TEXT_FRAGMENT_FILES) $(HTML_FRAGMENT_FILES)
-
-INSTALL-SOURCE: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL" \
- "MySQL Tutorial" \
- > $@
-
-INSTALL-WIN-SOURCE: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL from Source on Windows" \
- "Post-Installation Setup and Testing" \
- > $@
-
-INSTALL-BINARY: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL on Other Unix-Like Systems" \
- "MySQL Installation Using a Source Distribution" \
- > $@
-
-COPYING: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "GNU General Public License" \
- "MySQL FLOSS License Exception" \
- > $@
-
-EXCEPTIONS-CLIENT: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "MySQL FLOSS License Exception" \
- > $@
-
-CHANGELOG: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "MySQL Change History" \
- "Porting to Other Systems" \
- > $@
-
-ReadMe.txt: manual.txt $(GT)
- perl -w $(GT) manual.txt \
- "Installing MySQL on Mac OS X" \
- "Installing MySQL on NetWare" \
- > $@
-
-ReadMe.html: $(MANUAL_SRCS)
- $(CHAPTERFMT) --no-rebuild mac-os-x-installation.html
- mv mac-os-x-installation.html ReadMe.html
- #$(RM) mac-os-x-installation.*
-
clean::
- $(RM) $(TEXT_FRAGMENT_FILES)
- $(RM) $(HTML_FRAGMENT_FILES)
$(RM) manual.txt
# Manual page generation
@@ -189,7 +123,5 @@
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-titles
+include $(MAKE_DIR)/fragment-files
include $(MAKE_DIR)/xml-depend
-
-CHAPTERFMT = $(TOOLS_DIR)/chapterfmt.pl
-GT = $(TOOLS_DIR)/generate-text-files.pl
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2801 - in trunk: . make.d refman-4.1 refman-5.0 refman-5.1 | paul | 21 Jul |
