--- misc/scripts/shell/build.sh	2004/03/20 20:08:04	1.10
+++ misc/scripts/shell/build.sh	2004/03/22 01:02:37	1.13
@@ -4,7 +4,7 @@
 # builds new-style dists from cvs source, and puts them
 # in a single location for download (eg. snapshots)
 #
-# $Id: build.sh,v 1.10 2004/03/20 20:08:04 tdb Exp $
+# $Id: build.sh,v 1.13 2004/03/22 01:02:37 tdb Exp $
 
 # base directory for staging
 STAGING=/u1/i-scream/staging
@@ -20,7 +20,7 @@ BUILDS=$STAGING/builds
 DISTFILES=$STAGING/distfiles
 CVSROOT=/u1/i-scream/cvsmirror
 WEBSNAPSHOTS=/u1/i-scream/httpd/htdocs/snapshots
-LIBURL=http://www.i-scream.org.uk/downloads/lib
+LIBURL=http://www.i-scream.org/pub/i-scream/cms/lib
 
 # standard process for an i-scream style build
 iscreambuild() {
@@ -31,6 +31,8 @@ iscreambuild() {
     if [ "X$TAG" != "X" ]; then
         cvs -d $CVSROOT update -dPr $TAG
         cvs2cl --stdout --no-wrap -r -t -w -S -g "-d $CVSROOT" -g "-q" -l "-r::$TAG" > build/ChangeLog
+    else
+        cvs2cl --stdout --no-wrap -r -t -w -S -g "-d $CVSROOT" -g "-q" > build/ChangeLog
     fi
     LIBRARIES=eval `grep "LIBRARIES=" configure`
     for LIB in $LIBRARIES; do
@@ -55,6 +57,8 @@ gnubuild() {
     if [ "X$TAG" != "X" ]; then
         cvs -d $CVSROOT update -dPr $TAG
         cvs2cl --stdout --no-wrap -r -t -w -S -g "-d $CVSROOT" -g "-q" -l "-r::$TAG" > ChangeLog
+    else
+        cvs2cl --stdout --no-wrap -r -t -w -S -g "-d $CVSROOT" -g "-q" > ChangeLog
     fi
     aclocal
     autoheader
@@ -79,6 +83,8 @@ pydistbuild() {
     if [ "X$TAG" != "X" ]; then
         cvs -d $CVSROOT update -dPr $TAG
         cvs2cl --stdout --no-wrap -r -t -w -S -g "-d $CVSROOT" -g "-q" -l "-r::$TAG" > ChangeLog
+    else
+        cvs2cl --stdout --no-wrap -r -t -w -S -g "-d $CVSROOT" -g "-q" > ChangeLog
     fi
     python setup.py sdist
     TARBALL=`ls dist/*.tar.gz`
@@ -100,7 +106,7 @@ fetchlib() {
 }
 
 # Full set of programs to be built
-PROGS="server util corbaservices conient dbreporter rrdgraphing php winhost libstatgrab ihost"
+PROGS="server util corbaservices conient rrdgraphing php libstatgrab ihost libukcprog idar pystatgrab"
 
 # Read command line args
 if [ "X$1" != "X" ]; then
@@ -159,7 +165,7 @@ for PROG in $PROGS; do
             gnubuild $CMSSOURCE/idar $BUILDS/idar no --with-curses-prefix=/usr/local/packages/ncurses
             ;;
         pystatgrab)
-            pydistbuild $CMSSOURCE/pystatgrab $BUILDS/libstatgrab
+            pydistbuild $CMSSOURCE/pystatgrab $BUILDS/pystatgrab
             ;;
     esac
 done