[JVCL-Checkins] dev/JVCL3/devtools/PackagesGenerator GenerateUtils.pas,1.32,1.33 - Better "file changed" detection

[Andreas H. <ah...@pr...>]

Update of /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4370/devtools/PackagesGenerator

Modified Files:
	GenerateUtils.pas 
Log Message:
Better "file changed" detection


Index: GenerateUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator/GenerateUtils.pas,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** GenerateUtils.pas	26 Jan 2004 06:12:26 -0000	1.32
--- GenerateUtils.pas	26 Jan 2004 09:46:15 -0000	1.33
***************
*** 570,573 ****
--- 570,672 ----
  end;
  
+ function CompareFiles(const FileName1, FileName2: string): Boolean;
+ const
+   MaxBufSize = 65356;
+ var
+   Stream1, Stream2: TFileStream;
+   Buffer1, Buffer2: array[0..MaxBufSize - 1] of Byte;
+   BufSize: Integer;
+   Size: Integer;
+ begin
+   Result := False;
+ 
+   Stream1 := nil;
+   Stream2 := nil;
+   try
+     Stream1 := TFileStream.Create(FileName1, fmOpenRead or fmShareDenyWrite);
+     Stream2 := TFileStream.Create(FileName2, fmOpenRead or fmShareDenyWrite);
+ 
+     Size := Stream1.Size;
+     if Size <> Stream2.Size then
+       Exit;
+ 
+     BufSize := MaxBufSize;
+     while Size > 0 do
+     begin
+       if BufSize > Size then
+         BufSize := Size;
+       Dec(Size, BufSize);
+ 
+       Stream1.Read(Buffer1[0], BufSize);
+       Stream2.Read(Buffer2[0], BufSize);
+ 
+       Result := CompareMem(@Buffer1[0], @Buffer2[0], BufSize);
+       if not Result then
+         Exit;
+     end;
+   finally
+     Stream1.Free;
+     Stream2.Free;
+   end;
+   Result := True;
+ end;
+ 
+ function StartsWith(const S, SubStr: string): Boolean;
+ var
+   Len, i: Integer;
+ begin
+   Len := Length(SubStr);
+   Result := False;
+   if (Len > 0) and (Length(S) >= Len) then
+   begin
+     for i := 1 to Len do
+       if S[i] <> SubStr[i] then
+         Exit;
+     Result := True;
+   end;
+ end;
+ 
+ function HasFileChanged(const OutFileName, TemplateFileName: string; OutLines: TStrings): Boolean;
+ var
+   CurLines: TStrings;
+   i: Integer;
+ begin
+   Result := True;
+   if not FileExists(OutFileName) then
+     Exit;
+ 
+   if OutLines.Count = 0 then
+   begin
+     // binary file -> compare files
+     Result := not CompareFiles(OutFileName, TemplateFileName);
+   end
+   else
+   begin
+     // text file -> compare lines
+     CurLines := TStringList.Create;
+     try
+       CurLines.LoadFromFile(OutFileName);
+ 
+       if CurLines.Count <> OutLines.Count then
+       begin
+         Result := True;
+         Exit;
+       end;
+ 
+      // Replace the time stamp line by the new one to ensure that this wont
+      // break the comparison.
+       for i := 0 to CurLines.Count - 1 do
+         if StartsWith(TrimLeft(CurLines[i]), 'Last generated: ') then
+         begin
+           CurLines[i] := OutLines[i];
+           Break;
+         end;
+       Result := not CurLines.Equals(OutLines);
+     finally
+       CurLines.Free;
+     end;
+   end;
+ end;
+ 
  function ApplyTemplateAndSave(path, target, package, extension, prefix, format : string; template : TStrings; xml : TJvSimpleXml; templateName, xmlName : string; mostRecentFileDate : TDateTime) : string;
  var
***************
*** 834,839 ****
      // doesn't exist or it's older than the most recent file
      if containsSomething and
!        (not FileExists(OutFileName) or
!         (FileDateToDateTime(FileAge(OutFileName)) < mostRecentFileDate)) then
      begin
        SendMsg(#9#9'Writing ' + ExtractFileName(OutFileName) + ' for ' + target);
--- 933,939 ----
      // doesn't exist or it's older than the most recent file
      if containsSomething and
!        (HasFileChanged(OutFileName, templateName, outFile)) then
!        {(not FileExists(OutFileName) or
!         (FileDateToDateTime(FileAge(OutFileName)) < mostRecentFileDate)) then}
      begin
        SendMsg(#9#9'Writing ' + ExtractFileName(OutFileName) + ' for ' + target);