[svnbook] r4271 committed - Merge ^/trunk/tools:r4267-4270.

svnbook at googlecode.com svnbook at googlecode.com
Thu May 31 16:37:09 CDT 2012


Revision: 4271
Author:   cmpilato at gmail.com
Date:     Thu May 31 14:37:00 2012
Log:      Merge ^/trunk/tools:r4267-4270.
http://code.google.com/p/svnbook/source/detail?r=4271

Modified:
  /branches/1.7/tools
  /branches/1.7/tools/Makefile.base-rules
  /branches/1.7/tools/Makefile.base-vars

=======================================
--- /branches/1.7/tools/Makefile.base-rules	Thu Aug 26 08:55:13 2010
+++ /branches/1.7/tools/Makefile.base-rules	Thu May 31 14:37:00 2012
@@ -73,18 +73,27 @@
  	$(TOOLS_DIR)/bin/run-fop.sh -fo $(FO_TARGET) -ps $(PS_TARGET)

  # Requires at least docbook-xsl-1.74
-epub: book/svn-book.xml $(EPUB_TARGET)
-$(EPUB_TARGET): $(ALL_SOURCE)
+epub: $(EPUB_TARGET)
+$(EPUB_TARGET): $(UNIFIED_XML_TARGET) $(ALL_SOURCE)
  	$(ENSURE_XSL)
  	if [ -x /usr/bin/dbtoepub ] ; then \
-	  /usr/bin/dbtoepub -c book/styles.css -v book/svn-book.xml ;\
+	  /usr/bin/dbtoepub -v -o $(EPUB_TARGET) $(UNIFIED_XML_TARGET) ; \
  	else \
-	  $(TOOLS_DIR)/xsl/epub/bin/dbtoepub -c book/styles.css -v  
book/svn-book.xml ; \
+	  $(TOOLS_DIR)/xsl/epub/bin/dbtoepub -v -o $(EPUB_TARGET)  
$(UNIFIED_XML_TARGET) ; \
  	fi
-	mv svn-book.epub $(EPUB_TARGET)
-
-book/svn-book.xml: version
-	xmllint --nonet --noent --xinclude --postvalid --output book/svn-book.xml  
book/book.xml
+
+mobi: $(MOBI_TARGET)
+$(MOBI_TARGET): $(EPUB_TARGET)
+	if [ -x /usr/bin/ebook-convert ] ; then \
+	  /usr/bin/ebook-convert $(EPUB_TARGET) $(MOBI_TARGET) \
+            --dont-justify --cover book/images/ebook-cover.jpg -v ; \
+	else \
+	  $(TOOLS_DIR)/xsl/epub/bin/ebook-convert $(EPUB_TARGET) $(MOBI_TARGET) \
+            --dont-justify --cover book/images/ebook-cover.jpg -v ; \
+	fi
+
+$(UNIFIED_XML_TARGET): version
+	$(XMLLINT) --nonet --noent --xinclude --postvalid --output  
$(UNIFIED_XML_TARGET) book/book.xml

  # Install targets
  $(INSTALL_SUBDIR):
@@ -116,9 +125,9 @@

  # Clean targets
  clean:
-	rm -f $(VERSION_SOURCE) $(HTML_TARGET)
+	rm -f $(VERSION_SOURCE) $(HTML_TARGET) $(UNIFIED_XML_TARGET)
  	rm -f $(HTML_ARCH_TARGET) $(HTML_CHUNK_ARCH_TARGET)
-	rm -f $(FO_TARGET) $(PDF_TARGET) $(PS_TARGET) $(EPUB_TARGET)
+	rm -f $(FO_TARGET) $(PDF_TARGET) $(PS_TARGET) $(EPUB_TARGET)  
$(MOBI_TARGET)
  	rm -rf $(HTML_CHUNK_DIR)

  # Utility targets
=======================================
--- /branches/1.7/tools/Makefile.base-vars	Tue Mar 31 22:24:17 2009
+++ /branches/1.7/tools/Makefile.base-vars	Thu May 31 14:37:00 2012
@@ -54,9 +54,11 @@
  PS_TARGET = $(DIR)/$(OUTNAME).ps
  FO_TARGET = $(DIR)/$(OUTNAME).fo
  EPUB_TARGET = $(DIR)/$(OUTNAME).epub
+MOBI_TARGET = $(DIR)/$(OUTNAME).mobi
+UNIFIED_XML_TARGET = $(DIR)/$(OUTNAME).xml
  XML_SOURCE = $(DIR)/$(NAME).xml
  VERSION_SOURCE = $(DIR)/version.xml
-ALL_SOURCE = $(filter-out $(DIR)/version.xml $(DIR)/svn-book.xml,  
$(wildcard $(DIR)/*.xml))
+ALL_SOURCE = $(filter-out $(DIR)/version.xml $(UNIFIED_XML_TARGET),  
$(wildcard $(DIR)/*.xml))
  STYLESHEET = $(DIR)/styles.css
  INSTALL_SUBDIR = $(INSTALL_DIR)/$(NAME)





More information about the svnbook-dev mailing list