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

Project Templates: Improve configuration of ProjectFile and other variables. Issue #38244, patch by Rolf Wetjen.

Browse Source
This commit is contained in:
Juha 2021-12-09 10:37:52 +02:00
parent b291a31f11
commit 08ed2844b3
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/projecttemplates/frmtemplatevariables.pas
View File

@ -94,7 +94,7 @@ procedure TProjectVariablesForm.SetVariables(const AValue: TStrings);
Var
N,V : String;
I : Integer;
I,J : Integer;
begin
FVariables:=AValue;
@ -108,12 +108,19 @@ begin
SGVariables.RowCount:=FVariables.Count+1;
For I:=1 to FVariables.Count do
begin
V:='';
N:='';
FVariables.GetNameValue(I-1,N,V);
SGVariables.Cells[0,I]:=N;
SGVariables.Cells[1,I]:='';
SGVariables.Cells[2,I]:=V;
J:=Pos('|',V);
if J>0 then
begin
SGVariables.Cells[1,I]:=copy(V,J+1,Length(V));
SGVariables.Cells[2,I]:=copy(V,1,J-1);
end
else
begin
SGVariables.Cells[1,I]:='';
SGVariables.Cells[2,I]:=V;
end;
end;
end;
end;

8
components/projecttemplates/projecttemplates.pp
View File

@ -287,6 +287,7 @@ procedure TProjectTemplate.InitFromDir(const DirName: String);
Var
L : TStringList;
FN : String;
sr: TSearchRec;
begin
FDirectory:=IncludeTrailingPathDelimiter(DirName);
@ -298,6 +299,13 @@ begin
With TMemInifile.Create(FN) do
try
FProjectFile:=ReadString(SProject,KeyProjectFile,FProjectFile);
If Not FileExists(FDirectory+FProjectFile+'.lpi') then
begin
If (FindFirstUTF8(FDirectory+'*.lpi',0,sr)=0)
and FileExistsUTF8(FDirectory+sr.Name) then
FProjectFile:=ExtractFileNameOnly(sr.Name);
FindClose(sr);
end;
FName:=ReadString(SProject,KeyName,DirName);
FAuthor:=ReadString(SProject,KeyAuthor,'');
FDescription:=ReadString(SProject,KeyDescription,'');