Ignore:
Timestamp:
09/05/13 16:27:12 (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm

    r28172 r28224  
    121121               
    122122                # assoc-file and meta-file contain filepaths, ensure these are long windows file paths now (will later convert to linux slashes)   
    123                 if($line =~ m@^<(assoc-file|meta-file)>(.*)(\s+)@s) {
    124                     $line = $2; # may be a short file name
    125                     # perhaps test here if it is a shortfilename? should match /CAPS....~number(.ext)/
    126                
    127                     $line = "<$1>".&Win32::GetLongPathName($line)."$3"; # make it a long file name and prefix assoc-file/meta-file tagname to it again                 
     123                if($line =~ m@^<(assoc-file|meta-file|src-file)>(.*)(\s+)@s) {
     124                   
     125                    if($2 !~ m/^\@/) { # if the path doesn't use a "relative" @GSPATH@ placeholder string, but is an absolute path instead
     126                        $line = $2; # it may be a short file name
     127                        # perhaps test here if it is a shortfilename? should match /CAPS....~number(.ext)/
     128                       
     129                        $line = "<$1>".&Win32::GetLongPathName($line)."$3"; # make it a long file name and prefix assoc-file/meta-file tagname to it again                 
     130                    }
    128131                }
    129132                $tmp .= $line;
Note: See TracChangeset for help on using the changeset viewer.