Changeset 27678 for other-projects/nightly-tasks

Timestamp:

2013-06-20T21:31:07+12:00 (11 years ago)

Author:

ak19

Message:

Uploading report to caveat-emptor page now works on windows

File:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (5 diffs)

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

@@ -42 +42 @@
 
 
+$ENV{'BIN_DIR'} = &filename_concat($ENV{'TASK_HOME'}, "bin");
+
+# we'll be using BLAT to send mail attachments on Windows
+my $blat = &filename_concat($ENV{'BIN_DIR'}, "blat", "full", "blat.exe");
+if($isWin && ! -e $blat) {
+    print STDERR "*** No blat.exe found in $blat.\n";
+    print STDERR "*** Blat needed to send mail with attachments on Windows.\n";
+    print STDERR "*** Extract the blat zip file found in $ENV{'BIN_DIR'}\n";
+    print STDERR "*** for your bit architecture and name the folder 'blat'\n";
+    
+    $blat = 0;
+}
+
+
 $ENV{'DATA_DIR'} = &filename_concat($ENV{'TASK_HOME'}, "diffcol-data");
 $ENV{'UPLOAD_DIR'} = &filename_concat($ENV{'TASK_HOME'}, "diffcol-reports");
 $ENV{'MONITOR_EMAIL'} = "greenstone_team\@cs.waikato.ac.nz"; # need to escape @ sign
-$ENV{'GSDL_SMTP'} = "";
+$ENV{'GSDL_SMTP'} = ""; #"smtp.gmail.com";
 ##print STDERR "@@@ email: ".$ENV{'MONITOR_EMAIL'}."\n";
 
@@ -568 +582 @@
     }
 
-    #use the  correct key for uploading
+    #use the correct key for uploading
     $ENV{'IDENTITY_FILE'} = "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} . ($^O eq "MSWin32" ? ".ppk" : "");
     if(-f $ENV{'IDENTITY_FILE'}) {
+    # if you need to touch the file on windows: http://stackoverflow.com/questions/51435/windows-version-of-the-unix-touch-command
+    
     # the report we want to upload is actually just report-$dateid.html
     my $command = "cd \"$ENV{'UPLOAD_DIR'}\" && tar -c *.html | "; #&& cat *.html | "; # && tar -c * |
@@ -578 +594 @@
     my $status = system("$command");
     if($status != 0) {
-        print STDERR "*** Failed to upload test report to nzdl\n";
+        print STDERR "*** Failed to upload test report to nzdl $status\n";
     }
     } else {
@@ -605 +621 @@
     my $attach_file = &filename_concat($ENV{'DATA_DIR'}, "report-$dateid.html");
 
-    if($isWin) {        
-        # http://stackoverflow.com/questions/709635/sending-mail-from-batch-file
-        #blat -to [email protected] -server smtp.example.com -f [email protected] -subject "subject" -body "body"
-
-        $cmd = "blat -to $ENV{'MONITOR_EMAIL'} -server $ENV{'GSDL_SMTP'} -f $attach_file -subject $subject -body $msg"; # need to install blat on windows
-
-    } else {
+    if($isWin) {
+        if($blat && $ENV{'GSDL_SMTP'}) {
+            # http://stackoverflow.com/questions/709635/sending-mail-from-batch-file
+            #blat -to [email protected] -server smtp.example.com -f [email protected] -subject "subject" -body "body"
+
+            # need to install blat on windows
+            $cmd = "$blat -to $ENV{'MONITOR_EMAIL'} -server $ENV{'GSDL_SMTP'} -f $ENV{'MONITOR_EMAIL'} -attach $attach_file -subject \"$subject\" -body \"$msg\"";          
+            $result = system($cmd); 
+        }
+        else {
+            $result = 0;
+            print STDERR "********************************************\n";
+            print STDERR "Need blat and SMTP set to send mail attachment\n";
+            print STDERR "Inspect report at: $attach_file\n";
+            print STDERR "********************************************\n";
+        }
+    } else { # linux
         my $status = system("command -v mutt > /dev/null 2>&1;"); #better way of doing "which mutt"
         
@@ -625 +651 @@
         $cmd = "echo '$gsdl regression test for $dateid failed' | mutt -a $attach_file -s 'Regression Test Failed' -- $ENV{'MONITOR_EMAIL'}";
         }
-    }
-
-    # run the mail command
-    $result = system($cmd); #&run_and_print_cmd($cmd);
+        
+        # run the mail command
+        $result = system($cmd); #&run_and_print_cmd($cmd);
+    }
+
+    
     if($result != 0) {
         print STDERR "*** Unable to send email: $?\n";