--- a/cron-script.sh	Wed Aug 13 16:49:05 2003 +0000
+++ b/cron-script.sh	Thu Aug 14 05:20:01 2003 +0000
@@ -12,10 +12,24 @@
 
 # reply-to/to address to send the build log as/to
 [email protected]
[email protected]
[email protected]
+
+# date format appended to the Release tag in the spec files
+# (passed to the date command on the cmd line)
+RELEASE_DATE_FMT="%y%m%d"
+
+# date format used for naming the directories
+DIR_DATE_FMT="%Y-%m-%d"
 
-# date format used by the nightlies (passed to date on the cmd line)
-DATE_FMT="%y%m%d"
+RELEASE_DATE=`date +$RELEASE_DATE_FMT`
+DIR_DATE=`date +$DIR_DATE_FMT`
+
+# document root of the web server
+WEBROOT=/scde/web/docs
+
+# subdir to keep logs and reports on the webserver
+WEBDIR=gnome/releng/2.2/mercury/nightly
+LOGDIR=$WEBDIR/$DIR_DATE
 
 # ------------ nothing to configure below this line --------------
 
@@ -53,9 +67,6 @@
         ;;
 esac
 
-
-DATE=`date +$DATE_FMT`
-
 fatal_error () {
   echo "ERROR: $*"
   exit 1
@@ -75,10 +86,6 @@
 
 rm -f /usr/src/packages/SRPMS/* /usr/src/packages/RPMS/*/*
 
-WEBROOT=/scde/web/docs
-WEBDIR=gnome/releng/2.2/mercury/nightly
-LOGDIR=$WEBDIR/`date +%Y-%m-%d`
-
 # if the log directory exists, open a new one with numbered suffix
 NEW_LOGDIR=$LOGDIR
 N=1
@@ -91,9 +98,9 @@
 mkdir -p $WEBROOT/$LOGDIR
 
 # start the build
-./build-gnome2 -v --nightly --date "$DATE" build *.spec \
+./build-gnome2 -v --nightly --date "$RELEASE_DATE" build --target i586 *.spec \
         --logdir=$WEBROOT/$LOGDIR \
-        --logdir-url=`date +%Y-%m-%d` \
+        --logdir-url=$DIR_DATE \
         --good-build-dir=/sgnome/pkgs/gnome-2.2/rpms \
         --good-rpms-copy-dir=/tmp/old-rpms-used.$$ \
         --summary-log=$WEBROOT/$LOGDIR.html \
@@ -109,8 +116,8 @@
 echo '' | rsh $RHOST -l $RUSER "mv $RPMSDIR $RPMSDIR.prev; mkdir -p $RPMSDIR"
 
 # copy new rpms
-echo '' | rcp `./build-gnome2 --nightly --date "$DATE" install-order \
-    --full-path \
+echo '' | rcp `./build-gnome2 --nightly --date "$RELEASE_DATE" install-order \
+    --full-path --target i586 \
     *.spec` $RUSER@$RHOST:$RPMSDIR
 
 if [ -d /tmp/old-rpms-used.$$ ]; then
@@ -122,7 +129,7 @@
 echo '' | rsh $RHOST -l $RUSER "rm -f $SRPMSDIR.prev/*; rmdir $SRPMSDIR.prev"
 echo '' | rsh $RHOST -l $RUSER "mv $SRPMSDIR $SRPMSDIR.prev; mkdir -p $SRPMSDIR"
 # copy new srpms
-echo '' | rcp /usr/src/packages/SRPMS/*.$DATE.src.rpm \
+echo '' | rcp /usr/src/packages/SRPMS/*.$RELEASE_DATE.src.rpm \
 	$RUSER@$RHOST:$SRPMSDIR
 
 ALL_REPORTS=$WEBROOT/$WEBDIR/all_reports.html
@@ -132,7 +139,7 @@
 export FAILED ALL_REPORTS
 
 # update web page
-( echo "<TR><TD><A HREF=/$LOGDIR.html>`date +%Y-%m-%d`</A></TD>"; \
+( echo "<TR><TD><A HREF=/$LOGDIR.html>$DIR_DATE</A></TD>"; \
   echo "    <TD>$FAILED package(s) failed</TD></TR>"; \
   cat $ALL_REPORTS.old ) > $ALL_REPORTS