Bug#611486: RFP: hgbook -- Mercurial: The Definitive Guide

[Jonathan Nieder <jrnieder@gmail.com>]

Jonathan Nieder wrote:

> * URL             : http://hgbook.red-bean.com/
>                     http://bitbucket.org/bos/hgbook
> * License         : Open Publication License 1.0 (without license options)
>   Programming Lang: DocBook XML v4.4
>   Description     : Mercurial: The Definitive Guide - HTML version
>
> This manual provides a leisurely but complete introduction to
> Mercurial version control system.

Fails to build from source, because of this lovely line in en/fixsvg:

 test -d hello || hg clone http://hg.serpentine.com/tutorial/hello

Yagh.  Here's a start to packaging that works around that.

I'm not sure where /tmp/REV7.my-new-hello and friends are supposed
to come from.

Caveats:

 - Build-depends-indep line is nonsense;
 - no installation rules yet;
 - clean rule is not thorough;
 - resulting documentation should be changed to use relative
   paths instead of invalid absolute ones;
 - some of the examples have been made silly due to the workaround
   for lack of network access;
 - no translations yet.

Still, maybe this can save someone some time?

From: Jonathan Nieder <jrnieder@gmail.com>
Subject: hacks to get the hgbook to build

 - update some paths in en/Makefile;
 - do not talk to the network at build time
 - add a distclean target that cleans up a little more thoroughly.
---
diff --git a/en/Makefile b/en/Makefile
--- a/en/Makefile
+++ b/en/Makefile
@@ -131,7 +131,7 @@
 websup: $(extras-web) $(image-web)
 	mkdir -p $(obj-websup)/figs $(obj-web-read)/figs
 	cp ../stylesheets/system-xsl/images/*.png $(obj-websup)/figs
-	cp -f ../web/icons/*.png $(obj-websup)/figs
+	cp -f ../web/support/icons/*.png $(obj-websup)/figs
 
 complete.xml: .validated-00book.xml
 	$(xsltproc) $(xsltproc-opts) -o $@ ../stylesheets/dtd-profile.xsl 00book.xml
@@ -182,6 +182,13 @@
 	-rm -rf dist html $(image-dot:%.dot=%.pdf) $(image-dot:%.dot=%.png) \
 	  $(image-svg:%.svg=%.png) examples/*.{lxo,run} examples/.run
 
+distclean: clean
+	rm -f examples/results/*
+	rm -f ../web/hgbook/*.pyc ../web/hgbook/comments/*.pyc
+	rm -f ../web/index-read.html.in
+	rm -f .validated-00book.xml complete.xml
+	rm -f ../stylesheets/system-xsl
+
 install: html $(dist-sources)
 	rm -rf dist
 	mkdir -p dist
@@ -192,8 +199,10 @@
 	rsync -avz --delete dist sp.red-bean.com:public_html/hgbook
 
 vpath %.css ../web
+vpath %.css ../web/support/styles
 vpath %.html.in ../web
 vpath %.js ../web/javascript
+vpath %.js ../web/support/javascript
 
 $(obj-websup)/%.css: %.css
 	@mkdir -p $(dir $@)
diff --git a/en/examples/run-example b/en/examples/run-example
--- a/en/examples/run-example
+++ b/en/examples/run-example
@@ -177,7 +177,7 @@
         else:
             return rs
             
-    timeout = 5
+    timeout = 30
 
     def read(self, hint):
         events = self.poll.poll(self.timeout * 1000)
diff --git a/en/examples/tour b/en/examples/tour
--- a/en/examples/tour
+++ b/en/examples/tour
@@ -10,7 +10,7 @@
 
 #$ name: clone
 
-hg clone http://hg.serpentine.com/tutorial/hello
+hg clone hello.bundle hello
 
 #$ name: ls
 #$ ignore: ^drwx.*
@@ -141,11 +141,11 @@
 
 #$ name: outgoing.net
 
-hg outgoing http://hg.serpentine.com/tutorial/hello
+hg outgoing ../hello.bundle
 
 #$ name: push.net
 
-hg push http://hg.serpentine.com/tutorial/hello
+hg push ../hello.bundle
 
 #$ name:
 cp hello.c ../new-hello.c
diff --git a/en/fixsvg b/en/fixsvg
--- a/en/fixsvg
+++ b/en/fixsvg
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-test -d hello || hg clone http://hg.serpentine.com/tutorial/hello
+test -d hello || hg clone hello.bundle hello
 
 set -e
 
diff --git a/web/hgbook/admin.py b/web/hgbook/admin.py
--- a/web/hgbook/admin.py
+++ b/web/hgbook/admin.py
@@ -1,3 +1,6 @@
+from django.core.management import setup_environ
+import settings
+setup_environ(settings)
 from django.contrib import admin
 from hgbook.comments.models import Comment, Element

Attachment: debian.tar.xz
Description: Binary data