Changeset 27701 for other-projects/nightly-tasks/diffcol/trunk/task.pl

Timestamp:

2013-06-24T22:43:44+12:00 (11 years ago)

Author:

ak19

Message:

Fixed another very subtle to do with the case of the TASK_HOME env var set in environment.pl used by envi when launched via run-gs2-diffcol.pl. It ends up being all lowercase by the time import.pl is run and archiveinf-doc is generated. This then ends up being sorted differently when db2txt -sort is run on it than if the title case of TASK_HOME had been preserved, as happens when task.pl is run directly (and TASK_HOME is taken as the current working dir at that point)

File:

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

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

@@ -37 +37 @@
 my $use_blat = 0; # if we ever get blat to send mail/attachments on Windows working, set this to 1
 
+
 # TASK_HOME should be the toplevel diffcol folder
 $ENV{'TASK_HOME'} = getcwd unless defined $ENV{'TASK_HOME'};
-$ENV{'TASK_HOME'} =~ s@\/@\\@g if $isWin;
+if($isWin) {
+    $ENV{'TASK_HOME'} =~ s@\/@\\@g;
+    # need to convert TASK_HOME path name to resolve very subtle bug when running task.pl via
+    # run-gs2-diffcol.bat which uses environment.pl's TASK_HOME setting via envi
+    # At that point TASK_HOME is already defined but ends up lowercase, so that entries in archiveinf-doc 
+    # end up sorted differently when db2txt -sort is applied compared to if TASK_HOME had kept its case.    
+    require Win32; # for working out Windows Long Filenames from Win 8.3 short filenames
+    $ENV{'TASK_HOME'} = &Win32::GetLongPathName($ENV{'TASK_HOME'});
+}
 ##    print STDERR "@@@ TASK_HOME: ".$ENV{'TASK_HOME'}."\n";
 
@@ -392 +401 @@
     print STDERR "$collection - Importing:\n";
     print $xml_fh "<import>\n";
-    &run_build_script("import.pl $collection -removeold"); #-OIDtype hash_on_full_filename
+    &run_build_script("import.pl -removeold $collection"); #-OIDtype hash_on_full_filename
     print $xml_fh "</import>\n";
     print STDERR "done\n";  
@@ -399 +408 @@
     print STDERR "$collection - Building:\n";
     print $xml_fh "<build>\n";
-    &run_build_script("buildcol.pl $collection -removeold");
+    &run_build_script("buildcol.pl -removeold $collection");
     print $xml_fh "</build>\n";
     print STDERR "done\n";