IDE: LazDoc: lazdoc paths can now be relative and contain global macros for projects and packages

git-svn-id: trunk@10306 -

components/rtticontrols/rttictrls.pas

@@ -2938,8 +2938,8 @@ begin
     tkInt64:
       begin
         TypeData:=GetTypeData(FLink.Editor.GetPropType);
-        MinValue:=TypeData^.MinInt64Value;
-        MaxValue:=TypeData^.MaxInt64Value;
+        MinValue:=single(TypeData^.MinInt64Value);
+        MaxValue:=single(TypeData^.MaxInt64Value);
         Increment:=1;
         DecimalPlaces:=0;
       end;
@@ -2947,8 +2947,8 @@ begin
     tkQWord:
       begin
         TypeData:=GetTypeData(FLink.Editor.GetPropType);
-        MinValue:=TypeData^.MinQWordValue;
-        MaxValue:=TypeData^.MaxQWordValue;
+        MinValue:=single(TypeData^.MinQWordValue);
+        MaxValue:=single(TypeData^.MaxQWordValue);
         Increment:=1;
         DecimalPlaces:=0;
       end;
@@ -3066,8 +3066,8 @@ begin
     tkInt64:
       begin
         TypeData:=GetTypeData(FLink.Editor.GetPropType);
-        MinValue:=TypeData^.MinInt64Value;
-        MaxValue:=TypeData^.MaxInt64Value;
+        MinValue:=integer(TypeData^.MinInt64Value);
+        MaxValue:=integer(TypeData^.MaxInt64Value);
         Increment:=1;
         DecimalPlaces:=0;
       end;
@@ -3075,8 +3075,8 @@ begin
     tkQWord:
       begin
         TypeData:=GetTypeData(FLink.Editor.GetPropType);
-        MinValue:=TypeData^.MinQWordValue;
-        MaxValue:=TypeData^.MaxQWordValue;
+        MinValue:=integer(TypeData^.MinQWordValue);
+        MaxValue:=integer(TypeData^.MaxQWordValue);
         Increment:=1;
         DecimalPlaces:=0;
       end;

ide/lazdoc.pas

@@ -180,46 +180,65 @@ var
   SrcDir: String;
   FPDocName: String;
   SearchPath: String;
-
+  
+  procedure AddSearchPath(Paths: string; const BaseDir: string);
+  begin
+    if Paths='' then exit;
+    if not IDEMacros.CreateAbsoluteSearchPath(Paths,BaseDir) then exit;
+    if Paths='' then exit;
+    SearchPath:=SearchPath+';'+Paths;
+  end;
+  
   procedure CheckIfInProject(AProject: TLazProject);
   var
     ProjectDirs: String;
+    BaseDir: String;
+    Add: Boolean;
   begin
     if AProject=nil then exit;
+    if AProject.LazDocPaths='' then exit;
+    BaseDir:=ExtractFilePath(AProject.ProjectInfoFile);
+    if BaseDir='' then exit;
+
+    Add:=false;
+    // search in project files
     if (AProject.FindFile(SrcFilename,[pfsfOnlyProjectFiles])<>nil) then begin
-      SearchPath:=SearchPath+';'+AProject.LazDocPaths;
-      exit;
+      Add:=true;
     end;
-    // search in project directories
-    if not FilenameIsAbsolute(SrcFilename) then exit;
-    ProjectDirs:=AProject.LazCompilerOptions.OtherUnitFiles;
-    if FindPathInSearchPath(PChar(SrcDir),length(SrcDir),
-       PChar(ProjectDirs),length(ProjectDirs))<>nil
-    then
-      SearchPath:=SearchPath+';'+AProject.LazDocPaths;
+    if (not Add) and FilenameIsAbsolute(SrcFilename) then begin
+      // search in project directories
+      ProjectDirs:=AProject.LazCompilerOptions.OtherUnitFiles+';.';
+      if not IDEMacros.CreateAbsoluteSearchPath(ProjectDirs,BaseDir) then exit;
+      if FindPathInSearchPath(PChar(SrcDir),length(SrcDir),
+        PChar(ProjectDirs),length(ProjectDirs))<>nil
+      then
+        Add:=true;
+    end;
+    if Add then
+      AddSearchPath(AProject.LazDocPaths,BaseDir);
   end;
   
   procedure CheckIfInAPackage;
   var
     PkgList: TFPList;
     i: Integer;
-    Dirs: String;
     APackage: TLazPackage;
+    BaseDir: String;
   begin
     if not FilenameIsAbsolute(SrcFilename) then exit;
+    
+    // get all packages owning the file
     PkgList:=PackageEditingInterface.GetOwnersOfUnit(SrcFilename);
     if PkgList=nil then exit;
     try
       for i:=0 to PkgList.Count-1 do begin
         if TObject(PkgList[i]) is TLazPackage then begin
           APackage:=TLazPackage(PkgList[i]);
-          Dirs:=APackage.CompilerOptions.OtherUnitFiles;
-          if FindPathInSearchPath(PChar(SrcDir),length(SrcDir),
-             PChar(Dirs),length(Dirs))<>nil
-          then begin
-            // TODO: add lazdoc paths to package
-            //SearchPath:=SearchPath+';'+APackage.LazDocPaths;
-          end;
+          if APackage.LazDocPaths='' then continue;
+          BaseDir:=APackage.Directory;
+          if BaseDir='' then continue;
+          // add lazdoc paths of package
+          AddSearchPath(APackage.LazDocPaths,BaseDir);
         end;
       end;
     finally
@@ -233,8 +252,9 @@ var
   begin
     if not FilenameIsAbsolute(SrcFilename) then exit;
     LazDir:=AppendPathDelim(EnvironmentOptions.LazarusDirectory);
+    // check LCL
     if FileIsInPath(SrcFilename,LazDir+'lcl') then begin
-      SearchPath:=SearchPath+';'+LazDir+SetDirSeparators('docs/xml/lcl');
+      AddSearchPath(SetDirSeparators('docs/xml/lcl'),LazDir);
     end;
   end;
 
@@ -262,9 +282,7 @@ begin
   CheckIfInAPackage;
   CheckIfInLazarus;
   // finally add default paths
-  SearchPath:=SearchPath+';'+EnvironmentOptions.LazDocPaths;
-  // substitute macros
-  IDEMacros.SubstituteMacros(SearchPath);
+  AddSearchPath(EnvironmentOptions.LazDocPaths,'');
 
   FPDocName:=lowercase(ExtractFileNameOnly(SrcFilename))+'.xml';
   DebugLn(['TLazDocManager.GetFPDocFilenameForSource Search ',FPDocName,' in "',SearchPath,'"']);

ide/main.pp

@@ -1507,7 +1507,6 @@ begin
   GlobalDesignHook.AddHandlerPersistentAdded(@OnPropHookPersistentAdded);
   GlobalDesignHook.AddHandlerPersistentDeleting(@OnPropHookPersistentDeleting);
   GlobalDesignHook.AddHandlerDeletePersistent(@OnPropHookDeletePersistent);
-  GlobalDesignHook.AddHandlerAddDependency(@OnPropHookAddDependency);
 
   ObjectInspector1.PropertyEditorHook:=GlobalDesignHook;
   EnvironmentOptions.IDEWindowLayoutList.Apply(ObjectInspector1,

ideintf/macrointf.pas

@@ -21,7 +21,7 @@ unit MacroIntf;
 interface
 
 uses
-  Classes, SysUtils;
+  Classes, SysUtils, FileUtil;
 
 type
   { TIDEMacros - macros for paths and compiler settings }
@@ -37,6 +37,9 @@ type
     procedure IncreaseGraphStamp;
     function StrHasMacros(const s: string): boolean; virtual;
     function SubstituteMacros(var s: string): boolean; virtual;
+    // file utility functions
+    function CreateAbsoluteSearchPath(var SearchPath: string;
+                                      const BaseDirectory: string): boolean;
   end;
   
 var
@@ -79,5 +82,13 @@ begin
   Result:=true;
 end;
 
+function TIDEMacros.CreateAbsoluteSearchPath(var SearchPath: string;
+  const BaseDirectory: string): boolean;
+begin
+  if SearchPath='' then exit(true);
+  Result:=SubstituteMacros(SearchPath);
+  SearchPath:=FileUtil.CreateAbsoluteSearchPath(SearchPath,BaseDirectory);
+end;
+
 end.
 

lcl/fileutil.pas

@@ -80,6 +80,7 @@ function ChompPathDelim(const Path: string): string;
 function TrimFilename(const AFilename: string): string;
 function CleanAndExpandFilename(const Filename: string): string;
 function CleanAndExpandDirectory(const Filename: string): string;
+function CreateAbsoluteSearchPath(const SearchPath, BaseDirectory: string): string;
 function CreateRelativePath(const Filename, BaseDirectory: string): string;
 function FileIsInPath(const Filename, Path: string): boolean;
 function FileIsInDirectory(const Filename, Directory: string): boolean;

lcl/include/fileutil.inc

@@ -880,6 +880,46 @@ begin
   Result:=AppendPathDelim(CleanAndExpandFilename(Filename));
 end;
 
+function CreateAbsoluteSearchPath(const SearchPath, BaseDirectory: string
+  ): string;
+var
+  PathLen: Integer;
+  EndPos: Integer;
+  StartPos: Integer;
+  CurDir: String;
+  NewCurDir: String;
+  DiffLen: Integer;
+  BaseDir: String;
+begin
+  Result:=SearchPath;
+  if (SearchPath='') or (BaseDirectory='') then exit;
+  BaseDir:=AppendPathDelim(BaseDirectory);
+
+  PathLen:=length(Result);
+  EndPos:=1;
+  while EndPos<=PathLen do begin
+    StartPos:=EndPos;
+    while (Result[StartPos]=';') do begin
+      inc(StartPos);
+      if StartPos>PathLen then exit;
+    end;
+    EndPos:=StartPos;
+    while (EndPos<=PathLen) and (Result[EndPos]<>';') do inc(EndPos);
+    CurDir:=copy(Result,StartPos,EndPos-StartPos);
+    if not FilenameIsAbsolute(CurDir) then begin
+      NewCurDir:=BaseDir+CurDir;
+      if NewCurDir<>CurDir then begin
+        DiffLen:=length(NewCurDir)-length(CurDir);
+        Result:=copy(Result,1,StartPos-1)+NewCurDir
+                +copy(Result,EndPos,PathLen-EndPos+1);
+        inc(EndPos,DiffLen);
+        inc(PathLen,DiffLen);
+      end;
+    end;
+    StartPos:=EndPos;
+  end;
+end;
+
 function CreateRelativePath(const Filename, BaseDirectory: string): string;
 var
   FileNameLength: Integer;

packager/pkgoptionsdlg.pas

@@ -203,12 +203,31 @@ var
   AButton: TPathEditorButton;
   NewPath: String;
   AnEdit: TEdit;
+  OldPath: String;
+  //CurDir: string;
+  //StartPos: Integer;
 begin
   if not (Sender is TPathEditorButton) then exit;
   AButton:=TPathEditorButton(Sender);
   if AButton.CurrentPathEditor.ModalResult<>mrOk then exit;
   NewPath:=AButton.CurrentPathEditor.Path;
   AnEdit:=GetEditForPathButton(AButton);
+  OldPath:=AnEdit.Text;
+  if OldPath<>NewPath then begin
+    // check NewPath
+    {StartPos:=1;
+    repeat
+      CurDir:=GetNextDirectoryInSearchPath(NewPath,StartPos);
+      if CurDir<>'' then begin
+        IDEMacros.SubstituteMacros(SearchPath);
+        CurDir:=LazPackage.LongenFilename(CurDir);
+        if not FileExists(CurDir) then begin
+          // TODO:
+          
+        end;
+      end;
+    until StartPos>length(NewPath);}
+  end;
   AnEdit.Text:=NewPath;
 end;