diff --git a/converter/delphiproject2laz.pas b/converter/delphiproject2laz.pas index b09c2543dd..87e309e4d3 100644 --- a/converter/delphiproject2laz.pas +++ b/converter/delphiproject2laz.pas @@ -302,12 +302,12 @@ begin AProject.CompilerOptions.OtherUnitFiles:=MinimizeSearchPath( RemoveNonExistingPaths(NewSearchPath,AProject.ProjectDirectory)); // set include path - NewSearchPath:=MergeSearchPaths(AProject.CompilerOptions.IncludeFiles, + NewSearchPath:=MergeSearchPaths(AProject.CompilerOptions.IncludePath, AProject.SourceDirectories.CreateSearchPathFromAllFiles); NewSearchPath:=RemoveSearchPaths(NewSearchPath, '.;'+VirtualDirectory+';'+VirtualTempDir +';'+AProject.ProjectDirectory); - AProject.CompilerOptions.IncludeFiles:=MinimizeSearchPath( + AProject.CompilerOptions.IncludePath:=MinimizeSearchPath( RemoveNonExistingPaths(NewSearchPath,AProject.ProjectDirectory)); // clear caches AProject.DefineTemplates.SourceDirectoriesChanged; @@ -543,12 +543,12 @@ begin APackage.CompilerOptions.OtherUnitFiles:=MinimizeSearchPath( RemoveNonExistingPaths(NewSearchPath,APackage.Directory)); // set include path - NewSearchPath:=MergeSearchPaths(APackage.CompilerOptions.IncludeFiles, + NewSearchPath:=MergeSearchPaths(APackage.CompilerOptions.IncludePath, APackage.SourceDirectories.CreateSearchPathFromAllFiles); NewSearchPath:=RemoveSearchPaths(NewSearchPath, '.;'+VirtualDirectory+';'+VirtualTempDir +';'+APackage.Directory); - APackage.CompilerOptions.IncludeFiles:=MinimizeSearchPath( + APackage.CompilerOptions.IncludePath:=MinimizeSearchPath( RemoveNonExistingPaths(NewSearchPath,APackage.Directory)); // clear caches APackage.DefineTemplates.SourceDirectoriesChanged; @@ -943,7 +943,7 @@ var begin BasePath:=Options.BaseDirectory; Options.OtherUnitFiles:=CleanProjectSearchPath(Options.OtherUnitFiles); - Options.IncludeFiles:=CleanProjectSearchPath(Options.IncludeFiles); + Options.IncludePath:=CleanProjectSearchPath(Options.IncludePath); Options.Libraries:=CleanProjectSearchPath(Options.Libraries); Options.ObjectPath:=CleanProjectSearchPath(Options.ObjectPath); Options.SrcPath:=CleanProjectSearchPath(Options.SrcPath); diff --git a/converter/delphiunit2laz.pas b/converter/delphiunit2laz.pas index 7e56abd1c4..46d50d2ebc 100644 --- a/converter/delphiunit2laz.pas +++ b/converter/delphiunit2laz.pas @@ -564,7 +564,7 @@ var procedure AddSearchPath(const SearchPath: string); begin - CompOpts.IncludeFiles:=MergeSearchPaths(CompOpts.IncludeFiles,SearchPath); + CompOpts.IncludePath:=MergeSearchPaths(CompOpts.IncludePath,SearchPath); CompOpts.Libraries:=MergeSearchPaths(CompOpts.Libraries,SearchPath); CompOpts.OtherUnitFiles:=MergeSearchPaths(CompOpts.OtherUnitFiles,SearchPath); CompOpts.ObjectPath:=MergeSearchPaths(CompOpts.ObjectPath,SearchPath); @@ -683,8 +683,8 @@ begin IncludePath:=ExpandDelphiSearchPath(copy(Line,4,length(Line)-4),AProject); if IncludePath<>'' then begin DebugLn('ExtractOptionsFromCFG adding IncludePath "',IncludePath,'"'); - CompOpts.IncludeFiles:= - MergeSearchPaths(CompOpts.IncludeFiles,IncludePath); + CompOpts.IncludePath:= + MergeSearchPaths(CompOpts.IncludePath,IncludePath); end; end; end; diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp index 7fbb19d04f..ad1ab72548 100644 --- a/ide/compileroptions.pp +++ b/ide/compileroptions.pp @@ -257,10 +257,10 @@ type procedure SetBaseDirectory(const AValue: string); override; procedure SetCompilerPath(const AValue: String); override; procedure SetCustomOptions(const AValue: string); override; - procedure SetIncludeFiles(const AValue: String); override; - procedure SetLibraries(const AValue: String); override; + procedure SetIncludePaths(const AValue: String); override; + procedure SetLibraryPaths(const AValue: String); override; procedure SetLinkerOptions(const AValue: String); override; - procedure SetOtherUnitFiles(const AValue: String); override; + procedure SetUnitPaths(const AValue: String); override; procedure SetUnitOutputDir(const AValue: string); override; procedure SetObjectPath(const AValue: string); override; procedure SetSrcPath(const AValue: string); override; @@ -819,17 +819,17 @@ begin end; {------------------------------------------------------------------------------ - procedure TBaseCompilerOptions.SetIncludeFiles(const AValue: String); + procedure TBaseCompilerOptions.SetIncludePaths(const AValue: String); ------------------------------------------------------------------------------} -procedure TBaseCompilerOptions.SetIncludeFiles(const AValue: String); +procedure TBaseCompilerOptions.SetIncludePaths(const AValue: String); var NewValue: String; begin NewValue:=ShortenPath(AValue,false); if NewValue<>AValue then - if fIncludeFiles=NewValue then exit; - fIncludeFiles:=NewValue; - ParsedOpts.SetUnparsedValue(pcosIncludePath,fIncludeFiles); + if fIncludePaths=NewValue then exit; + fIncludePaths:=NewValue; + ParsedOpts.SetUnparsedValue(pcosIncludePath,fIncludePaths); end; procedure TBaseCompilerOptions.SetCompilerPath(const AValue: String); @@ -901,14 +901,14 @@ begin ParsedOpts.SetUnparsedValue(pcosCustomOptions,fCustomOptions); end; -procedure TBaseCompilerOptions.SetLibraries(const AValue: String); +procedure TBaseCompilerOptions.SetLibraryPaths(const AValue: String); var NewValue: String; begin NewValue:=ShortenPath(AValue,false); - if fLibraries=NewValue then exit; - fLibraries:=NewValue; - ParsedOpts.SetUnparsedValue(pcosLibraryPath,fLibraries); + if fLibraryPaths=NewValue then exit; + fLibraryPaths:=NewValue; + ParsedOpts.SetUnparsedValue(pcosLibraryPath,fLibraryPaths); end; procedure TBaseCompilerOptions.SetLinkerOptions(const AValue: String); @@ -918,14 +918,14 @@ begin ParsedOpts.SetUnparsedValue(pcosLinkerOptions,fLinkerOptions); end; -procedure TBaseCompilerOptions.SetOtherUnitFiles(const AValue: String); +procedure TBaseCompilerOptions.SetUnitPaths(const AValue: String); var NewValue: String; begin NewValue:=ShortenPath(AValue,false); - if fOtherUnitFiles=NewValue then exit; - fOtherUnitFiles:=NewValue; - ParsedOpts.SetUnparsedValue(pcosUnitPath,fOtherUnitFiles); + if fUnitPaths=NewValue then exit; + fUnitPaths:=NewValue; + ParsedOpts.SetUnparsedValue(pcosUnitPath,fUnitPaths); end; procedure TBaseCompilerOptions.SetUnitOutputDir(const AValue: string); @@ -1010,7 +1010,7 @@ begin { SearchPaths } p:=Path+'SearchPaths/'; - IncludeFiles := sp(XMLConfigFile.GetValue(p+'IncludeFiles/Value', '')); + IncludePath := sp(XMLConfigFile.GetValue(p+'IncludeFiles/Value', '')); Libraries := sp(XMLConfigFile.GetValue(p+'Libraries/Value', '')); OtherUnitFiles := sp(XMLConfigFile.GetValue(p+'OtherUnitFiles/Value', '')); UnitOutputDirectory := sp(XMLConfigFile.GetValue(p+'UnitOutputDirectory/Value', '')); @@ -1163,7 +1163,7 @@ begin { SearchPaths } p:=Path+'SearchPaths/'; - XMLConfigFile.SetDeleteValue(p+'IncludeFiles/Value', IncludeFiles,''); + XMLConfigFile.SetDeleteValue(p+'IncludeFiles/Value', IncludePath,''); XMLConfigFile.SetDeleteValue(p+'Libraries/Value', Libraries,''); XMLConfigFile.SetDeleteValue(p+'OtherUnitFiles/Value', OtherUnitFiles,''); XMLConfigFile.SetDeleteValue(p+'UnitOutputDirectory/Value', UnitOutputDirectory,''); @@ -2207,7 +2207,7 @@ begin FModified := false; // search paths - IncludeFiles := ''; + IncludePath := ''; Libraries := ''; OtherUnitFiles := ''; UnitOutputDirectory := ''; @@ -2311,9 +2311,9 @@ begin fLoaded := CompOpts.fLoaded; // Search Paths - IncludeFiles := CompOpts.fIncludeFiles; - Libraries := CompOpts.fLibraries; - OtherUnitFiles := CompOpts.fOtherUnitFiles; + IncludePath := CompOpts.fIncludePaths; + Libraries := CompOpts.fLibraryPaths; + OtherUnitFiles := CompOpts.fUnitPaths; UnitOutputDirectory := CompOpts.fUnitOutputDir; fLCLWidgetType := CompOpts.fLCLWidgetType; ObjectPath := CompOpts.FObjectPath; @@ -2406,9 +2406,9 @@ function TBaseCompilerOptions.IsEqual(CompOpts: TBaseCompilerOptions): boolean; begin Result:= // search paths - (fIncludeFiles = CompOpts.fIncludeFiles) - and (fLibraries = CompOpts.fLibraries) - and (fOtherUnitFiles = CompOpts.fOtherUnitFiles) + (fIncludePaths = CompOpts.fIncludePaths) + and (fLibraryPaths = CompOpts.fLibraryPaths) + and (fUnitPaths = CompOpts.fUnitPaths) and (fUnitOutputDir = CompOpts.fUnitOutputDir) and (FObjectPath = CompOpts.FObjectPath) and (FSrcPath = CompOpts.FSrcPath) diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp index ccef462723..fefe04bff4 100644 --- a/ide/compileroptionsdlg.pp +++ b/ide/compileroptionsdlg.pp @@ -619,7 +619,7 @@ begin // paths edtOtherUnits.Text := Options.OtherUnitFiles; - edtIncludeFiles.Text := Options.IncludeFiles; + edtIncludeFiles.Text := Options.IncludePath; edtLibraries.Text := Options.Libraries; grpLibraries.Enabled:=EnabledLinkerOpts; edtOtherSources.Text := Options.SrcPath; @@ -893,7 +893,7 @@ begin OldCompOpts.Assign(Options); // paths - Options.IncludeFiles := edtIncludeFiles.Text; + Options.IncludePath := edtIncludeFiles.Text; Options.Libraries := edtLibraries.Text; Options.OtherUnitFiles := edtOtherUnits.Text; Options.SrcPath := edtOtherSources.Text; diff --git a/ide/main.pp b/ide/main.pp index b01ad0ce89..8e07a8c279 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -5150,8 +5150,8 @@ begin Project1.CompilerOptions.OtherUnitFiles:= RebaseSearchPath(Project1.CompilerOptions.OtherUnitFiles,OldProjectPath, Project1.ProjectDirectory,true); - Project1.CompilerOptions.IncludeFiles:= - RebaseSearchPath(Project1.CompilerOptions.IncludeFiles,OldProjectPath, + Project1.CompilerOptions.IncludePath:= + RebaseSearchPath(Project1.CompilerOptions.IncludePath,OldProjectPath, Project1.ProjectDirectory,true); Project1.CompilerOptions.Libraries:= RebaseSearchPath(Project1.CompilerOptions.Libraries,OldProjectPath, diff --git a/ide/project.pp b/ide/project.pp index be5df6c5ac..a05395d427 100644 --- a/ide/project.pp +++ b/ide/project.pp @@ -277,12 +277,12 @@ type procedure SetTargetCPU(const AValue: string); override; procedure SetTargetOS(const AValue: string); override; procedure SetCustomOptions(const AValue: string); override; - procedure SetIncludeFiles(const AValue: string); override; - procedure SetLibraries(const AValue: string); override; + procedure SetIncludePaths(const AValue: string); override; + procedure SetLibraryPaths(const AValue: string); override; procedure SetLinkerOptions(const AValue: string); override; procedure SetObjectPath(const AValue: string); override; procedure SetSrcPath(const AValue: string); override; - procedure SetOtherUnitFiles(const AValue: string); override; + procedure SetUnitPaths(const AValue: string); override; procedure SetUnitOutputDir(const AValue: string); override; procedure UpdateGlobals; virtual; public @@ -2903,7 +2903,7 @@ procedure TProject.GetVirtualDefines(DefTree: TDefineTree; begin if (not IsVirtual) then exit; ExtendPath(UnitPathMacroName,CompilerOptions.OtherUnitFiles); - ExtendPath(IncludePathMacroName,CompilerOptions.IncludeFiles); + ExtendPath(IncludePathMacroName,CompilerOptions.IncludePath); ExtendPath(SrcPathMacroName,CompilerOptions.SrcPath); end; @@ -3682,18 +3682,18 @@ begin Project.DefineTemplates.CustomDefinesChanged; end; -procedure TProjectCompilerOptions.SetIncludeFiles(const AValue: string); +procedure TProjectCompilerOptions.SetIncludePaths(const AValue: string); begin - if IncludeFiles=AValue then exit; + if IncludePath=AValue then exit; InvalidateOptions; - inherited SetIncludeFiles(AValue); + inherited SetIncludePaths(AValue); end; -procedure TProjectCompilerOptions.SetLibraries(const AValue: string); +procedure TProjectCompilerOptions.SetLibraryPaths(const AValue: string); begin if Libraries=AValue then exit; InvalidateOptions; - inherited SetLibraries(AValue); + inherited SetLibraryPaths(AValue); end; procedure TProjectCompilerOptions.SetLinkerOptions(const AValue: string); @@ -3717,11 +3717,11 @@ begin inherited SetSrcPath(AValue); end; -procedure TProjectCompilerOptions.SetOtherUnitFiles(const AValue: string); +procedure TProjectCompilerOptions.SetUnitPaths(const AValue: string); begin if OtherUnitFiles=AValue then exit; InvalidateOptions; - inherited SetOtherUnitFiles(AValue); + inherited SetUnitPaths(AValue); end; procedure TProjectCompilerOptions.SetUnitOutputDir(const AValue: string); @@ -3753,7 +3753,7 @@ end; procedure TProjectCompilerOptions.InvalidateOptions; begin if (Project=nil) then exit; - // TODO: propagate change to all dependants projects + // TODO: propagate change to all dependant projects end; procedure TProjectCompilerOptions.UpdateGlobals; diff --git a/ideintf/projectintf.pas b/ideintf/projectintf.pas index 8df239d2ff..57f9ddd017 100644 --- a/ideintf/projectintf.pas +++ b/ideintf/projectintf.pas @@ -63,9 +63,9 @@ type FModified: boolean; // Paths: - fIncludeFiles: String; - fLibraries: String; - fOtherUnitFiles: String; + fIncludePaths: String; + fLibraryPaths: String; + fUnitPaths: String; FObjectPath: string; FSrcPath: string; fUnitOutputDir: string; @@ -153,10 +153,10 @@ type procedure SetBaseDirectory(const AValue: string); virtual; abstract; procedure SetCompilerPath(const AValue: String); virtual; abstract; procedure SetCustomOptions(const AValue: string); virtual; abstract; - procedure SetIncludeFiles(const AValue: String); virtual; abstract; - procedure SetLibraries(const AValue: String); virtual; abstract; + procedure SetIncludePaths(const AValue: String); virtual; abstract; + procedure SetLibraryPaths(const AValue: String); virtual; abstract; procedure SetLinkerOptions(const AValue: String); virtual; abstract; - procedure SetOtherUnitFiles(const AValue: String); virtual; abstract; + procedure SetUnitPaths(const AValue: String); virtual; abstract; procedure SetUnitOutputDir(const AValue: string); virtual; abstract; procedure SetObjectPath(const AValue: string); virtual; abstract; procedure SetSrcPath(const AValue: string); virtual; abstract; @@ -173,9 +173,9 @@ type property OnModified: TNotifyEvent read FOnModified write FOnModified; // search paths: - property IncludeFiles: String read fIncludeFiles write SetIncludeFiles; - property Libraries: String read fLibraries write SetLibraries; - property OtherUnitFiles: String read fOtherUnitFiles write SetOtherUnitFiles; + property IncludePath: String read fIncludePaths write SetIncludePaths; + property Libraries: String read fLibraryPaths write SetLibraryPaths; + property OtherUnitFiles: String read fUnitPaths write SetUnitPaths; property ObjectPath: string read FObjectPath write SetObjectPath; property SrcPath: string read FSrcPath write SetSrcPath; property UnitOutputDirectory: string read fUnitOutputDir write SetUnitOutputDir; diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas index c87d04019c..c15f6f5053 100644 --- a/packager/packagedefs.pas +++ b/packager/packagedefs.pas @@ -354,12 +354,12 @@ type procedure SetLazPackage(const AValue: TLazPackage); procedure SetModified(const NewValue: boolean); override; procedure SetCustomOptions(const AValue: string); override; - procedure SetIncludeFiles(const AValue: string); override; - procedure SetLibraries(const AValue: string); override; + procedure SetIncludePaths(const AValue: string); override; + procedure SetLibraryPaths(const AValue: string); override; procedure SetLinkerOptions(const AValue: string); override; procedure SetObjectPath(const AValue: string); override; procedure SetSrcPath(const AValue: string); override; - procedure SetOtherUnitFiles(const AValue: string); override; + procedure SetUnitPaths(const AValue: string); override; procedure SetUnitOutputDir(const AValue: string); override; public constructor Create(const AOwner: TObject); override; @@ -3301,18 +3301,18 @@ begin LazPackage.DefineTemplates.CustomDefinesChanged; end; -procedure TPkgCompilerOptions.SetIncludeFiles(const AValue: string); +procedure TPkgCompilerOptions.SetIncludePaths(const AValue: string); begin - if IncludeFiles=AValue then exit; + if IncludePath=AValue then exit; InvalidateOptions; - inherited SetIncludeFiles(AValue); + inherited SetIncludePaths(AValue); end; -procedure TPkgCompilerOptions.SetLibraries(const AValue: string); +procedure TPkgCompilerOptions.SetLibraryPaths(const AValue: string); begin if Libraries=AValue then exit; InvalidateOptions; - inherited SetLibraries(AValue); + inherited SetLibraryPaths(AValue); end; procedure TPkgCompilerOptions.SetLinkerOptions(const AValue: string); @@ -3336,11 +3336,11 @@ begin inherited SetSrcPath(AValue); end; -procedure TPkgCompilerOptions.SetOtherUnitFiles(const AValue: string); +procedure TPkgCompilerOptions.SetUnitPaths(const AValue: string); begin if OtherUnitFiles=AValue then exit; InvalidateOptions; - inherited SetOtherUnitFiles(AValue); + inherited SetUnitPaths(AValue); end; procedure TPkgCompilerOptions.SetUnitOutputDir(const AValue: string); diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas index 192ceb3053..ea4c6f68eb 100644 --- a/packager/packageeditor.pas +++ b/packager/packageeditor.pas @@ -1942,7 +1942,7 @@ begin // the unit is in untipath, but the include file not in the incpath // -> auto extend the include path with LazPackage.CompilerOptions do - IncludeFiles:=MergeSearchPaths(IncludeFiles,ShortIncDirectory); + IncludePath:=MergeSearchPaths(IncludePath,ShortIncDirectory); end; end; diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index 5f26a84f81..40a0fa50b7 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -977,7 +977,7 @@ begin +'$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)'); UsageOptions.CustomOptions:='-dLCL -dLCL$(LCLWidgetType)'; // add include path - CompilerOptions.IncludeFiles:=SetDirSeparators( + CompilerOptions.IncludePath:=SetDirSeparators( '$(LazarusDir)/lcl/include;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)'); AddLCLLinkPaths(UsageOptions);