fixed increasing timestamp in TFileReferenceList on invalidate

git-svn-id: trunk@8245 -

ide/filereferencelist.pas

@@ -39,8 +39,7 @@ unit FileReferenceList;
 interface
 
 uses
-  Classes, SysUtils, AVL_Tree, FileUtil,
-  IDEProcs;
+  Classes, SysUtils, LCLProc, AVL_Tree, FileUtil, IDEProcs;
   
 type
   { TFileReference }
@@ -170,13 +169,14 @@ begin
     inc(FTimeStamp)
   else
     FTimeStamp:=-$7fffffff;
+  //DebugLn('TFileReferenceList.IncreaseTimeStamp ',dbgs(FTimeStamp));
 end;
 
 procedure TFileReferenceList.Invalidate;
 begin
+  IncreaseTimeStamp;
   if not (frfSearchPathValid in FFlags) then exit;
   Exclude(FFlags,frfSearchPathValid);
-  IncreaseTimeStamp;
   if FUpdateLock>0 then
     Include(FFlags,frfChanged)
   else if Assigned(OnChanged) then

ide/main.pp

@@ -3681,6 +3681,8 @@ begin
         NewFileName:=ExtractFilePath(NewFilename)+lowercase(FileWithoutPath);
     end;
   end;
+  
+  // check overwrite existing file
   if (AnUnitInfo.IsVirtual
       or (CompareFilenames(NewFilename,AnUnitInfo.Filename)<>0))
   and FileExists(NewFilename) then begin
@@ -4102,6 +4104,7 @@ begin
   
   // add new path to unit path
   if AnUnitInfo.IsPartOfProject
+  and (not Project1.IsVirtual)
   and (FilenameIsPascalUnit(NewFilename))
   and (CompareFilenames(NewFilePath,Project1.ProjectDirectory)<>0) then begin
     OldUnitPath:=Project1.CompilerOptions.GetUnitPath(false);

ide/project.pp

@@ -439,6 +439,7 @@ type
     FOnSaveProjectInfo: TOnSaveProjectInfo;
     fPathDelimChanged: boolean;
     fProjectDirectory: string;
+    fProjectDirectoryReferenced: string;
     fProjectInfoFile: String;  // the lpi filename
     FPublishOptions: TPublishProjectOptions;
     FRunParameterOptions: TRunParamsOptions;
@@ -2441,6 +2442,7 @@ begin
   if NewProjectInfoFile='' then exit;
   DoDirSeparators(NewProjectInfoFile);
   if fProjectInfoFile=NewProjectInfoFile then exit;
+  BeginUpdate(true);
   OldProjectInfoFile:=fProjectInfoFile;
   fProjectInfoFile:=NewProjectInfoFile;
   DefaultTitle:=ExtractFileNameOnly(OldProjectInfoFile);
@@ -2449,11 +2451,14 @@ begin
     Title:=DefaultTitle;
   end;
   UpdateProjectDirectory;
+  FDefineTemplates.SourceDirectoriesChanged;
   Modified:=true;
+  EndUpdate;
+  //DebugLn('TProject.SetProjectInfoFile FDefineTemplates.FUpdateLock=',dbgs(FDefineTemplates.FUpdateLock));
 end;
 
 function TProject.OnUnitFileBackup(const Filename:string;
-  IsPartOfProject:boolean):TModalResult;
+  IsPartOfProject: boolean):TModalResult;
 begin
   if Assigned(fOnFileBackup) then
     Result:=fOnFileBackup(Filename,IsPartOfProject)
@@ -2463,7 +2468,7 @@ end;
 
 procedure TProject.OnLoadSaveFilename(var AFilename: string; Load:boolean);
 var
-  ProjectPath:string;
+  ProjectPath: string;
   FileWasAbsolute: Boolean;
 begin
   if AFileName='' then exit;
@@ -2993,7 +2998,7 @@ function TProject.ProjectUnitWithUnitname(const AnUnitName: string): TUnitInfo;
 begin
   Result:=fFirst[uilPartOfProject];
   while Result<>nil do begin
-    if AnsiCompareText(AnUnitName,Result.UnitName)=0 then exit;
+    if CompareText(AnUnitName,Result.UnitName)=0 then exit;
     Result:=Result.fNext[uilPartOfProject];
   end;
 end;
@@ -3002,6 +3007,13 @@ procedure TProject.UpdateProjectDirectory;
 begin
   fProjectDirectory:=ExtractFilePath(fProjectInfoFile);
   CompilerOptions.BaseDirectory:=fProjectDirectory;
+  if fProjectDirectory<>fProjectDirectoryReferenced then begin
+    if fProjectDirectoryReferenced<>'' then
+      FSourceDirectories.RemoveFilename(fProjectDirectoryReferenced);
+    if fProjectDirectory<>'' then
+      FSourceDirectories.AddFilename(fProjectDirectory);
+    fProjectDirectoryReferenced:=fProjectDirectory;
+  end;
 end;
 
 procedure TProject.UpdateSourceDirectories;
@@ -3027,8 +3039,13 @@ end;
 procedure TProject.ClearSourceDirectories;
 begin
   FSourceDirectories.Clear;
+  fProjectDirectoryReferenced:='';
   if MainProject then
     FSourceDirectories.AddFilename(VirtualDirectory);
+  if (fProjectDirectory<>'') then begin
+    FSourceDirectories.AddFilename(fProjectDirectory);
+    fProjectDirectoryReferenced:=fProjectDirectory;
+  end;
 end;
 
 procedure TProject.SourceDirectoriesChanged(Sender: TObject);
@@ -3367,7 +3384,7 @@ var
   SrcDirMarkDefTempl: TDefineTemplate;
   SrcPathDefTempl: TDefineTemplate;
 begin
-  //DebugLn('TProjectDefineTemplates.UpdateDefinesForSourceDirectories ',Project.IDAsString,' Active=',dbgs(Active));
+  //DebugLn('TProjectDefineTemplates.UpdateDefinesForSourceDirectories ',Project.IDAsString,' Active=',dbgs(Active),' TimeStamp=',dbgs(fLastSourceDirStamp),' Project.TimeStamp=',dbgs(Project.SourceDirectories.TimeStamp));
   if (not Project.NeedsDefineTemplates) or (not Active) then exit;
 
   // quick check if something has changed

lcl/include/treeview.inc

@@ -103,7 +103,7 @@ end;
 { procedure for sorting a TTreeNodeArray}
 
 procedure Sort(Nodes: TTreeNodeArray; Count: integer;
-                    SortProc: TTreeNodeCompare);
+  SortProc: TTreeNodeCompare);
 // Sorts the nodes using merge sort and updates the sibling links
 var
   Buffer: TTreeNodeArray;