[svnbook commit] r1784 - in trunk/src: ru tools
maxb
svnbook-dev at red-bean.com
Tue Nov 1 09:05:03 CST 2005
Author: maxb
Date: Tue Nov 1 09:05:01 2005
New Revision: 1784
Modified:
trunk/src/ru/Makefile
trunk/src/tools/Makefile.base
trunk/src/tools/Makefile.base-rules
trunk/src/tools/book-dist.py
Log:
Deprecate some redundant or overly verbose Make target names, whilst
introducing some shorter, more appropriate forms.
* tools/Makefile.base-rules: Fully support target names without a redundant
'book-' prefix/infix.
(fo): New target.
(all-ps, all-pdf): Deprecate useless aliases.
* tools/Makefile.base: Add compatibility targets, temporarily.
* tools/book-dist.py, ru/Makefile: Change to use the non-deprecated forms.
Modified: trunk/src/ru/Makefile
==============================================================================
--- trunk/src/ru/Makefile (original)
+++ trunk/src/ru/Makefile Tue Nov 1 09:05:01 2005
@@ -1,4 +1,4 @@
-default: book-html-chunk
+default: html-chunk
include ../tools/Makefile.base
Modified: trunk/src/tools/Makefile.base
==============================================================================
--- trunk/src/tools/Makefile.base (original)
+++ trunk/src/tools/Makefile.base Tue Nov 1 09:05:01 2005
@@ -8,3 +8,21 @@
DIR = book
IMAGES = $(DIR)/images/*.png
include ../tools/Makefile.base-rules
+
+# Compatibility targets - the book buildsystem had quite target names which
+# were either redundant or overly verbose. These remain for a little while,
+# whilst scripts are adapted, and people retrain their fingers.
+all-book: all
+all-pdf: pdf
+all-ps: ps
+book-version: version
+book-html: html
+book-html-chunk: html-chunk
+book-pdf: pdf
+book-ps: ps
+install-book: install
+install-book-html: install-html
+install-book-html-chunk: install-html-chunk
+install-book-pdf: install-pdf
+install-book-ps: install-ps
+book-clean: clean
Modified: trunk/src/tools/Makefile.base-rules
==============================================================================
--- trunk/src/tools/Makefile.base-rules (original)
+++ trunk/src/tools/Makefile.base-rules Tue Nov 1 09:05:01 2005
@@ -1,22 +1,13 @@
# See comment in ./Makefile.base-vars
# Grouping targets
-all: all-book
-all-book: book-html book-html-chunk book-pdf book-ps
-all-html: book-html book-html-chunk
-all-pdf: book-pdf
-all-ps: book-ps
-
-install: install-book
-install-book: install-book-html install-book-html-chunk \
- install-book-pdf install-book-ps
-
-clean: book-clean
+all: html html-chunk pdf ps
+all-html: html html-chunk
+install: install-html install-html-chunk install-pdf install-ps
# Build targets
-$(VERSION_SOURCE): book-version
-
-book-version:
+$(VERSION_SOURCE): version
+version:
@if $(SVNVERSION) . > /dev/null; then \
echo '<!ENTITY svn.version "$(L10N_REVISION) '`$(SVNVERSION) .`'">' \
> $(VERSION_SOURCE).tmp; \
@@ -29,7 +20,7 @@
mv $(VERSION_SOURCE).tmp $(VERSION_SOURCE); \
fi
-book-html: $(HTML_TARGET)
+html: $(HTML_TARGET)
$(HTML_TARGET): $(ALL_SOURCE) $(VERSION_SOURCE) $(STYLESHEET) $(IMAGES)
$(ENSURE_XSL)
$(XSLTPROC) $(HTML_XSLTPROC_OPTS) --output $(HTML_TARGET) \
@@ -37,7 +28,7 @@
# The trailing slash on the xsltproc --output option is essential to
# output pages into the directory
-book-html-chunk: $(HTML_CHUNK_TARGET)
+html-chunk: $(HTML_CHUNK_TARGET)
$(HTML_CHUNK_TARGET): $(ALL_SOURCE) $(VERSION_SOURCE) $(STYLESHEET) $(IMAGES)
mkdir -p $(HTML_CHUNK_DIR)
mkdir -p $(HTML_CHUNK_DIR)/images
@@ -48,17 +39,18 @@
cp $(STYLESHEET) $(HTML_CHUNK_DIR)
$(IFIMAGES) cp $(IMAGES) $(HTML_CHUNK_DIR)/images $(ENDIF)
+fo: $(FO_TARGET)
$(FO_TARGET): $(ALL_SOURCE) $(VERSION_SOURCE) $(IMAGES)
$(ENSURE_XSL)
$(XSLTPROC) $(FO_XSLTPROC_OPTS) --output $(FO_TARGET) \
$(TOOLS_DIR)/fo-stylesheet.xsl $(XML_SOURCE)
-book-pdf: $(PDF_TARGET)
+pdf: $(PDF_TARGET)
$(PDF_TARGET): $(FO_TARGET) $(IMAGES)
$(TOOLS_DIR)/bin/run-fop.sh . -fo $(FO_TARGET) \
-pdf $(PDF_TARGET)
-book-ps: $(PS_TARGET)
+ps: $(PS_TARGET)
$(PS_TARGET): $(FO_TARGET) $(IMAGES)
$(TOOLS_DIR)/bin/run-fop.sh . -fo $(FO_TARGET) \
-ps $(PS_TARGET)
@@ -67,26 +59,26 @@
$(INSTALL_SUBDIR):
$(INSTALL) -d $(INSTALL_SUBDIR)
-install-book-html: $(HTML_TARGET) $(INSTALL_SUBDIR)
+install-html: $(HTML_TARGET) $(INSTALL_SUBDIR)
$(INSTALL) -d $(INSTALL_SUBDIR)/images
$(INSTALL) $(HTML_TARGET) $(INSTALL_SUBDIR)
$(INSTALL) $(STYLESHEET) $(INSTALL_SUBDIR)
$(IFIMAGES) $(INSTALL) $(IMAGES) $(INSTALL_SUBDIR)/images $(ENDIF)
-install-book-html-chunk: $(HTML_CHUNK_TARGET) $(INSTALL_SUBDIR)
+install-html-chunk: $(HTML_CHUNK_TARGET) $(INSTALL_SUBDIR)
$(INSTALL) -d $(INSTALL_SUBDIR)/images
$(INSTALL) $(HTML_CHUNK_DIR)/*.html $(INSTALL_SUBDIR)
$(INSTALL) $(STYLESHEET) $(INSTALL_SUBDIR)
$(IFIMAGES) $(INSTALL) $(IMAGES) $(INSTALL_SUBDIR)/images $(ENDIF)
-install-book-pdf: $(PDF_TARGET) $(INSTALL_SUBDIR)
+install-pdf: $(PDF_TARGET) $(INSTALL_SUBDIR)
$(INSTALL) $(PDF_TARGET) $(INSTALL_SUBDIR)
-install-book-ps: $(PS_TARGET) $(INSTALL_SUBDIR)
+install-ps: $(PS_TARGET) $(INSTALL_SUBDIR)
$(INSTALL) $(PS_TARGET) $(INSTALL_SUBDIR)
# Clean targets
-book-clean:
+clean:
rm -f $(VERSION_SOURCE)
rm -f $(HTML_TARGET) $(FO_TARGET)
rm -rf $(HTML_CHUNK_DIR)
Modified: trunk/src/tools/book-dist.py
==============================================================================
--- trunk/src/tools/book-dist.py (original)
+++ trunk/src/tools/book-dist.py Tue Nov 1 09:05:01 2005
@@ -55,9 +55,9 @@
if os.path.basename(name) != name:
usage('Name "%s" is not a single path component' % (name))
- if html: targets.append('install-book-html')
- if html_chunk: targets.append('install-book-html-chunk')
- if pdf: targets.append('install-book-pdf')
+ if html: targets.append('install-html')
+ if html_chunk: targets.append('install-html-chunk')
+ if pdf: targets.append('install-pdf')
if len(targets) < 1:
usage('No targets specified.')
@@ -73,7 +73,7 @@
try:
_cleanup_tmp_dirs()
os.mkdir('__SVNBOOK_TMP__')
- os.system('DESTDIR=__SVNBOOK_TMP__ make book-clean %s' \
+ os.system('DESTDIR=__SVNBOOK_TMP__ make clean %s' \
% (' '.join(targets)))
if os.path.isdir('__SVNBOOK_TMP__/usr/share/doc/subversion/book'):
os.rename('__SVNBOOK_TMP__/usr/share/doc/subversion/book', name)
More information about the svnbook-dev
mailing list