infrastructure/build-docs Makefile, 1.3, 1.4 build-docs, 1.2, 1.3 build-docs.conf, 1.2, 1.3 build-docs.cron, 1.2, 1.3 build-docs.spec, 1.4, 1.5
Tommy Reynolds (jtr)
fedora-docs-commits at redhat.com
Tue Apr 18 00:43:23 UTC 2006
Author: jtr
Update of /cvs/docs/infrastructure/build-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7416
Modified Files:
Makefile build-docs build-docs.conf build-docs.cron
build-docs.spec
Log Message:
1) Heavy re-write.
2) Needed to compute ${LANGUAGES}; many documents now build.
3) Added "make -k" switch to build as many locales as we can, even if
one fails, we can display the others.
4) Placed all log files into the public directory, so we can easily
see what failed and why.
Index: Makefile
===================================================================
RCS file: /cvs/docs/infrastructure/build-docs/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 13 Feb 2006 20:05:04 -0000 1.3
+++ Makefile 18 Apr 2006 00:43:20 -0000 1.4
@@ -18,12 +18,12 @@
.PHONY: default
.PHONY: tarball
-tarball: clean
- rm -rf /tmp/$(PKGNAME)-$(VERSION)
+tarball: distclean
+ ${RM} -rf /tmp/$(PKGNAME)-$(VERSION)
mkdir -p /tmp/$(PKGNAME)-$(VERSION)
cp -a * /tmp/$(PKGNAME)-$(VERSION)
tar -C /tmp --exclude CVS --bzip2 -cSpf $(PKGNAME)-$(VERSION).tar.bz2 $(PKGNAME)-$(VERSION)
- rm -rf /tmp/$(PKGNAME)-$(VERSION)
+ ${RM} -rf /tmp/$(PKGNAME)-$(VERSION)
srpm: tarball
rpmbuild --define "_srcrpmdir $(SOURCEDIR)" -ts $(PKGNAME)-$(VERSION).tar.bz2
@@ -46,8 +46,8 @@
install README $(INSTROOT)$(DOCDIR)/README
uninstall:
- @rm -fv $(INSTROOT)/etc/cron.hourly/$(PKGNAME).cron
- @rm -fv $(INSTROOT)$(BINDIR)/$(PKGNAME)
+ @${RM} -fv $(INSTROOT)/etc/cron.hourly/$(PKGNAME).cron
+ @${RM} -fv $(INSTROOT)$(BINDIR)/$(PKGNAME)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)/etc/cron.hourly
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)/etc
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(PKGLOCALSTATEDIR)
@@ -58,12 +58,15 @@
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(PREFIX)
uninstall-docs:
- @rm -fv $(INSTROOT)$(DOCDIR)/README
+ @${RM} -fv $(INSTROOT)$(DOCDIR)/README
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(DOCDIR)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(DATADIR)
@-rmdir -v --ignore-fail-on-non-empty $(INSTROOT)$(PREFIX)
.PHONY: clean
clean:
- @rm -fv $(PKGNAME)-$(VERSION)-$(RELEASE).src.rpm
- @rm -fv $(PKGNAME)-$(VERSION).tar.bz2
+
+.PHONY: distclean clobber
+distclean clobber: clean
+ ${RM} *.src.rpm
+ ${RM} *.tar.bz2
Index: build-docs
===================================================================
RCS file: /cvs/docs/infrastructure/build-docs/build-docs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-docs 13 Feb 2006 19:26:36 -0000 1.2
+++ build-docs 18 Apr 2006 00:43:20 -0000 1.3
@@ -7,210 +7,388 @@
# Dedicated to the lazy Fedora Docs heroes. ;-)
#
# Pull all active FDP docs from CVS, build and install HTML in
-# TARGETDIR folder.
+# PREFIX folder.
#
-MYSELF="$(basename "$0")"
+ME=$(basename "$0")
NOW="$(date +%Y%m%d%H%M%S)"
+VERBOSE=0
+
+########################################################################
+# die <exit-status> "message"
+########################################################################
+
+die () {
+ obit="$1"
+ shift
+ echo "${ME}: $@" >&2
+ exit ${obit}
+}
+
+########################################################################
+# babble <level> "message"
+########################################################################
+
+babble () {
+ level=$1
+ if [ $level -le ${VERBOSE} ]; then
+ shift
+ LEADIN='. '
+ for n in $(seq 1 $level)
+ do
+ echo -n "${LEADIN}" >&2
+ done
+ echo "$@" >&2
+ fi
+}
+
+########################################################################
+# do_html_chunks
+########################################################################
+
+do_html_chunks () {
+ babble 1 "Building chunked HTML for ${DOCBASE}"
+ DESTDIR=${PREFIX}/${DOCBASE}
+ mkdir -p ${DESTDIR}
+ if make -k html >${DESTDIR}/make_chunks_log.txt 2>&1; then
+ babble 2 "All languages built; removing 'make_chunks_log.txt'"
+ rm -f ${DESTDIR}/make_chunks_log.txt
+ else
+ babble 2 "Some locales failed; see 'make_chunks_log.txt'"
+ fi
+ babble 2 "Defined locales '${LANGUAGES}'"
+ for LANG in $LANGUAGES ; do
+ rm -rf ${DESTDIR}/${LANG}
+ if [ -f ${DOCBASE}-${LANG}/index.html ]; then
+ babble 3 "Locale '${LANG}' built"
+ mkdir -p ${DESTDIR}/${LANG}
+ cp -r ${DOCBASE}-${LANG}/* ${DESTDIR}/${LANG}/
+ else
+ babble 3 "Locale '${LANG}' did not build"
+ fi
+ done
+}
+
+########################################################################
+# do_html_nochunks
+########################################################################
+
+do_html_nochunks () {
+ babble 1 "Building no-chunk HTML for ${DOCBASE}"
+ DESTDIR="${PREFIX}/${DOCBASE}"
+ mkdir -p ${DESTDIR}
+ if make -k html-nochunks >${DESTDIR}/make_nochunks_log.txt 2>&1; then
+ babble 2 "All languages built; removing 'make_nochunks_log.txt'"
+ rm -f ${DESTDIR}/make_nochunks_log.txt
+ else
+ babble 2 "Some locales failed; see 'make_nochunks_log.txt'"
+ fi
+ babble 2 "Defined locales '${LANGUAGES}'"
+ for LANG in $LANGUAGES ; do
+ rm -f ${DESTDIR}/${DOCBASE}-${LANG}.html
+ if [ -f ${DOCBASE}-${LANG}.html ]; then
+ babble 3 "Locale '${LANG}' built"
+ cp -r ${DOCBASE}-${LANG}.html ${DESTDIR}/
+ else
+ babble 3 "Locale '${LANG}' did not build"
+ fi
+ done
+}
+
+########################################################################
+# do_tarball
+########################################################################
+
+do_tarball () {
+ babble 1 "Building binary tarball for ${DOCBASE}"
+ DESTDIR=${PREFIX}/${DOCBASE}
+ mkdir -p ${DESTDIR}
+ if make tarball >${DESTDIR}/make_tarball_log.txt 2>&1; then
+ babble 2 "All tarballs built; removing 'make_tarball_log.txt'"
+ rm -f ${DESTDIR}/make_tarball_log.txt
+ else
+ babble 2 "Build failed; see 'make_tarball_log.txt'"
+ fi
+ babble 2 "Defined locales '${LANGUAGES}'"
+ for LANG in ${LANGUAGES} ; do
+ TARBALL=${DOCBASE}-${LANG}.tar.gz
+ rm -f ${DESTDIR}/${TARBALL}
+ if [ -f ${TARBALL} ]; then
+ babble 3 "Locale '${LANG}' tarball installed"
+ cp ${TARBALL} ${DESTDIR}/${TARBALL}
+ else
+ babble 3 "Locale '${LANG}' did not build"
+ fi
+ done
+}
+
+########################################################################
+# do_src_tarball
+########################################################################
+
+do_src_tarball () {
+ babble 1 "Building source tarball for ${DOCBASE}"
+ DESTDIR=${PREFIX}/${DOCBASE}
+ if make tarball >${DESTDIR}/make_src_tarball_log.txt 2>&1; then
+ babble 2 \
+ "All src tarballs built; removing 'make_src_tarball_log.txt'"
+ rm -f ${DESTDIR}/make_src_tarball_log.txt
+ else
+ babble 2 "Build failed; see 'make_src_tarball_log.txt'"
+ fi
+ # Isn't there really only ONE src tarball?
+ babble 2 "Defined locales '${LANGUAGES}'"
+ for LANG in $LANGUAGES ; do
+ TARBALL=${DOCBASE}.src.tar.gz
+ rm -f ${DESTDIR}/${TARBALL}
+ if [ -f ${TARBALL} ]; then
+ babble 3 "Locale '${LANG}' source tarball installed"
+ cp ${TARBALL} ${DESTDIR}/${TARBALL}
+ else
+ babble 3 "Locale '${LANG}' source tarball did not build"
+ fi
+ done
+}
+
+########################################################################
+# do_srpm
+########################################################################
+
+do_srpm () {
+ babble 1 "Building SRPM package for ${DOCBASE}"
+ DESTDIR=${PREFIX}/${DOCBASE}
+ mkdir -p ${DESTDIR}
+ if make srpm >${DESTDIR}/make_srpm_log.txt 2>&1; then
+ babble 2 "${DOCBASE} srpm built; removing 'make_srpm_log.txt'"
+ rm -f ${DESTDIR}/make_srpm_log.txt
+ else
+ babble 2 "SRPM failed; see 'make_srpm_log.txt'"
+ fi
+ for x in fedora-doc-${DOCBASE}*.src.rpm
+ do
+ babble 2 "RPM '$x' installed"
+ rm -f ${DESTDIR}/$x
+ cp $x ${DESTDIR}/$x
+ done
+}
+
+########################################################################
+# do_make_spec
+########################################################################
+
+do_make_spec () {
+ babble 1 "Building SPEC file for ${DOCBASE}"
+ DESTDIR=${PREFIX}/${DOCBASE}
+ mkdir -p ${DESTDIR}
+ if make spec >${DESTDIR}/make_spec_log.txt 2>&1; then
+ babble 2 "SPEC file built; removing 'make_spec_log.txt'"
+ rm -f ${DESTDIR}/make_spec_log.txt
+ else
+ babble 2 "SPEC file failed; see 'make_spec_log.txt'"
+ fi
+ SPECFILE=${DOCBASE}.spec
+ rm -f ${DESTDIR}/${SPECFILE}
+ if [ -f ${SPECFILE} ]; then
+ babble 2 "${SPECFILE} installed"
+ cp ${SPECFILE} ${DESTDIR}/${SPECFILE}
+ else
+ babble 2 "${SPECFILE} did not build"
+ fi
+}
+
+########################################################################
+# print_usage
+########################################################################
print_usage() {
- echo "$MYSELF: Usage: $MYSELF [options...]"
- echo " -h : print usage (this message)"
- echo " -m WORKDIR : set home directory, default $HOME"
- echo " -f FDPDIR : set d/l dir for CVS, default $FDPDIR"
- echo " -D TARGETDIR : set target dir for built files, default $TARGETDIR"
- echo " -a ANONCVS : set CVS repo location (cvs -d), default $ANONCVS"
- echo " -r REV : checkout REV from CVS (global), default $REV"
- echo " -Q : make CVS checkout less quiet"
- echo " -c : build chunked HTML"
- echo " -n : build HTML nochunks"
- echo " -p : build PDF (not working currently)"
- echo " -S : build SRPM"
- echo " -s : build spec file"
- echo " -T : build source tarball"
- echo " -t : build tarball"
- echo " -k : continue building in face of errors"
+ echo "Usage: $ME [options...]"
+ FMT=" %-12s : %s\n"
+ printf "${FMT}" "-h" "print usage [this message]"
+
+ printf "${FMT}" "-D PREFIX" "Built files placed here [${PREFIX}]"
+ printf "${FMT}" "-Q" "CVS checkout is less quiet"
+ printf "${FMT}" "-S" "Build SRPM"
+ printf "${FMT}" "-T" "Build source tarball"
+ printf "${FMT}" "-c" "Build chunked HTML"
+ printf "${FMT}" "-d CVSROOT" "CVS repository info [$CVSROOT]"
+ printf "${FMT}" "-n" "Build non-chunked HTML"
+ printf "${FMT}" "-p" "Build PDF [NOT CURRENTLY WORKING]"
+ printf "${FMT}" "-r REV" "CVS revision to use [${REV}]"
+ printf "${FMT}" "-s" "Build SPEC file"
+ printf "${FMT}" "-t" "Build tarball"
+ printf "${FMT}" "-v" "Increase output details"
+ printf "${FMT}" "-w WORKDIR" "set working directory [${WORKDIR}]"
}
+########################################################################
+# set_vars
+########################################################################
set_vars() {
- [ -z "$WORKDIR" ] && WORKDIR="${HOME}"
- [ -z "$FDPDIR" ] && FDPDIR="${WORKDIR}/fdpdocs-cvs${NOW}"
- [ -z "$TARGETDIR" ] && TARGETDIR="/var/www/webtest/docs"
- # Do this anonymously for now
- [ -z "$ANONCVS" ] && ANONCVS=":pserver:anonymous at cvs.fedora.redhat.com:/cvs/docs"
- [ -z "$REV" ] && REV="HEAD"
- [ -z "$REDIR" ] && REDIR="/dev/null"
- [ -z "$QUIET" ] && QUIET="-Q"
+ : ${WORKDIR:=${TMP:-${TMPDIR:-/tmp}}/build-docs-$$.tmp}
+ : ${PREFIX:=/var/www/webtest/docs}
+ : ${CVSROOT:=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/docs}
+ : ${REV:=HEAD}
+ : ${REDIR:=/dev/null}
+ : ${QUIET:=-Q}
+ : ${VERBOSE:=0}
}
# just to make sure defaults are read
-unset FDPDIR HTMLDIR ANONCVS TAG CHUNKS NOCHUNKS PDF TARBALL VERBOSE
-unset KEEPON
+unset WORKDIR PREFIX TAG CHUNKS NOCHUNKS PDF TARBALL CVSROOT
BUILDS=0
-while getopts "m:f:D:a:r:QcnpSsTthvk" OPT; do
- case $OPT in
- m )
- WORKDIR="$OPTARG"
- ;;
- f )
- FDPDIR="$OPTARG"
- ;;
+while getopts "w:D:a:r:QcnpSsTthv" OPT; do
+ case "${OPT}" in
+ w )
+ WORKDIR="$OPTARG"
+ ;;
D )
- TARGETDIR="$OPTARG"
- ;;
- a )
- ANONCVS="$OPTARG"
- ;;
+ PREFIX="$OPTARG"
+ ;;
+ d )
+ CVSROOT="$OPTARG"
+ ;;
r )
- REV="$OPTARG"
- ;;
+ REV="$OPTARG"
+ ;;
Q )
- QUIET="-q"
- ;;
+ QUIET="-q"
+ ;;
c )
- CHUNKS="yes"
- BUILDS=$(($BUILDS+1))
- ;;
+ CHUNKS="yes"
+ BUILDS=$(($BUILDS+1))
+ ;;
n )
- NOCHUNKS="yes"
- BUILDS=$(($BUILDS+1))
- ;;
+ NOCHUNKS="yes"
+ BUILDS=$(($BUILDS+1))
+ ;;
p )
- PDF="yes" # But PDF doesn't work yet, don't do this!
- BUILDS=$(($BUILDS+1))
- ;;
+ PDF="yes" # But PDF doesn't work yet, don't do this!
+ BUILDS=$(($BUILDS+1))
+ ;;
S )
- SRPM="yes"
- BUILDS=$(($BUILDS+1))
- ;;
+ SRPM="yes"
+ BUILDS=$(($BUILDS+1))
+ ;;
s )
- SPEC="yes"
- BUILDS=$(($BUILDS+1))
- ;;
+ SPEC="yes"
+ BUILDS=$(($BUILDS+1))
+ ;;
T )
- SRCTARBALL="yes"
- BUILDS=$(($BUILDS+1))
- ;;
+ SRCTARBALL="yes"
+ BUILDS=$(($BUILDS+1))
+ ;;
t )
- TARBALL="yes"
- BUILDS=$(($BUILDS+1))
- ;;
+ TARBALL="yes"
+ BUILDS=$(($BUILDS+1))
+ ;;
h )
- set_vars
- print_usage
- exit 0
- ;;
+ set_vars
+ print_usage
+ exit 0
+ ;;
v )
- REDIR="/dev/stdout"
- ;;
- k )
- KEEPON="-k"
- ;;
+ VERBOSE=$(( $VERBOSE + 1 ))
+ ;;
* )
- echo "$MYSELF: invalid option: $OPT"
- print_usage
- exit 10
- ;;
- esac
+ echo "${ME}: invalid option: '-${OPT}'"
+ print_usage
+ exit 10
+ ;;
+ esac
done
shift $(($OPTIND - 1))
-
-if [ $BUILDS -lt 1 ]; then
- echo "$MYSELF: nothing to do, try selecting one of [-c|-n|-p|-s|-S|-T|-t]"
- exit 20
+if [ ${BUILDS} -lt 1 ]; then
+ echo "$ME: must select one of [-c|-n|-p|-s|-S|-T|-t]"
+ exit 20
fi
set_vars
-mkdir "${FDPDIR}" || ( echo "Could not mkdir ${FDPDIR}" ; exit 254 )
-mkdir -p "${TARGETDIR}" || ( echo "Could not mkdir ${FDPDIR}" ; exit 254 )
-pushd "${FDPDIR}" >/dev/null || ( echo "Could not pushd ${FDPDIR}" ; exit 253 )
-
-
-echo "Checking out docs-common from Fedora Docs CVS"
-#cvs -d $ANONCVS login
-cvs "$QUIET" -z3 -d $ANONCVS co docs-common
-
-# for DOC in `cat docs-common/bin/active`; do
-xargs -n1 echo <docs-common/bin/active |
-while read DOC;
-do
- DONE=""
- echo "Checking out module $DOC from Fedora Docs CVS"
- cvs "$QUIET" -z3 -d $ANONCVS co $DOC 2>&1 > $REDIR
- pushd "$DOC" >/dev/null || (echo "Couldn't cd to $DOCDIR" ; exit 252 )
- make showvars > tmpvars
- . tmpvars
- rm -f tmpvars
- if [ "$CHUNKS" = "yes" ]; then
- echo "Making chunked HTML for ${DOCBASE}"
- make ${KEEPON} html 2>&1 > $REDIR || ( echo "$MYSELF: CHUNKS failed" ;\
- exit 251 )
- for LANG in $LANGUAGES ; do
- DESTDIR="${TARGETDIR}/${DOCBASE}/${LANG}"
- [ ! -d "$DESTDIR" ] && mkdir -p "$DESTDIR"
- cp -r "${DOCBASE}-${LANG}/"* "${DESTDIR}"
- done
- fi
- if [ "$NOCHUNKS" = "yes" ]; then
- echo "Making nochunks HTML for ${DOCBASE}"
- make ${KEEPON} html-nochunks 2>&1 > $REDIR ||
- ( echo "$MYSELF: NOCHUNKS failed" ; exit 251 )
- for LANG in $LANGUAGES ; do
- DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
- [ ! -d "$DESTDIR" ] && mkdir -p "$DESTDIR"
- cp -r "${DOCBASE}-${LANG}.html" "${DESTDIR}"
- done
- fi
- if [ "$TARBALL" = "yes" ]; then
- echo "Making tarball for ${DOCBASE}"
- make tarball 2>&1 > $REDIR || ( echo "$MYSELF: TARBALL failed" ;\
- exit 251 )
- for LANG in $LANGUAGES ; do
- DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
- [ ! -d "$DESTDIR" ] && mkdir -p "$DESTDIR"
- cp -r "${DOCBASE}-${LANG}.tar.gz" "${DESTDIR}"
- done
- fi
- if [ "$SRCTARBALL" = "yes" ]; then
- echo "Making source tarball for ${DOCBASE}"
- make tarball 2>&1 > $REDIR || ( echo "$MYSELF: SRCTARBALL failed" ;\
- exit 251 )
- for LANG in $LANGUAGES ; do
- DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
- [ ! -d "$DESTDIR" ] && mkdir -p "$DESTDIR"
- cp -r "${DOCBASE}*.src.tar.gz" "${DESTDIR}"
- done
- fi
- if [ "$SRPM" = "yes" ]; then
- echo "Making SRPM package for ${DOCBASE}"
- make srpm 2>&1 > $REDIR || ( echo "$MYSELF: SRPM failed" ;\
- exit 251 )
- # No LANG for .src.rpm
- DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
- [ ! -d "$DESTDIR" ] && mkdir -p "$DESTDIR"
- cp -r "fedora-doc-${DOCBASE}*.src.rpm" "${DESTDIR}"
- fi
- if [ "$SPEC" = "yes" ]; then
- echo "Making specfile for ${DOCBASE}"
- make spec 2>&1 > $REDIR || ( echo "$MYSELF: SPEC failed" ;\
- exit 251 )
- # No LANG for .spec
- DESTDIR="${TARGETDIR}/${DOCBASE}/"
- [ ! -d "$DESTDIR" ] && mkdir -p "$DESTDIR"
- cp -r "fedora-doc-${DOCBASE}.spec" "${DESTDIR}"
- fi
- popd >/dev/null
-
-done
-
+babble 2 "CVSROOT='${CVSROOT}'"
+export CVSROOT
-popd >/dev/null
-[ "$FDPDIR" != "/" ] && [ "$FDPDIR" != "$HOME" ] && rm -rf "${FDPDIR}"
-exit 0
+babble 3 "Creating work directory [${WORKDIR}]"
+mkdir -p ${WORKDIR} || die 254 "Could not mkdir ${WORKDIR}"
+babble 3 "Creating output directory [${PREFIX}]"
+mkdir -p ${PREFIX} || die 254 "Could not mkdir ${PREFIX}"
+babble 0 "Script log is in '${PREFIX}/build-docs_log.txt'"
+exec >${PREFIX}/build-docs_log.txt 2>&1
+
+(
+ babble 3 "About to 'cd ${WORKDIR}'"
+ cd ${WORKDIR}
+
+ DOC=docs-common
+ babble 0 "Module '${DOC}'"
+ if cvs ${QUIET} -z3 co ${DOC} >${DOC}_co_log.txt 2>&1
+ then
+ babble 2 "${DOC} co succeeded; removing '${DOC}_co_log.txt'"
+ rm -f ${DOC}_co_log.txt
+ else
+ die 2 "Can't proceed without a '${DOC}' module"
+ # NOTREACHED
+ fi
+
+ [ -f docs-common/bin/active ] ||
+ die 2 "cannot find 'docs-common/bin/active'"
+ sort -b -d -f docs-common/bin/active |
+ xargs -n1 |
+ while read DOC
+ do
+ babble 0 "Module '${DOC}'"
+ # babble 1 "Considering module '${DOC}'"
+ if [ "${DOC}" == "docs-common" ]; then
+ babble 1 "Skipping; already done"
+ continue
+ # NOTREACHED
+ fi
+ babble 1 "Removing prior '${DOC}' files"
+ rm -rf ${PREFIX}/${DOC}
+ babble 1 "Checking out module '${DOC}' from CVS"
+ if cvs ${QUIET} -z3 co ${DOC} >${DOC}_co_log.txt 2>&1; then
+ babble 2 \
+ "${DOC} co succeeded; removing '${DOC}_co_log.txt'"
+ rm -f ${DOC}_co_log.txt
+ else
+ babble 2 "${DOC} co failed; see '${DOC}_co_log.txt'"
+ continue
+ fi
+ (
+ babble 1 "About to 'cd ${DOC}'"
+ cd ${DOC}
+ babble 1 "Obtaining pertinent variables"
+ eval $(make showvars)
+ LANGUAGES="${PRI_LANG} ${OTHERS}"
+ if [ "${CHUNKS}" = "yes" ]; then
+ do_html_chunks
+ fi
+ if [ "${NOCHUNKS}" = "yes" ]; then
+ do_html_nochunks
+ fi
+ if [ "${TARBALL}" = "yes" ]; then
+ do_tarball
+ fi
+ if [ "${SRCTARBALL}" = "yes" ]; then
+ do_src_tarball
+ fi
+ if [ "${SRPM}" = "yes" ]; then
+ do_srpm
+ fi
+ if [ "${SPEC}" = "yes" ]; then
+ do_make_spec
+ fi
+ )
+ done
+)
+[ "$WORKDIR" != "/" ] && [ "$WORKDIR" != "$HOME" ] && (
+ babble 0 "Removing work directory [${WORKDIR}]"
+ rm -rf ${WORKDIR}
+)
+
+exit 0
Index: build-docs.conf
===================================================================
RCS file: /cvs/docs/infrastructure/build-docs/build-docs.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-docs.conf 13 Feb 2006 19:30:13 -0000 1.2
+++ build-docs.conf 18 Apr 2006 00:43:20 -0000 1.3
@@ -16,11 +16,4 @@
# BDRFLAGS, if set, should contain the desired flags to be passed
# to the build-docs script.
#
-#BDRFLAGS="-c -S -s -m /var/lib/build-docs"
-
-#
-# LOGFILE, if set, should point to the location where you want the
-# build-docs script output to be written.
-#
-#LOGFILE="/var/log/build-docs.log"
-
+#BDRFLAGS="-c -S -s -w /var/lib/build-docs"
Index: build-docs.cron
===================================================================
RCS file: /cvs/docs/infrastructure/build-docs/build-docs.cron,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-docs.cron 13 Feb 2006 19:26:36 -0000 1.2
+++ build-docs.cron 18 Apr 2006 00:43:20 -0000 1.3
@@ -2,9 +2,6 @@
. /etc/build-docs.conf
[ "${ENABLE_HOURLY_BUILD}" == "yes" ] || exit 0
[ "x" == "x${BDR}" ] && BDR="build-docs"
-[ "x" == "x${BDRFLAGS}" ] && BDRFLAGS="-c -S -s -m /var/lib/build-docs"
-[ "x" == "x${LOGFILE}" ] && LOGFILE="/var/log/build-docs.log"
-echo "Starting build-docs at `date -uR`..." >> $LOGFILE
-$BDR $BDRFLAGS &> $LOGFILE 2>&1
-echo "Finished build-docs at `date -uR`..." >> $LOGFILE
+[ "x" == "x${BDRFLAGS}" ] && BDRFLAGS="-c -S -s -w /var/lib/build-docs"
+$BDR $BDRFLAGS >/dev/null 2>&1
exit 0
Index: build-docs.spec
===================================================================
RCS file: /cvs/docs/infrastructure/build-docs/build-docs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-docs.spec 13 Feb 2006 20:05:04 -0000 1.4
+++ build-docs.spec 18 Apr 2006 00:43:20 -0000 1.5
@@ -1,6 +1,6 @@
Summary: A simple script and cron job to build Fedora Documentation
Name: build-docs
-Version: 0.0.6
+Version: 0.0.7
Release: 1
URL: http://fedoraproject.org/wiki/DocsProject
License: GPL
@@ -9,7 +9,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
Source0: %{name}-%{version}.tar.bz2
-Requires: xmlto docbook-utils docbook-utils-pdf cvs
+Requires: xmlto docbook-utils docbook-utils-pdf cvs make
%{!?_without_cron:Requires: crontabs}
%description
@@ -47,6 +47,9 @@
%endif
%changelog
+* Mon Apr 17 2006 Tommy Reynolds <Tommy.Reynolds at MegaCoder.com> - 0.0.7-1
+- Compute ${LANGUAGES} so that docs build again. Put all logs in output dir
+
* Sun Feb 12 2006 Patrick Barnes <nman64 at n-man.com> - 0.0.6-1
- Fix empty INSTROOT Makefile flaw
More information about the docs-commits
mailing list