Commit 133f1791 authored by Iustin Pop's avatar Iustin Pop
Browse files

Update hscolour usage

This patch fixes two issues related to coloured sources generation.
First, recent hscolour has changed the css file (and we need to update
it), but it also can output it at runtime, so there's no need to store
it anymore in the source tree.

Second, the current source generation predates the addition of sources
in Ganeti/ (as opposed to just Ganeti/HTools), and thus we were missing
the sources in that directory. We replace the target file name to
account for different base directories.
Signed-off-by: default avatarIustin Pop <>
Reviewed-by: default avatarRené Nussbaumer <>
parent dec88196
......@@ -39,10 +39,11 @@ $(DOCS) : %.html : %
doc: $(DOCS) Ganeti/HTools/Version.hs
rm -rf $(HDDIR)/*
mkdir -p $(HDDIR)/Ganeti/HTools
cp hscolour.css $(HDDIR)/Ganeti/HTools
HsColour -print-css > $(HDDIR)/Ganeti/hscolour.css
ln -s ../hscolour.css $(HDDIR)/Ganeti/HTools/hscolour.css
for file in $(HSRCS); do \
HsColour -css -anchor \
$$file > $(HDDIR)/Ganeti/HTools/`basename $$file .hs`.html ; \
hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
HsColour -css -anchor $$file > $(HDDIR)/$$hfile ; \
haddock --odir $(HDDIR) --html --ignore-all-exports \
-t ganeti-htools -p haddock-prologue \
.keyglyph, .layout {color: red;}
.keyword {color: blue;}
.comment, .comment a {color: green;}
.str, .chr {color: teal;}
.keyword,.conid, .varid, .conop, .varop, .num, .cpp, .sel, .definition {}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment