You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by ni...@apache.org on 2003/05/31 00:02:57 UTC
cvs commit: jakarta-gump gump.sh gumppy.sh
nickchalko 2003/05/30 15:02:56
Modified: . gump.sh gumppy.sh
Log:
Fixing incomplete update from Adam
Submitted by:Adam Jack ajack@TrySybase.com
Revision Changes Path
1.6 +27 -15 jakarta-gump/gump.sh
Index: gump.sh
===================================================================
RCS file: /home/cvs/jakarta-gump/gump.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gump.sh 30 May 2003 17:15:05 -0000 1.5
+++ gump.sh 30 May 2003 22:02:56 -0000 1.6
@@ -22,6 +22,12 @@
fi
+if [ -n "$1" ] ; then
+ export GUMP_TARGET=$1
+else
+ export GUMP_TARGET=all
+fi
+
#
# Calculated
@@ -42,11 +48,26 @@
echo $SEPARATOR >> $GUMP_LOG
echo $SEPARATOR >> $GUMP_LOG
echo "Gump run on $GUMP_HOST at $GUMP_DATE" >> $GUMP_LOG
+
+echo $SEPARATOR >> $GUMP_LOG
+echo $SEPARATOR >> $GUMP_LOG
+
+echo "Gump Target : $GUMP_TARGET" >> $GUMP_LOG
+echo "Gump Location : $GUMP" >> $GUMP_LOG
+echo "Gump Workspace : $GUMP_WS" >> $GUMP_LOG
+echo "Gump Log : $GUMP_LOG" >> $GUMP_LOG
+
echo $SEPARATOR >> $GUMP_LOG
echo $SEPARATOR >> $GUMP_LOG
echo >> $GUMP_LOG
#
+# Capture environment
+#
+echo $SEPARATOR >> $GUMP_LOG
+export >> $GUMP_LOG
+
+#
# Store the profile (into a myprofile dir)
#
cd $GUMP
@@ -85,35 +106,26 @@
# Do a clean
#
echo $SEPARATOR >> $GUMP_LOG
-bash $GUMP_WS/build.sh gump clean >> $GUMP_LOG
+bash $GUMP_WS/build.sh clean >> $GUMP_LOG
echo >> $GUMP_LOG
#
-# Capture environment
-#
-echo $SEPARATOR >> $GUMP_LOG
-export >> $GUMP_LOG
-
-# /usr/X11R6/bin/Xvfb :8 &
-# export DISPLAY=:8
-
-#
# Do an update (from CVS)
#
cd $GUMP_WS
echo $SEPARATOR >> $GUMP_LOG
-bash update.sh all >> $GUMP_LOG 2>&1
+bash update.sh $GUMP_TARGET >> $GUMP_LOG 2>&1
#
# Do the build
#
cd $GUMP_WS
echo $SEPARATOR >> $GUMP_LOG
-bash build.sh all >> $GUMP_LOG 2>&1
+bash build.sh $GUMP_TARGET >> $GUMP_LOG 2>&1
cd $GUMP
echo $SEPARATOR >> $GUMP_LOG
-if [ -n "$STARTED_FROM_CRON" ] ; then
+if [ -n $"STARTED_FROM_CRON" ] ; then
perl nag.pl work/naglist >> $GUMP_LOG 2>&1
fi;
@@ -121,15 +133,15 @@
pkill -P $$
# $Log$
-# Revision 1.5 2003/05/30 17:15:05 nickchalko
-# Need a quote around variable name when testing for empty.
+# Revision 1.6 2003/05/30 22:02:56 nickchalko
+# Fixing incomplete update from Adam
# PR:
# Obtained from:
-# Submitted by: Adam Jack ajack@TrySybase.com
+# Submitted by:Adam Jack ajack@TrySybase.com
# Reviewed by:
#
# Revision 1.4 2003/04/09 07:31:42 nickchalko
-# Removed reference to tsbuild1
+# -mRemoved reference to tsbuild1
#
# Revision 1.3 2003/04/09 07:27:27 nickchalko
# Moved user specific vars to local-env.sh which is not checked in.
1.2 +1 -5 jakarta-gump/gumppy.sh
Index: gumppy.sh
===================================================================
RCS file: /home/cvs/jakarta-gump/gumppy.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gumppy.sh 30 May 2003 17:19:21 -0000 1.1
+++ gumppy.sh 30 May 2003 22:02:56 -0000 1.2
@@ -1,9 +1,6 @@
#!/bin/bash
-# $Header$
-#
-# Shell script suitable for running the python version of gump from cron
-# @author Adam Jack ajack@TrySybase.com
#
+# $Header$
if [ -e local-env.sh ] ; then
. local-env.sh
@@ -154,12 +151,10 @@
pkill -P $$
# $Log$
-# Revision 1.1 2003/05/30 17:19:21 nickchalko
-# Shell script suitable for running the python version of gump from cron
-#
+# Revision 1.2 2003/05/30 22:02:56 nickchalko
+# Fixing incomplete update from Adam
# PR:
# Obtained from:
-# Submitted by: Adam Jack ajack@TrySybase.com
+# Submitted by:Adam Jack ajack@TrySybase.com
# Reviewed by:
#
-