infrastructure/build-docs build-docs, 1.1, 1.2 build-docs.cron, 1.1, 1.2 build-docs.spec, 1.2, 1.3

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/infrastructure/build-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24345

Modified Files:
	build-docs build-docs.cron build-docs.spec 
Log Message:
Do spec and SRPM builds by default, push to 0.0.5


Index: build-docs
===================================================================
RCS file: /cvs/docs/infrastructure/build-docs/build-docs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-docs	5 Jan 2006 00:17:23 -0000	1.1
+++ build-docs	13 Feb 2006 19:26:36 -0000	1.2
@@ -25,6 +25,9 @@
     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"
 }
@@ -47,7 +50,7 @@
 unset KEEPON
 BUILDS=0
 
-while getopts "m:f:D:a:r:Qcnpthvk" OPT; do
+while getopts "m:f:D:a:r:QcnpSsTthvk" OPT; do
     case $OPT in
 	m )
 	    WORKDIR="$OPTARG"
@@ -79,6 +82,18 @@
 	    PDF="yes"  # But PDF doesn't work yet, don't do this!
 	    BUILDS=$(($BUILDS+1))
 	    ;;
+	S )
+	    SRPM="yes"
+	    BUILDS=$(($BUILDS+1))
+	    ;;
+	s )
+	    SPEC="yes"
+	    BUILDS=$(($BUILDS+1))
+	    ;;
+	T )
+	    SRCTARBALL="yes"
+	    BUILDS=$(($BUILDS+1))
+	    ;;
 	t )
 	    TARBALL="yes"
 	    BUILDS=$(($BUILDS+1))
@@ -105,7 +120,7 @@
 
 
 if [ $BUILDS -lt 1 ]; then
-    echo "$MYSELF: nothing to do, try selecting one of [-c|-n|-p|-t]"
+    echo "$MYSELF: nothing to do, try selecting one of [-c|-n|-p|-s|-S|-T|-t]"
     exit 20
 fi
 
@@ -137,7 +152,7 @@
 	    exit 251 )
 	for LANG in $LANGUAGES ; do
 	    DESTDIR="${TARGETDIR}/${DOCBASE}/${LANG}"
-	    [ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR
+	    [ ! -d "$DESTDIR" ] && mkdir -p "$DESTDIR"
 	    cp -r "${DOCBASE}-${LANG}/"* "${DESTDIR}"
 	done
     fi
@@ -147,7 +162,7 @@
 		( echo "$MYSELF: NOCHUNKS failed" ; exit 251 )
 	for LANG in $LANGUAGES ; do
 	    DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
-	    [ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR
+	    [ ! -d "$DESTDIR" ] && mkdir -p "$DESTDIR"
 	    cp -r "${DOCBASE}-${LANG}.html" "${DESTDIR}"
 	done
     fi
@@ -157,10 +172,38 @@
 	    exit 251 )
 	for LANG in $LANGUAGES ; do
 	    DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
-	    [ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR
+	    [ ! -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
     


Index: build-docs.cron
===================================================================
RCS file: /cvs/docs/infrastructure/build-docs/build-docs.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-docs.cron	5 Jan 2006 00:17:23 -0000	1.1
+++ build-docs.cron	13 Feb 2006 19:26:36 -0000	1.2
@@ -2,7 +2,7 @@
 . /etc/build-docs.conf
 [ "${ENABLE_HOURLY_BUILD}" == "yes" ] || exit 0
 [ "x" == "x${BDR}" ] && BDR="build-docs"
-[ "x" == "x${BDRFLAGS}" ] && BDRFLAGS="-c -m /var/lib/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


Index: build-docs.spec
===================================================================
RCS file: /cvs/docs/infrastructure/build-docs/build-docs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-docs.spec	28 Jan 2006 08:00:04 -0000	1.2
+++ build-docs.spec	13 Feb 2006 19:26:36 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: A simple script and cron job to build Fedora Documentation
 Name: build-docs
-Version: 0.0.4
+Version: 0.0.5
 Release: 1
 URL: http://fedoraproject.org/wiki/DocsProject
 License: GPL
@@ -47,6 +47,9 @@
 %endif
 
 %changelog
+* Sun Feb 12 2006 Paul W. Frields <stickster at gmail.com> - 0.0.5-1
+- Provide SRPM and specfile builds for use with FE
+
 * Sat Jan 28 2006 Patrick Barnes <nman64 at n-man.com>
 - Fixed potentially nasty typo in Makefile (only affects non-rpm installs)
 - Incremented version to 0.0.4