Changeset 28224 for other-projects/nightly-tasks/diffcol/trunk/diffcol

Timestamp:

2013-09-05T16:27:12+12:00 (11 years ago)

Author:

ak19

Message:

Windows-specific alterations to handle the recent changes to GS perllib\util.pm code where placeholders are now written into the archiveinf-doc (and archive-inf-src) GDB file instead of full paths.

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm (modified) (1 diff)

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

@@ -121 +121 @@
                 
                 # assoc-file and meta-file contain filepaths, ensure these are long windows file paths now (will later convert to linux slashes)    
-                if($line =~ m@^<(assoc-file|meta-file)>(.*)(\s+)@s) {
-                    $line = $2; # may be a short file name
-                    # perhaps test here if it is a shortfilename? should match /CAPS....~number(.ext)/
-                
-                    $line = "<$1>".&Win32::GetLongPathName($line)."$3"; # make it a long file name and prefix assoc-file/meta-file tagname to it again                  
+                if($line =~ m@^<(assoc-file|meta-file|src-file)>(.*)(\s+)@s) {
+                    
+                    if($2 !~ m/^\@/) { # if the path doesn't use a "relative" @GSPATH@ placeholder string, but is an absolute path instead
+                        $line = $2; # it may be a short file name
+                        # perhaps test here if it is a shortfilename? should match /CAPS....~number(.ext)/
+                        
+                        $line = "<$1>".&Win32::GetLongPathName($line)."$3"; # make it a long file name and prefix assoc-file/meta-file tagname to it again                  
+                    }
                 }
                 $tmp .= $line;