List:Commits« Previous MessageNext Message »
From:john.russell Date:December 15 2010 7:41am
Subject:svn commit - mysqldoc@docsrva: r24444 - trunk/mysql-enterprise-backup-3.5
View as plain text  
Author: jrussell
Date: 2010-12-15 08:41:18 +0100 (Wed, 15 Dec 2010)
New Revision: 24444

Log:
Apply some 3.5.2-isms to the 3.5 Makefile.
There was a problem building PDF on the build machines, see if this fixes it.


Modified:
   trunk/mysql-enterprise-backup-3.5/Makefile
   trunk/mysql-enterprise-backup-3.5/Makefile.depends


Modified: trunk/mysql-enterprise-backup-3.5/Makefile
===================================================================
--- trunk/mysql-enterprise-backup-3.5/Makefile	2010-12-15 05:38:21 UTC (rev 24443)
+++ trunk/mysql-enterprise-backup-3.5/Makefile	2010-12-15 07:41:18 UTC (rev 24444)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 5; 873 bytes

@@ -9,7 +9,7 @@
 # Set any variables here that should override imported standard variables
 
 DOC_LANG = en
-DOC_VER = 3.5
+DOC_VER = 3.5.2
 MAIN_DOC_BASENAME = mysql-enterprise-backup
 GENERATE_AUTOLINK = 1
 

@@ -42,13 +42,10 @@
 # Files for which to generate dependencies
 DEPEND_FILES = manual.xml
 
-# Special rule to build .html + .css target
-
-manual.html-dir: manual.html manual.css
+manual.html-dir: manual.html
 	-$(RM) -r $@ $@-tmp
 	mkdir $@-tmp
 	cp manual.html $@-tmp
-	cp manual.css $@-tmp
 	if [ -e $@-tmp -a -e $@ ]; then \
 		echo $@-tmp and $@ both exist, this should not happen; \
 		exit 1; \


Modified: trunk/mysql-enterprise-backup-3.5/Makefile.depends
===================================================================
--- trunk/mysql-enterprise-backup-3.5/Makefile.depends	2010-12-15 05:38:21 UTC (rev 24443)
+++ trunk/mysql-enterprise-backup-3.5/Makefile.depends	2010-12-15 07:41:18 UTC (rev 24444)
Changed blocks: 3, Lines Added: 43, Lines Deleted: 1; 3118 bytes

@@ -1,3 +1,25 @@
+dynxml_local_news_INCLUDES = \
+	../../mysqldoc/dynamic-docs/changelog/backup-10.xml \
+	../../mysqldoc/dynamic-docs/changelog/backup-versions.xml \
+	../../mysqldoc/dynamic-docs/changelog/backup.xml \
+	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
+	all-entities.ent \
+	news-core.xml
+dynxml_local_news_IMAGES =
+dynxml_local_news_SOURCES = dynxml-local-news.xml $(dynxml_local_news_INCLUDES)
+dynxml_local_news_IDMAPS = \
+	../innodb-1.1/metadata/glossary-core.idmap \
+	metadata/manual.idmap
+dynxml-local-news.validpure: $(dynxml_local_news_SOURCES)
+dynxml-local-news.titles: $(dynxml_local_news_SOURCES)
+dynxml-local-news.useless: $(dynxml_local_news_SOURCES)
+dynxml-local-news.valid: $(dynxml_local_news_SOURCES) $(dynxml_local_news_IDMAPS)
+dynxml-local-news.validwarn: $(dynxml_local_news_SOURCES) $(dynxml_local_news_IDMAPS)
+dynxml-local-news-prepped.xml: $(dynxml_local_news_SOURCES) $(dynxml_local_news_IDMAPS)
+dynxml-local-news-helpprepped.xml: $(dynxml_local_news_SOURCES) $(dynxml_local_news_IDMAPS)
+dynxml-local-news-manprepped.xml: $(dynxml_local_news_SOURCES) $(dynxml_local_news_IDMAPS)
+dynxml-local-news-remprepped.xml: $(dynxml_local_news_SOURCES) $(dynxml_local_news_IDMAPS)
+dynxml-local-news.xml: $(dynxml_local_news_IDMAPS) $(dynxml_local_news_INCLUDES)
 legalnotice_en_INCLUDES = \
 	../common/gpl-notice.en.xml \
 	../common/legalnotice-misc-refman.en.xml \

@@ -17,11 +39,17 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 manual_INCLUDES = \
+	../../mysqldoc/dynamic-docs/changelog/backup-10.xml \
+	../../mysqldoc/dynamic-docs/changelog/backup-versions.xml \
+	../../mysqldoc/dynamic-docs/changelog/backup.xml \
+	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/gpl-notice.en.xml \
 	../common/legalnotice-misc-refman.en.xml \
 	../common/oracle-notice-ga.en.xml \
 	all-entities.ent \
-	legalnotice.en.xml
+	dynxml-local-news.xml \
+	legalnotice.en.xml \
+	news-core.xml
 manual_IMAGES =
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \

@@ -37,4 +65,18 @@
 manual-manprepped.xml: $(manual_SOURCES) $(manual_IDMAPS)
 manual-remprepped.xml: $(manual_SOURCES) $(manual_IDMAPS)
 
+news_core_INCLUDES =
+news_core_IMAGES =
+news_core_SOURCES = news-core.xml $(news_core_INCLUDES)
+news_core_IDMAPS =
+news-core.validpure: $(news_core_SOURCES)
+news-core.titles: $(news_core_SOURCES)
+news-core.useless: $(news_core_SOURCES)
+news-core.valid: $(news_core_SOURCES) $(news_core_IDMAPS)
+news-core.validwarn: $(news_core_SOURCES) $(news_core_IDMAPS)
+news-core-prepped.xml: $(news_core_SOURCES) $(news_core_IDMAPS)
+news-core-helpprepped.xml: $(news_core_SOURCES) $(news_core_IDMAPS)
+news-core-manprepped.xml: $(news_core_SOURCES) $(news_core_IDMAPS)
+news-core-remprepped.xml: $(news_core_SOURCES) $(news_core_IDMAPS)
+
 # End of dependencies


Thread
svn commit - mysqldoc@docsrva: r24444 - trunk/mysql-enterprise-backup-3.5john.russell15 Dec