comparison make/make.sh @ 72:3232f421c770

Exit if any of the patches fail to apply, show name of each patch as it's applied, and use the patched Documentation directory to build htmldocs.
author Rob Landley <rob@landley.net>
date Tue, 16 Oct 2007 21:44:50 -0500
parents 86151d3b2003
children 6adf16f10d54
comparison
equal deleted inserted replaced
71:d74a0e18965b 72:3232f421c770
86 echo Install updated Documentation 86 echo Install updated Documentation
87 87
88 rm -rf $WEBDIR/Documentation/ 88 rm -rf $WEBDIR/Documentation/
89 cp -a $LNXDIR/hg/Documentation $WEBDIR/Documentation 89 cp -a $LNXDIR/hg/Documentation $WEBDIR/Documentation
90 cd $WEBDIR 90 cd $WEBDIR
91 cat make/patches/*.patch | patch -p1 91 for i in make/patches/*.patch
92 do
93 echo $i
94 patch -p1 -i $i || exit 1
95 done
92 make/docdiridx.py 96 make/docdiridx.py
93 97
94 [ "$1" == "--short" ] && exit 1 98 [ "$1" == "--short" ] && exit 1
95 99
96 echo Build htmldocs and xhtml-nochunks 100 echo Build htmldocs and xhtml-nochunks
97 101
98 rm -rf $LNXDIR/temp 102 rm -rf $LNXDIR/temp
99 cd $LNXDIR/hg 103 cd $LNXDIR/hg
100 mkdir $LNXDIR/temp 104 mkdir $LNXDIR/temp
101 make allnoconfig O=$LNXDIR/temp 105 make allnoconfig O=$LNXDIR/temp
106
107 # Adjust to use the patched Documentation directory
108 ln -s $WEBDIR/Documentation $LNXDIR/temp
102 109
103 # I have a dual processor laptop, so overlap work here. Generate the xml 110 # I have a dual processor laptop, so overlap work here. Generate the xml
104 # first, then have make htmldocs produce split-up versions in the background 111 # first, then have make htmldocs produce split-up versions in the background
105 # while a script produces nochunks versions in the foreground. 112 # while a script produces nochunks versions in the foreground.
106 cd $LNXDIR/temp 113 cd $LNXDIR/temp
123 mv xhtml-nochunks/*.html . 130 mv xhtml-nochunks/*.html .
124 rmdir xhtml-nochunks 131 rmdir xhtml-nochunks
125 132
126 echo Install htmldocs and update index 133 echo Install htmldocs and update index
127 134
128 rm -rf $WEBDIR/htmldocs 135 rm -f $WEBDIR/htmldocs
129 cp -a $LNXDIR/temp/Documentation/DocBook $WEBDIR/htmldocs 136 ln -s Documentation/DocBook $WEBDIR/htmldocs
130 cd $WEBDIR/htmldocs 137 cd $WEBDIR/htmldocs
131 # Work around a bug in xmlto: it puts an incorrect code page into the converted 138 # Work around a bug in xmlto: it puts an incorrect code page into the converted
132 # html documents, which produces line noise in the output. 139 # html documents, which produces line noise in the output.
133 find . -name "*.html" | xargs sed -i -e 's/.*ISO-8859-1.*//' 140 find . -name "*.html" | xargs sed -i -e 's/.*ISO-8859-1.*//'
134 head -n 2 index.html > index2.html 141 head -n 2 index.html > index2.html