summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-06-25 11:53:15 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-06-25 11:53:15 -0700
commita255588a71d521910737f97d93d23051fdf0a748 (patch)
treeb5a4b766be767bb9275f52ff22f6af43d59884be
parent1d3f5a9c236cba44ac342018ac871dbafe98ea7b (diff)
downloadnasmbuild-a255588a71d521910737f97d93d23051fdf0a748.tar.gz
nasmbuild-a255588a71d521910737f97d93d23051fdf0a748.tar.xz
nasmbuild-a255588a71d521910737f97d93d23051fdf0a748.zip
Export all the documentation, not just HTML
-rwxr-xr-xbuildall.sh13
1 files changed, 8 insertions, 5 deletions
diff --git a/buildall.sh b/buildall.sh
index 4797b0f..c7fe0f9 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -32,7 +32,7 @@ build () {
jobs=$((cpus+2))
makej="make -j$jobs"
- rm -rf nasm-* win32 dos macosx os2 rpmbuild html
+ rm -rf nasm-* win32 dos macosx os2 rpmbuild doc html
mkdir -p rpmbuild/{BUILD,RPMS,SRPMS,SPECS,SOURCES}
# --- Generate tarballs ---
@@ -51,10 +51,10 @@ build () {
rpmbuild --target x86_64 -ta nasm-$version.tar.bz2
# --- Expand tarballs (generate combined src+doc working tree) ---
- tar xfj nasm-$version.tar.bz2
tar xfj nasm-$version-xdoc.tar.bz2
+ cp -a nasm-$version/doc .
- cp -a nasm-$version/doc/html .
+ tar xfj nasm-$version.tar.bz2
# --- Generate Win32 binaries ---
mkdir -p win32
@@ -135,14 +135,17 @@ build () {
mv -f nasm-${version}-os2.zip "$outdir"/os2/
# Linux (RPMS)
find rpmbuild -name \*.rpm -exec mv -f '{}' "$outdir"/linux/ \;
+ # Expanded docs
+ cp -a doc "$outdir"/doc
echo "$version" "$rev" >> build-ids
}
# This gets run for real (tagged) releases
process_release () {
- rm -rf $web/docs/"$1"
- cp -a html $web/docs/"$1"
+ rm -rf $web/docs/"$1" $web/xdoc/"$1"
+ cp -al "$outdir"/doc/html $web/docs/"$1"
+ cp -al "$outdir"/doc $web/xdoc/"$1"
case "$1" in
*rc*)
# -rc release