--- misc/scripts/shell/build.sh	2004/03/20 20:08:04	1.10
+++ misc/scripts/shell/build.sh	2005/07/18 14:14:32	1.16
@@ -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.16 2005/07/18 14:14:32 tdb Exp $
 
 # base directory for staging
 STAGING=/u1/i-scream/staging
@@ -15,12 +15,12 @@ exec > $LOG 2>&1
 set -x
 
 # various directories
-CMSSOURCE=$STAGING/cms/source
+PROJECTS=$STAGING/projects
 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,8 +31,10 @@ 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`
+    LIBRARIES=`eval \`grep "LIBRARIES=" configure\``
     for LIB in $LIBRARIES; do
         fetchlib $LIB
         cp $DISTFILES/$LIB build/lib
@@ -55,8 +57,10 @@ 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
+    aclocal --skip
     autoheader
     autoconf
     if [ "X$LIBTOOL" = "Xyes" ]; then
@@ -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
@@ -114,7 +120,7 @@ echo "+ Build started on `date`"
 
 # remove any old files so we have a fresh start
 echo "+ Cleaning up"
-rm -Rf cms
+rm -Rf projects
 rm -Rf $BUILDS/*
 
 # make sure our local cvs is up-to-date
@@ -122,44 +128,44 @@ rm -Rf $BUILDS/*
 
 # pull the latest source from our local cvs
 echo "+ Updating CVS"
-cvs -d $CVSROOT checkout cms/source
-cd $CMSSOURCE
+cvs -d $CVSROOT checkout projects
+cd $PROJECTS
 
 # Build all listed programs
 for PROG in $PROGS; do
     case $PROG in
         server)
-            iscreambuild $CMSSOURCE/server $BUILDS/server yes
+            iscreambuild $PROJECTS/cms/source/server $BUILDS/server yes
             ;;
         util)
-            iscreambuild $CMSSOURCE/util $BUILDS/util yes
+            iscreambuild $PROJECTS/cms/source/util $BUILDS/util yes
             ;;
         corbaservices)
-            iscreambuild $CMSSOURCE/corbaservices $BUILDS/corbaservices yes
+            iscreambuild $PROJECTS/cms/source/corbaservices $BUILDS/corbaservices yes
             ;;
         conient)
-            iscreambuild $CMSSOURCE/conient $BUILDS/conient yes
+            iscreambuild $PROJECTS/cms/source/conient $BUILDS/conient yes
             ;;
         rrdgraphing)
-            iscreambuild $CMSSOURCE/reports/rrdgraphing $BUILDS/rrdgraphing no
+            iscreambuild $PROJECTS/cms/source/reports/rrdgraphing $BUILDS/rrdgraphing no
             ;;
         php)
-            iscreambuild $CMSSOURCE/reports/php $BUILDS/php no
+            iscreambuild $PROJECTS/cms/source/reports/php $BUILDS/php no
             ;;
         libstatgrab)
-            gnubuild $CMSSOURCE/libstatgrab $BUILDS/libstatgrab yes
+            gnubuild $PROJECTS/libstatgrab $BUILDS/libstatgrab yes
             ;;
         ihost)
-            gnubuild $CMSSOURCE/ihost $BUILDS/ihost no --with-libstatgrab-prefix=/usr/local/packages/libstatgrab
+            gnubuild $PROJECTS/cms/source/ihost $BUILDS/ihost no --with-libstatgrab-prefix=/usr/local/packages/libstatgrab
             ;;
         libukcprog)
-            gnubuild $CMSSOURCE/libukcprog $BUILDS/libukcprog yes
+            gnubuild $PROJECTS/libukcprog $BUILDS/libukcprog yes
             ;;
         idar)
-            gnubuild $CMSSOURCE/idar $BUILDS/idar no --with-curses-prefix=/usr/local/packages/ncurses
+            gnubuild $PROJECTS/cms/source/idar $BUILDS/idar no --with-curses-prefix=/usr/local/packages/ncurses
             ;;
         pystatgrab)
-            pydistbuild $CMSSOURCE/pystatgrab $BUILDS/libstatgrab
+            pydistbuild $PROJECTS/pystatgrab $BUILDS/pystatgrab
             ;;
     esac
 done