[svnbook commit] r2085 - trunk/src/tools

[maxb]

Author: maxb
Date: Sun Mar 19 16:44:42 2006
New Revision: 2085

Modified:
   trunk/src/tools/Makefile.base-rules
   trunk/src/tools/Makefile.base-vars

Log:
Implement HTML tarball creation targets.

* src/tools/Makefile.base-vars
  (ARCH_CMD, ARCH_EXT, HTML_ARCH_BASENAME, HTML_CHUNK_ARCH_BASENAME,
  HTML_ARCH_TARGET, HTML_CHUNK_ARCH_TARGET): New variables.

* src/tools/Makefile.base-rules
  (html-arch, html-chunk-arch, install-html-arch, install-html-chunk-arch):
    New targets.
  (clean): Adjust.


Modified: trunk/src/tools/Makefile.base-rules
==============================================================================
--- trunk/src/tools/Makefile.base-rules	(original)
+++ trunk/src/tools/Makefile.base-rules	Sun Mar 19 16:44:42 2006
@@ -39,6 +39,21 @@
 	cp $(STYLESHEET) $(HTML_CHUNK_DIR)
 	$(IFIMAGES) cp $(IMAGES) $(HTML_CHUNK_DIR)/images $(ENDIF)
 
+html-arch: $(HTML_ARCH_TARGET)
+$(HTML_ARCH_TARGET): $(HTML_TARGET) $(IMAGES)
+	rm -rf $(HTML_ARCH_BASENAME) && \
+	$(MAKE) install-html INSTALL_SUBDIR=$(HTML_ARCH_BASENAME) && \
+	$(ARCH_CMD) $@ $(HTML_ARCH_BASENAME) && \
+	rm -rf $(HTML_ARCH_BASENAME)
+
+html-chunk-arch: $(HTML_CHUNK_ARCH_TARGET)
+$(HTML_CHUNK_ARCH_TARGET): $(HTML_CHUNK_TARGET) $(IMAGES)
+	rm -rf $(HTML_CHUNK_ARCH_BASENAME) && \
+	$(MAKE) install-html-chunk \
+	  INSTALL_SUBDIR=$(HTML_CHUNK_ARCH_BASENAME) && \
+	$(ARCH_CMD) $@ $(HTML_CHUNK_ARCH_BASENAME) && \
+	rm -rf $(HTML_CHUNK_ARCH_BASENAME)
+
 fo: $(FO_TARGET)
 $(FO_TARGET): $(ALL_SOURCE) $(VERSION_SOURCE) $(IMAGES)
 	$(ENSURE_XSL)
@@ -69,6 +84,12 @@
 	$(INSTALL_DATA) $(STYLESHEET) $(INSTALL_SUBDIR)
 	$(IFIMAGES) $(INSTALL_DATA) $(IMAGES) $(INSTALL_SUBDIR)/images $(ENDIF)
 
+install-html-arch: $(HTML_ARCH_TARGET) $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) $(HTML_ARCH_TARGET) $(INSTALL_SUBDIR)
+
+install-html-chunk-arch: $(HTML_CHUNK_ARCH_TARGET) $(INSTALL_SUBDIR)
+	$(INSTALL_DATA) $(HTML_CHUNK_ARCH_TARGET) $(INSTALL_SUBDIR)
+
 install-pdf: $(PDF_TARGET) $(INSTALL_SUBDIR)
 	$(INSTALL_DATA) $(PDF_TARGET) $(INSTALL_SUBDIR)
 
@@ -77,10 +98,10 @@
 
 # Clean targets
 clean:
-	rm -f $(VERSION_SOURCE)
-	rm -f $(HTML_TARGET) $(FO_TARGET)
+	rm -f $(VERSION_SOURCE) $(HTML_TARGET)
+	rm -f $(HTML_ARCH_TARGET) $(HTML_CHUNK_ARCH_TARGET)
+	rm -f $(FO_TARGET) $(PDF_TARGET) $(PS_TARGET)
 	rm -rf $(HTML_CHUNK_DIR)
-	rm -f $(PDF_TARGET) $(PS_TARGET) 
 
 # Utility targets
 valid: $(VERSION_SOURCE)

Modified: trunk/src/tools/Makefile.base-vars
==============================================================================
--- trunk/src/tools/Makefile.base-vars	(original)
+++ trunk/src/tools/Makefile.base-vars	Sun Mar 19 16:44:42 2006
@@ -43,6 +43,12 @@
 # In the HTML chunk build, index.html is created last, so serves as an 
 # acceptable timestamp file for the entire multi-file output.
 HTML_CHUNK_TARGET = $(HTML_CHUNK_DIR)/index.html
+ARCH_CMD = tar -jcvf
+ARCH_EXT = .tar.bz2
+HTML_ARCH_BASENAME = $(OUTNAME)-html
+HTML_CHUNK_ARCH_BASENAME = $(OUTNAME)-html-chunk
+HTML_ARCH_TARGET = $(DIR)/$(HTML_ARCH_BASENAME)$(ARCH_EXT)
+HTML_CHUNK_ARCH_TARGET = $(DIR)/$(HTML_CHUNK_ARCH_BASENAME)$(ARCH_EXT)
 PDF_TARGET = $(DIR)/$(OUTNAME).pdf
 PS_TARGET = $(DIR)/$(OUTNAME).ps
 FO_TARGET = $(DIR)/$(OUTNAME).fo