svn commit - mysqldoc@docsrva: r6739 - in trunk: . make.d mysqltest refman-4.1 refman-5.0 refman-5.1 refman-5.2

[paul]

Author: paul
Date: 2007-06-09 00:41:57 +0200 (Sat, 09 Jun 2007)
New Revision: 6739

Log:
 r26116@polar:  paul | 2007-06-08 17:39:10 -0500
 Reject earlier mechanism for pulling built CHM files into repository
 directories.


Modified:
   trunk/make.d/xml-chm
   trunk/mysqltest/Makefile
   trunk/refman-4.1/Makefile
   trunk/refman-5.0/Makefile
   trunk/refman-5.1/Makefile
   trunk/refman-5.2/Makefile

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:26075
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:21265
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17792
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:26116
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:21265
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17792


Modified: trunk/make.d/xml-chm
===================================================================
--- trunk/make.d/xml-chm	2007-06-08 22:03:39 UTC (rev 6738)
+++ trunk/make.d/xml-chm	2007-06-08 22:41:57 UTC (rev 6739)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 31; 1627 bytes

@@ -1,4 +1,4 @@
-# DocBook -> CHM-input conversion and CHM-output pickup
+# DocBook -> CHM-input conversions
 
 # Prepare CHM input that's ready to be copied to a Windows box and
 # used to produce a CHM document.

@@ -22,38 +22,8 @@
 	fi
 	mv $@-tmp $@
 
-# Grab CHM document and copy to current directory.
-
-# This rule is based on the assumption that CHM documents are built
-# by an external process and deposited into the directory specified
-# by CHM_OUTPUT_DIR.  That variable should be set in your environment
-# to be picked up and used by make.
-
-# If this rule is executed on a host where CHM files are not available
-# as just described, leave CHM_OUTPUT_DIR unset in your environment.
-# In that case, the expected result is that the rule will fail.
-
-CHM_OUTPUT_DIR ?= CHM_OUTPUT_DIR_IS_NOT_SET
-
-%.chm: $(CHM_OUTPUT_DIR)/%.chm
-	@set -e; \
-	if [ "x$(CHM_OUTPUT_DIR)" = "xCHM_OUTPUT_DIR_IS_NOT_SET" ]; then \
-		echo "CHM_OUTPUT_DIR is not set; cannot create $@"; \
-		exit 1; \
-	else \
-		if [ -f $(CHM_OUTPUT_DIR)/$@ ]; then \
-			echo cp $(CHM_OUTPUT_DIR)/$@ $@; \
-			cp $(CHM_OUTPUT_DIR)/$@ $@; \
-		else \
-			echo "$(CHM_OUTPUT_DIR)/$@ not found; cannot create $@"; \
-			exit 1; \
-		fi; \
-	fi
-
 clean::
 	$(RM) -r *.chm-input *.chm-input-tmp
-	$(RM) -r *.chm *.chm-tmp
 
 help::
 	@echo "make file.chm-input       - prepare input for Windows CHM build"
-	@echo "make file.chm             - pick up externally built CHM output"


Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile	2007-06-08 22:03:39 UTC (rev 6738)
+++ trunk/mysqltest/Makefile	2007-06-08 22:41:57 UTC (rev 6739)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 5; 476 bytes

@@ -51,11 +51,6 @@
 clean::
 	$(RM) mysqltest.txt
 
-# Copy file produced by general %.chm rule to file with standard target name.
-
-mysqltest.chm: mysqltest-$(DOC_LANG).chm
-	cp $< $@
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile	2007-06-08 22:03:39 UTC (rev 6738)
+++ trunk/refman-4.1/Makefile	2007-06-08 22:41:57 UTC (rev 6739)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 5; 516 bytes

@@ -67,11 +67,6 @@
 clean::
 	$(RM) fill_help_tables.sql fill_help_tables.sql-tmp
 
-# Copy file produced by general %.chm rule to file with standard target name.
-
-manual.chm: refman-$(DOC_VER)-$(DOC_LANG).chm
-	cp $< $@
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile	2007-06-08 22:03:39 UTC (rev 6738)
+++ trunk/refman-5.0/Makefile	2007-06-08 22:41:57 UTC (rev 6739)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 6; 517 bytes

@@ -69,12 +69,6 @@
 clean::
 	$(RM) fill_help_tables.sql fill_help_tables.sql-tmp
 
-
-# Copy file produced by general %.chm rule to file with standard target name.
-
-manual.chm: refman-$(DOC_VER)-$(DOC_LANG).chm
-	cp $< $@
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2007-06-08 22:03:39 UTC (rev 6738)
+++ trunk/refman-5.1/Makefile	2007-06-08 22:41:57 UTC (rev 6739)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 5; 516 bytes

@@ -70,11 +70,6 @@
 clean::
 	$(RM) fill_help_tables.sql fill_help_tables.sql-tmp
 
-# Copy file produced by general %.chm rule to file with standard target name.
-
-manual.chm: refman-$(DOC_VER)-$(DOC_LANG).chm
-	cp $< $@
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/refman-5.2/Makefile
===================================================================
--- trunk/refman-5.2/Makefile	2007-06-08 22:03:39 UTC (rev 6738)
+++ trunk/refman-5.2/Makefile	2007-06-08 22:41:57 UTC (rev 6739)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 1; 707 bytes

@@ -9,6 +9,7 @@
 # Set any variables here that should override imported standard variables
 
 DOC_LANG = en
+DOC_VER = 5.2
 MAIN_DOC_BASENAME = manual
 
 DOC_URL_BASE = http://dev.mysql.com/doc/refman/5.2/$(DOC_LANG)/

@@ -17,7 +18,7 @@
 
 IDMAP_LANG = $(DOC_LANG)
 IDMAP_MAIN = refman
-IDMAP_VER = 5.2
+IDMAP_VER = $(DOC_VER)
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-common ../refman-4.1 ../refman-5.0 ../refman-5.1 ../internals
../falcon ../ndbapi