Skip to content

Commit

Permalink
Adapt installscript generator for LCL platforms.
Browse files Browse the repository at this point in the history
  • Loading branch information
LongDirtyAnimAlf committed Apr 22, 2023
1 parent b1c0e9d commit f12f35e
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 7 deletions.
Binary file modified fpcup.res
Binary file not shown.
46 changes: 41 additions & 5 deletions fpcupdeluxe.lps
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
<Filename Value="sources\fpcup.ini"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="2"/>
<CursorPos X="23" Y="22"/>
<UsageCount Value="188"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Ini"/>
Expand All @@ -88,7 +87,7 @@
<Filename Value="sources\revision.inc"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="3"/>
<CursorPos Y="4"/>
<CursorPos X="29" Y="2"/>
<UsageCount Value="188"/>
<Loaded Value="True"/>
</Unit9>
Expand Down Expand Up @@ -125,8 +124,6 @@
<Filename Value="sources\installermanager.pas"/>
<UnitName Value="installerManager"/>
<EditorIndex Value="-1"/>
<TopLine Value="2297"/>
<CursorPos X="23" Y="2313"/>
<UsageCount Value="26"/>
</Unit14>
<Unit15>
Expand Down Expand Up @@ -2619,7 +2616,7 @@
<UsageCount Value="11"/>
</Unit339>
</Units>
<JumpHistory Count="2" HistoryIndex="1">
<JumpHistory Count="12" HistoryIndex="11">
<Position1>
<Filename Value="sources\updeluxe\extrasettings.pas"/>
<Caret Line="1220" Column="17" TopLine="1211"/>
Expand All @@ -2628,6 +2625,45 @@
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
<Caret Line="3107" Column="15" TopLine="3101"/>
</Position2>
<Position3>
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
<Caret Line="4" Column="29"/>
</Position3>
<Position4>
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
<Caret Line="1415" Column="31" TopLine="1387"/>
</Position4>
<Position5>
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
<Caret Line="1542" Column="47" TopLine="1514"/>
</Position5>
<Position6>
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
<Caret Line="1412" Column="31" TopLine="1399"/>
</Position6>
<Position7>
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
<Caret Line="1402" Column="10" TopLine="1399"/>
</Position7>
<Position8>
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
</Position8>
<Position9>
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
<Caret Line="3132" Column="17" TopLine="3108"/>
</Position9>
<Position10>
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
<Caret Line="2914" Column="6" TopLine="2896"/>
</Position10>
<Position11>
<Filename Value="sources\fpcup.ini"/>
<Caret Line="127" Column="25" TopLine="127"/>
</Position11>
<Position12>
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
<Caret Line="3135" TopLine="3125"/>
</Position12>
</JumpHistory>
<RunParams>
<FormatVersion Value="2"/>
Expand Down
2 changes: 1 addition & 1 deletion public/gitrevision.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[master]test_release-2715(f586873)
[master]test_release-2717(b1c0e9d)
10 changes: 10 additions & 0 deletions sources/installermanager.pas
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,16 @@ procedure TFPCupManager.SaveSettings;
if (Length(OnlyModules)>0) then Write(TxtFile,' --only='+OnlyModules);
if (Length(SkipModules)>0) then Write(TxtFile,' --skip='+SkipModules);

if (CrossCompiling) then
begin
{$ifndef FPCONLY}
if ((CrossOS_Target in LCL_OS) AND (Pos(_LCL,OnlyModules)>0)) then
begin
if (Length(LCL_Platform)>0) then Write(TxtFile,' --lclplatform='+LCL_Platform);
end;
{$endif}
end;

if (FPCInstallDirectory<>FPCSourceDirectory) then Write(TxtFile,' --fpcsplit');
Write(TxtFile,' --noconfirm');
Write(TxtFile,' --autotools');
Expand Down
2 changes: 1 addition & 1 deletion sources/revision.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const
{%H-}DELUXEVERSION='2.2.0rp';
{%H-}DELUXEVERSION='2.2.0r';
{%H-}RevisionStr='468';
{%H-}versiondate='20230422';
Binary file modified up.res
Binary file not shown.

0 comments on commit f12f35e

Please sign in to comment.