paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-05 19:00:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Converter: optimize, use existing main file name.

Browse Source 
git-svn-id: trunk@41601 -
This commit is contained in:
juha 2013-06-08 19:18:19 +00:00
parent 39efd79f55
commit 90fc05b7ce
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
converter/convertdelphi.pas
View File

@ -199,7 +199,6 @@ type
function GetCompOpts: TBaseCompilerOptions; virtual; abstract; function GetCompOpts: TBaseCompilerOptions; virtual; abstract;
function GetCustomDefines: TDefineTemplate; virtual; abstract; function GetCustomDefines: TDefineTemplate; virtual; abstract;
procedure CustomDefinesChanged; virtual; abstract; procedure CustomDefinesChanged; virtual; abstract;
function GetMainDirectory: string; virtual; abstract;
function GetMainName: string; virtual; abstract; function GetMainName: string; virtual; abstract;
function SaveAndMaybeClose(aFilename: string): TModalResult; virtual; function SaveAndMaybeClose(aFilename: string): TModalResult; virtual;
procedure AddPackageDependency(const PackageName: string); virtual; abstract; procedure AddPackageDependency(const PackageName: string); virtual; abstract;
@ -212,7 +211,6 @@ type
public public
property CompOpts: TBaseCompilerOptions read GetCompOpts; property CompOpts: TBaseCompilerOptions read GetCompOpts;
property CustomDefines: TDefineTemplate read GetCustomDefines; property CustomDefines: TDefineTemplate read GetCustomDefines;
property MainDirectory: string read GetMainDirectory;
property MainName: string read GetMainName; property MainName: string read GetMainName;
end; end;
@ -236,7 +234,6 @@ type
function GetCompOpts: TBaseCompilerOptions; override; function GetCompOpts: TBaseCompilerOptions; override;
function GetCustomDefines: TDefineTemplate; override; function GetCustomDefines: TDefineTemplate; override;
procedure CustomDefinesChanged; override; procedure CustomDefinesChanged; override;
function GetMainDirectory: string; override;
function GetMainName: string; override; function GetMainName: string; override;
function SaveAndMaybeClose(Filename: string): TModalResult; override; function SaveAndMaybeClose(Filename: string): TModalResult; override;
procedure AddPackageDependency(const PackageName: string); override; procedure AddPackageDependency(const PackageName: string); override;
@ -268,7 +265,6 @@ type
function GetCompOpts: TBaseCompilerOptions; override; function GetCompOpts: TBaseCompilerOptions; override;
function GetCustomDefines: TDefineTemplate; override; function GetCustomDefines: TDefineTemplate; override;
procedure CustomDefinesChanged; override; procedure CustomDefinesChanged; override;
function GetMainDirectory: string; override;
function GetMainName: string; override; function GetMainName: string; override;
procedure AddPackageDependency(const PackageName: string); override; procedure AddPackageDependency(const PackageName: string); override;
function FindDependencyByName(const PackageName: string): TPkgDependency; override; function FindDependencyByName(const PackageName: string): TPkgDependency; override;
@ -317,7 +313,7 @@ var
p: LongInt; p: LongInt;
begin begin
Result:=''; // Default: ignore absolute paths Result:=''; // Default: ignore absolute paths
ProjectDir:=AProjPack.MainDirectory; ProjectDir:=ExtractFilePath(AProjPack.fLazPMainFilename);
ShortProjectDir:=PathDelim+ExtractFileName(ChompPathDelim(ProjectDir))+PathDelim; ShortProjectDir:=PathDelim+ExtractFileName(ChompPathDelim(ProjectDir))+PathDelim;
p:=System.Pos(ShortProjectDir,Filename); p:=System.Pos(ShortProjectDir,Filename);
if (p>0) then if (p>0) then
@ -1693,15 +1689,6 @@ begin
(fProjPack as TProject).DefineTemplates.CustomDefinesChanged; (fProjPack as TProject).DefineTemplates.CustomDefinesChanged;
end; end;
function TConvertDelphiProject.GetMainDirectory: string;
var
s: String;
begin
Result:=LazProject.ProjectDirectory;
s:=ExtractFilePath(fLazPMainFilename);
Assert(Result=s, Format('Project MainDirectory differs: %s, %s.', [Result, s]));
end;
function TConvertDelphiProject.GetMainName: string; function TConvertDelphiProject.GetMainName: string;
begin begin
Result:=''; Result:='';
@ -1990,15 +1977,6 @@ begin
(fProjPack as TLazPackage).DefineTemplates.CustomDefinesChanged; (fProjPack as TLazPackage).DefineTemplates.CustomDefinesChanged;
end; end;
function TConvertDelphiPackage.GetMainDirectory: string;
var
s: String;
begin
Result:=LazPackage.Directory;
s:=ExtractFilePath(fLazPMainFilename);
Assert(Result=s, Format('Package MainDirectory differs: %s, %s.', [Result, s]));
end;
function TConvertDelphiPackage.GetMainName: string; function TConvertDelphiPackage.GetMainName: string;
begin begin
Result:=(fProjPack as TLazPackage).Filename; Result:=(fProjPack as TLazPackage).Filename;