[svnbook commit] r2086 - trunk/src/tools
maxb
svnbook-dev at red-bean.com
Sun Mar 19 17:03:54 CST 2006
Author: maxb
Date: Sun Mar 19 17:03:54 2006
New Revision: 2086
Modified:
trunk/src/tools/book-dist.py
trunk/src/tools/build-nightlies
Log:
Propagate HTML archive support.
* src/tools/book-dist.py
* src/tools/build-nightlies
Modified: trunk/src/tools/book-dist.py
==============================================================================
--- trunk/src/tools/book-dist.py (original)
+++ trunk/src/tools/book-dist.py Sun Mar 19 17:03:54 2006
@@ -19,10 +19,12 @@
stream.write("""Usage: %s OPTIONS
Options:
- --html: Make the single-page HTML book
- --html-chunk: Make the chunked HTML book
- --pdf: Make the PDF book
- --name: The base name of the tarball, and top-level tar directory
+ --html: Make the single-page HTML book
+ --html-chunk: Make the chunked HTML book
+ --html-arch: Make the single-page HTML book (in an archive)
+ --html-chunk-arch: Make the chunked HTML book (in an archive)
+ --pdf: Make the PDF book
+ --name: The base name of the tarball, and top-level tar directory
""" % (os.path.basename(sys.argv[0])))
sys.exit(err_msg and 1 or 0)
@@ -31,10 +33,11 @@
try:
optlist, args = getopt.getopt(sys.argv[1:], "h",
['help', 'html', 'html-chunk',
+ 'html-arch', 'html-chunk-arch',
'pdf', 'name='])
except:
usage("Invalid syntax")
- html = html_chunk = pdf = 0
+ html = html_chunk = html_arch = html_chunk_arch = pdf = 0
name = 'svnbook'
targets = []
for opt, arg in optlist:
@@ -44,6 +47,10 @@
html = 1
if opt == '--html-chunk':
html_chunk = 1
+ if opt == '--html-arch':
+ html_arch = 1
+ if opt == '--html-chunk-arch':
+ html_chunk_arch = 1
if opt == '--pdf':
pdf = 1
if opt == '--name':
@@ -54,6 +61,8 @@
if html: targets.append('install-html')
if html_chunk: targets.append('install-html-chunk')
+ if html_arch: targets.append('install-html-arch')
+ if html_chunk_arch: targets.append('install-html-chunk-arch')
if pdf: targets.append('install-pdf')
if len(targets) < 1:
Modified: trunk/src/tools/build-nightlies
==============================================================================
--- trunk/src/tools/build-nightlies (original)
+++ trunk/src/tools/build-nightlies Sun Mar 19 17:03:54 2006
@@ -52,7 +52,8 @@
tarball_base_name = 'svnbook-%s' % (locale)
tarball_name = tarball_base_name + '.tar.gz'
tarball_path = os.path.join(locale_dir, tarball_name)
- book_formats = [ 'html', 'html-chunk', 'pdf' ]
+ book_formats = [ 'html', 'html-chunk', 'html-arch', 'html-chunk-arch',
+ 'pdf' ]
if locale in skip_pdf_locales:
book_formats.remove('pdf')
@@ -107,9 +108,13 @@
""" % time.asctime(time.gmtime(time.time())))
for locale in built_locales:
fp.write("""<dt>%s</dt>
-<dd>[<a href="%s/svn-book.html">single-page HTML</a>]</dd>
-<dd>[<a href="%s/index.html">multi-page HTML</a>]</dd>
-""" % (locale.upper(), locale, locale))
+<dd>[<a href="%s/svn-book.html">single-page HTML (read online)</a>]</dd>
+<dd>[<a href="%s/index.html">multi-page HTML (read online)</a>]</dd>
+<dd>[<a href="%s/svn-book-html.tar.bz2"
+ >single-page HTML (in .tar.bz2)</a>]</dd>
+<dd>[<a href="%s/svn-book-html-chunk.tar.bz2"
+ >multi-page HTML (in .tar.bz2)</a>]</dd>
+""" % (locale.upper(), locale, locale, locale, locale))
if locale not in skip_pdf_locales:
fp.write('<dd>[<a href="%s/svn-book.pdf">PDF</a>]</dd>\n' % locale)
fp.write("""</dl>
More information about the svnbook-dev
mailing list