Changeset 34955 for other-projects

Timestamp:

2021-03-02T15:20:09+13:00 (3 years ago)

Author:

anupama

Message:

Some local changes on the 64 bit linux that I'd created long back to start supporting the incomplete work of diffcol for GS3 installations as well. It should be possible to commit this as it ought not to affect GS2, as these code changes are present in the 64 bit linux' diffcol task and don't affect diffcol there as they're not in effect. Hopefully shouldn't break anything when diffcol.pl is svn updated on Windows

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm (modified) (3 diffs)

other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm

@@ -41 +41 @@
     my $db_cmd = "db2txt -sort $db_file 2>&1";
     if($db_file =~ m/\.jdb$/) {
-    print STDERR "NOT YET IMPLEMENTED\n";
-    #$db_cmd = "jdb2txt -sort $db_file 2>&1";
+    my $runperl = ($ENV{'GSDLOS'} =~ m/windows/) ? "perl -S" : "";
+    $db_cmd = "$runperl jdb2txt.pl -sort $db_file";
     }
 
@@ -54 +54 @@
 
     # http://stackoverflow.com/questions/1909262/how-can-i-pipe-input-into-a-java-command-from-perl
-    open PIPE, "| txt2db $db_filename";
-    print PIPE "$db_text";
-    close(PIPE);
     
+    if($db_filename =~ m/\.jdb$/) {
+    my $runperl = ($ENV{'GSDLOS'} =~ m/windows/) ? "perl -S" : "";
+    open PIPE, "| $runperl txt2jdb.pl $db_filename";
+    print PIPE "$db_text";
+    close(PIPE);
+    } else {
+    open PIPE, "| txt2db $db_filename";
+    print PIPE "$db_text";
+    close(PIPE);
+    }
     return &read_db("$db_filename");
 }
@@ -278 +285 @@
     print_string_to_file($model_text, $savepath.$dbname."_model.out");
     }
-    
+
     my $report_type = "OldStyle"; # Can not change this type.
     my $diff_gdb = diff \$model_text, \$test_text, { STYLE => $report_type };