Changeset 27557 for other-projects

Timestamp:

2013-06-05T21:38:27+12:00 (11 years ago)

Author:

ak19

Message:

Beginnings of changes to make the diffcol task use a standalone Greenstone. At present still only has support for GS2. Mails with reports as attachments are now being sent to the greenstone mailing address without any noticeable code changes there.

File:

• other-projects/nightly-tasks/diffcol/trunk/task (modified) (15 diffs)

other-projects/nightly-tasks/diffcol/trunk/task

@@ -8 +8 @@
 export UPLOAD_DIR=$TASK_HOME/diffcol-reports
 export [email protected]
+
+# control if an existing compiled greenstone is used 
+# or, if one should be checked out, which revision to checkout from svn
+SVN_OPT_R="-r head"
+#export GSDLHOME=
+#export GSDL3SRCHOME=
 
 #check key environment vars are set
@@ -47 +53 @@
 xmlout=$DATA_DIR'/full-report-'$dateid'.xml'
 
+# the toplevel folder of the greenstone installation being used
+greenstone_home=
+# gsdl is the checkout folder and can be greenstone2 or greenstone3
+gsdl=greenstone2
+
+
+# Check if using existing compiled-up greenstone installation
+# and set the greenstone_home location accordingly
+if [ "x$GSDL3SRCHOME" != "x" -o "x$GSDLHOME" != "x" ]; then
+    echo "Found existing Greenstone home, will use that instead"
+    greenstone_home=$GSDLHOME
+else
+    greenstone_home="$DATA_DIR/$gsdl";
+fi
+
+
+
 function setup_greenstone() {
 
@@ -62 +85 @@
     cd $DATA_DIR
 
+
+        # use existing compiled-up greenstone installation 
+    if [ "x$GSDL3SRCHOME" != "x" -o "x$GSDLHOME" != "x" ]; then
+        echo "Found existing Greenstone home, will use that instead"
+        return;
+    fi
+
+    # Else checkout a GS from svn into DATA_DIR
+
+
     #svn checkout of main gsdl directory
-    echo "checkout gsdl:"
-    svn co http://svn.greenstone.org/main/trunk/greenstone2 gsdl
-    echo "done"
-
-    cd $DATA_DIR/gsdl
+    echo "checkout $gsdl:"
+    svn co $SVN_OPT_REV http://svn.greenstone.org/main/trunk/greenstone2 $gsdl
+    echo "done"
+
+    cd $DATA_DIR/$gsdl
 
 
@@ -81 +114 @@
         gl_suffix=$os'-intel';
     else
-        # linux, worl out the bit arch
+        # linux, work out the bit architecture
         arch=`uname -m`
         if [[ "$arch" == *"64"* ]]; then
@@ -93 +126 @@
 
     #svn checkout gnome-lib for this linux/darwin
-    cd $DATA_DIR/gsdl/ext
+    cd $DATA_DIR/$gsdl/ext
 
 #   svn export http://svn.greenstone.org/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-linux-x64.tar.gz gl.tar.gz
@@ -105 +138 @@
 
     #configure
-    echo "configure gsdl: "
+    echo "configure $gsdl: "
     echo "<configure>" >> $xmlout
     ./configure 2>> $DATA_DIR/compilation-errors
@@ -112 +145 @@
 
     #make
-    echo "make gsdl: "
+    echo "make $gsdl: "
     echo "<make>" >> $xmlout
     make 2>> $DATA_DIR/compilation-errors
@@ -119 +152 @@
 
     #make install
-    echo "make install gsdl: "
+    echo "make install $gsdl: "
     echo "<make-install>" >> $xmlout
     make install $DATA_DIR/compilation-errors
@@ -125 +158 @@
     echo "done"
 
-
+    # set the path to the greenstone_home variable
+    greenstone_home=$DATA_DIR/$gsdl
 }
 
@@ -134 +168 @@
     echo '<test time="'$dateid'" id="'$dateid'">' > $xmlout
 
-    cd $DATA_DIR/gsdl
+    # go to whichever greenstone_home we're using
+    cd $greenstone_home
 
     #get svn info
@@ -144 +179 @@
 
     #set up the gsdl environment with the setup.bash script
-    echo "setting up gsdl environment: "
+    echo "setting up $gsdl environment: "
         export GSDLHOME=
         source setup.bash
@@ -154 +189 @@
 
     #copy the model collections to the collect folder to be rebuilt
-    echo -n "installing test collections and model collections to new gsdl installation... "
+    echo -n "installing test collections and model collections to new $gsdl installation... "
 
         #clean up
@@ -209 +244 @@
         cd $TASK_HOME/diffcol
         ./diffcol.pl -output xml -verbosity 10 $collection >> $xmlout
-        cd $DATA_DIR/gsdl
+        cd $greenstone_home
         echo "done"
 
@@ -256 +291 @@
     echo "result: "$result
     if [ "$result" != "yes" ]; then
-    echo 'gsdl regression test for '$dateid' failed' | mutt -a $DATA_DIR'/report-'$dateid'.html' -s 'Regression Test Failed' -- $MONITOR_EMAIL
+    echo $gsdl' regression test for '$dateid' failed' | mutt -a $DATA_DIR'/report-'$dateid'.html' -s 'Regression Test Failed' -- $MONITOR_EMAIL
     fi
     echo "Sent mail with report attached."
@@ -274 +309 @@
 
 }
+
 
 #parse arguments