Skip to content

Commit 81d37b5

Browse files
LongDirtyAnimAlfLongDirtyAnimAlf
committed
Final tweaks for release targeting Lazarus 3.4
1 parent 29c1f4e commit 81d37b5

13 files changed

+127
-104
lines changed

‎fpclazup.lps

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<Unit0>
1010
<Filename Value="fpcup.lpr"/>
1111
<IsPartOfProject Value="True"/>
12+
<IsVisibleTab Value="True"/>
13+
<TopLine Value="103"/>
14+
<CursorPos X="24" Y="106"/>
1215
<UsageCount Value="69"/>
1316
<Loaded Value="True"/>
1417
</Unit0>

‎fpcup.lpr

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
m_any_to_linuxaarch64,
104104
m_any_to_linuxloongarch64,
105105
m_any_to_linuxriscv32,
106+
m_any_to_linuxriscv64,
106107
m_any_to_aros386,
107108
m_any_to_arosx64,
108109
m_any_to_arosarm,

‎fpcup.res

195 KB
Binary file not shown.

‎fpcupdeluxe.lpi

+11-13
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,21 @@
1717
<TextDesc Value="Installer for FPC and Lazarus."/>
1818
</XPManifest>
1919
<Icon Value="0"/>
20-
<Resources Count="16">
20+
<Resources Count="14">
2121
<Resource_0 FileName="sources\fpcup.ini" Type="RCDATA" ResourceName="FPCUP_INI"/>
2222
<Resource_1 FileName="sources\settings.ini" Type="RCDATA" ResourceName="SETTINGS_INI"/>
2323
<Resource_2 FileName="patches\patchfpc\glibc_compat_3_2_2.patch" Type="RCDATA" ResourceName="GLIBC_COMPAT_3_2_2"/>
2424
<Resource_3 FileName="chimp.png" Type="RCDATA" ResourceName="SPLASH_LOGO"/>
25-
<Resource_4 FileName="icons\gitlablabel.png" Type="RCDATA" ResourceName="GITLABLABEL"/>
26-
<Resource_5 FileName="icons\svnlabel.png" Type="RCDATA" ResourceName="SVNLABEL"/>
27-
<Resource_6 FileName="languages\fpcupdeluxe.en.po" Type="RCDATA" ResourceName="FPCUPDELUXE.EN"/>
28-
<Resource_7 FileName="languages\fpcupdeluxe.zh.po" Type="RCDATA" ResourceName="FPCUPDELUXE.ZH"/>
29-
<Resource_8 FileName="languages\fpcupdeluxe.ko.po" Type="RCDATA" ResourceName="FPCUPDELUXE.KO"/>
30-
<Resource_9 FileName="languages\fpcupdeluxe.de.po" Type="RCDATA" ResourceName="FPCUPDELUXE.DE"/>
31-
<Resource_10 FileName="languages\fpcupdeluxe.fr.po" Type="RCDATA" ResourceName="FPCUPDELUXE.FR"/>
32-
<Resource_11 FileName="languages\fpcupdeluxe.nl.po" Type="RCDATA" ResourceName="FPCUPDELUXE.NL"/>
33-
<Resource_12 FileName="languages\fpcupdeluxe.uk.po" Type="RCDATA" ResourceName="FPCUPDELUXE.UK"/>
34-
<Resource_13 FileName="languages\fpcupdeluxe.pt.po" Type="RCDATA" ResourceName="FPCUPDELUXE.PT"/>
35-
<Resource_14 FileName="patches\patchfpc\glibc.inc" Type="RCDATA" ResourceName="GLIBC"/>
36-
<Resource_15 FileName="patches\patchlazarus\glibc_debugger_trunk.patch" Type="RCDATA" ResourceName="GLIBC_DEBUGGER_TRUNK"/>
25+
<Resource_4 FileName="languages\fpcupdeluxe.en.po" Type="RCDATA" ResourceName="FPCUPDELUXE.EN"/>
26+
<Resource_5 FileName="languages\fpcupdeluxe.zh.po" Type="RCDATA" ResourceName="FPCUPDELUXE.ZH"/>
27+
<Resource_6 FileName="languages\fpcupdeluxe.ko.po" Type="RCDATA" ResourceName="FPCUPDELUXE.KO"/>
28+
<Resource_7 FileName="languages\fpcupdeluxe.de.po" Type="RCDATA" ResourceName="FPCUPDELUXE.DE"/>
29+
<Resource_8 FileName="languages\fpcupdeluxe.fr.po" Type="RCDATA" ResourceName="FPCUPDELUXE.FR"/>
30+
<Resource_9 FileName="languages\fpcupdeluxe.nl.po" Type="RCDATA" ResourceName="FPCUPDELUXE.NL"/>
31+
<Resource_10 FileName="languages\fpcupdeluxe.uk.po" Type="RCDATA" ResourceName="FPCUPDELUXE.UK"/>
32+
<Resource_11 FileName="languages\fpcupdeluxe.pt.po" Type="RCDATA" ResourceName="FPCUPDELUXE.PT"/>
33+
<Resource_12 FileName="patches\patchfpc\glibc.inc" Type="RCDATA" ResourceName="GLIBC"/>
34+
<Resource_13 FileName="patches\patchlazarus\glibc_debugger_trunk.patch" Type="RCDATA" ResourceName="GLIBC_DEBUGGER_TRUNK"/>
3735
</Resources>
3836
</General>
3937
<i18n>

‎fpcupdeluxe.lps

+76-54
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PathDelim Value="\"/>
55
<Version Value="12"/>
66
<ManyBuildModesSelection Value="win32,win64,linuxi386,linuxi386QT5,linuxi386QT5zip,linux64,linuxaarch64,linuxaarch64QT5,linuxaarch64QT5zip,linuxarm,linuxarmQT5,linuxarmQT5zip,linuxarmv6,linuxx64QT5,linuxx64QT5zip,linuxppc64,freebsdi386,freebsdx64,solarisx64,dragonflyx64,netbsdx64,netbsdi386,freebsdx64QT5,freebsdx64QT5zip"/>
7-
<BuildModes Active="Default"/>
7+
<BuildModes Active="win32"/>
88
<Units Count="432">
99
<Unit0>
1010
<Filename Value="up.lpr"/>
@@ -21,7 +21,7 @@
2121
<ComponentName Value="Form1"/>
2222
<HasResources Value="True"/>
2323
<ResourceBaseClass Value="Form"/>
24-
<CursorPos X="92" Y="28"/>
24+
<CursorPos X="6" Y="28"/>
2525
<UsageCount Value="200"/>
2626
<Loaded Value="True"/>
2727
<LoadedDesigner Value="True"/>
@@ -32,7 +32,6 @@
3232
<ComponentName Value="Form2"/>
3333
<HasResources Value="True"/>
3434
<ResourceBaseClass Value="Form"/>
35-
<IsVisibleTab Value="True"/>
3635
<EditorIndex Value="1"/>
3736
<CursorPos X="12" Y="8"/>
3837
<UsageCount Value="200"/>
@@ -76,7 +75,7 @@
7675
<Unit7>
7776
<Filename Value="sources\fpcup.ini"/>
7877
<IsPartOfProject Value="True"/>
79-
<EditorIndex Value="3"/>
78+
<EditorIndex Value="7"/>
8079
<CursorPos X="23" Y="22"/>
8180
<UsageCount Value="200"/>
8281
<Loaded Value="True"/>
@@ -85,7 +84,7 @@
8584
<Unit8>
8685
<Filename Value="sources\settings.ini"/>
8786
<IsPartOfProject Value="True"/>
88-
<EditorIndex Value="4"/>
87+
<EditorIndex Value="8"/>
8988
<TopLine Value="23"/>
9089
<CursorPos X="24" Y="36"/>
9190
<UsageCount Value="200"/>
@@ -95,7 +94,7 @@
9594
<Unit9>
9695
<Filename Value="sources\revision.inc"/>
9796
<IsPartOfProject Value="True"/>
98-
<EditorIndex Value="2"/>
97+
<EditorIndex Value="6"/>
9998
<CursorPos X="29" Y="4"/>
10099
<UsageCount Value="200"/>
101100
<Loaded Value="True"/>
@@ -114,16 +113,17 @@
114113
<EditorIndex Value="-1"/>
115114
<TopLine Value="3"/>
116115
<CursorPos Y="32"/>
117-
<UsageCount Value="171"/>
116+
<UsageCount Value="172"/>
118117
<DefaultSyntaxHighlighter Value="Text"/>
119118
</Unit11>
120119
<Unit12>
121120
<Filename Value="sources\installercore.pas"/>
122121
<UnitName Value="installerCore"/>
123-
<EditorIndex Value="-1"/>
124-
<TopLine Value="735"/>
125-
<CursorPos X="45" Y="751"/>
122+
<EditorIndex Value="5"/>
123+
<TopLine Value="28"/>
124+
<CursorPos X="18" Y="41"/>
126125
<UsageCount Value="61"/>
126+
<Loaded Value="True"/>
127127
</Unit12>
128128
<Unit13>
129129
<Filename Value="sources\fpcuputil.pas"/>
@@ -143,10 +143,11 @@
143143
<Unit15>
144144
<Filename Value="sources\installermanager.pas"/>
145145
<UnitName Value="installerManager"/>
146-
<EditorIndex Value="-1"/>
147-
<TopLine Value="1735"/>
148-
<CursorPos Y="1756"/>
146+
<EditorIndex Value="2"/>
147+
<TopLine Value="1912"/>
148+
<CursorPos X="46" Y="1966"/>
149149
<UsageCount Value="45"/>
150+
<Loaded Value="True"/>
150151
</Unit15>
151152
<Unit16>
152153
<Filename Value="sources\NumCPULib.pas"/>
@@ -158,10 +159,11 @@
158159
<Unit17>
159160
<Filename Value="sources\installerfpc.pas"/>
160161
<UnitName Value="installerFpc"/>
161-
<EditorIndex Value="-1"/>
162-
<TopLine Value="1202"/>
163-
<CursorPos Y="1231"/>
162+
<EditorIndex Value="3"/>
163+
<TopLine Value="2782"/>
164+
<CursorPos Y="2796"/>
164165
<UsageCount Value="67"/>
166+
<Loaded Value="True"/>
165167
</Unit17>
166168
<Unit18>
167169
<Filename Value="sources\crossinstallers\m_any_to_freebsd386.pas"/>
@@ -778,10 +780,12 @@
778780
<Unit104>
779781
<Filename Value="sources\installerhelp.pas"/>
780782
<UnitName Value="installerHelp"/>
781-
<EditorIndex Value="-1"/>
782-
<TopLine Value="342"/>
783-
<CursorPos Y="352"/>
783+
<IsVisibleTab Value="True"/>
784+
<EditorIndex Value="4"/>
785+
<TopLine Value="338"/>
786+
<CursorPos Y="361"/>
784787
<UsageCount Value="12"/>
788+
<Loaded Value="True"/>
785789
</Unit104>
786790
<Unit105>
787791
<Filename Value="sources\zipper.pp"/>
@@ -3262,107 +3266,125 @@
32623266
<Debugger>
32633267
<Backend Value="{A76EFAFB-3A42-421F-9672-C141897C94AA}"/>
32643268
</Debugger>
3265-
<JumpHistory Count="26" HistoryIndex="25">
3269+
<JumpHistory Count="30" HistoryIndex="29">
32663270
<Position1>
3267-
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
3271+
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3272+
<Caret Line="276" Column="65" TopLine="249"/>
32683273
</Position1>
32693274
<Position2>
32703275
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3276+
<Caret Line="355" Column="23" TopLine="327"/>
32713277
</Position2>
32723278
<Position3>
32733279
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3274-
<Caret Line="156" Column="25" TopLine="129"/>
3280+
<Caret Line="356" Column="38" TopLine="328"/>
32753281
</Position3>
32763282
<Position4>
32773283
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3278-
<Caret Line="157" Column="26" TopLine="130"/>
3284+
<Caret Line="546" Column="16" TopLine="525"/>
32793285
</Position4>
32803286
<Position5>
32813287
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3282-
<Caret Line="276" Column="65" TopLine="249"/>
3288+
<Caret Line="547" Column="11" TopLine="525"/>
32833289
</Position5>
32843290
<Position6>
32853291
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3286-
<Caret Line="355" Column="23" TopLine="327"/>
3292+
<Caret Line="550" Column="11" TopLine="525"/>
32873293
</Position6>
32883294
<Position7>
32893295
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3290-
<Caret Line="356" Column="38" TopLine="328"/>
3296+
<Caret Line="640" Column="35" TopLine="613"/>
32913297
</Position7>
32923298
<Position8>
32933299
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3294-
<Caret Line="546" Column="16" TopLine="525"/>
3300+
<Caret Line="1411" Column="28" TopLine="1383"/>
32953301
</Position8>
32963302
<Position9>
32973303
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3298-
<Caret Line="547" Column="11" TopLine="525"/>
3304+
<Caret Line="1413" Column="48" TopLine="1385"/>
32993305
</Position9>
33003306
<Position10>
33013307
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3302-
<Caret Line="550" Column="11" TopLine="525"/>
3308+
<Caret Line="1415" Column="29" TopLine="1387"/>
33033309
</Position10>
33043310
<Position11>
33053311
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3306-
<Caret Line="640" Column="35" TopLine="613"/>
3312+
<Caret Line="1417" Column="40" TopLine="1389"/>
33073313
</Position11>
33083314
<Position12>
3309-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3310-
<Caret Line="1411" Column="28" TopLine="1383"/>
3315+
<Filename Value="sources\fpcup.ini"/>
3316+
<Caret Line="2025" TopLine="1993"/>
33113317
</Position12>
33123318
<Position13>
3313-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3314-
<Caret Line="1413" Column="48" TopLine="1385"/>
3319+
<Filename Value="sources\fpcup.ini"/>
33153320
</Position13>
33163321
<Position14>
3317-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3318-
<Caret Line="1415" Column="29" TopLine="1387"/>
3322+
<Filename Value="sources\fpcup.ini"/>
3323+
<Caret Line="228" Column="56" TopLine="201"/>
33193324
</Position14>
33203325
<Position15>
3321-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3322-
<Caret Line="1417" Column="40" TopLine="1389"/>
3326+
<Filename Value="sources\fpcup.ini"/>
3327+
<Caret Line="528" TopLine="502"/>
33233328
</Position15>
33243329
<Position16>
33253330
<Filename Value="sources\fpcup.ini"/>
3326-
<Caret Line="2025" TopLine="1993"/>
3331+
<Caret Line="22" Column="23"/>
33273332
</Position16>
33283333
<Position17>
33293334
<Filename Value="sources\fpcup.ini"/>
3335+
<Caret Line="7" Column="31"/>
33303336
</Position17>
33313337
<Position18>
33323338
<Filename Value="sources\fpcup.ini"/>
3333-
<Caret Line="228" Column="56" TopLine="201"/>
33343339
</Position18>
33353340
<Position19>
33363341
<Filename Value="sources\fpcup.ini"/>
3337-
<Caret Line="528" TopLine="502"/>
3342+
<Caret Line="995" Column="37" TopLine="983"/>
33383343
</Position19>
33393344
<Position20>
3340-
<Filename Value="sources\fpcup.ini"/>
3341-
<Caret Line="22" Column="23"/>
3345+
<Filename Value="sources\revision.inc"/>
3346+
<Caret Line="4" Column="29"/>
33423347
</Position20>
33433348
<Position21>
3344-
<Filename Value="sources\fpcup.ini"/>
3345-
<Caret Line="7" Column="31"/>
3349+
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
3350+
<Caret Line="28" Column="92"/>
33463351
</Position21>
33473352
<Position22>
3348-
<Filename Value="sources\fpcup.ini"/>
3353+
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3354+
<Caret Line="148" Column="24" TopLine="140"/>
33493355
</Position22>
33503356
<Position23>
3351-
<Filename Value="sources\fpcup.ini"/>
3352-
<Caret Line="995" Column="37" TopLine="983"/>
3357+
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3358+
<Caret Line="8" Column="12"/>
33533359
</Position23>
33543360
<Position24>
3355-
<Filename Value="sources\revision.inc"/>
3356-
<Caret Line="4" Column="29"/>
3361+
<Filename Value="sources\installermanager.pas"/>
3362+
<Caret Line="1747" Column="32" TopLine="1735"/>
33573363
</Position24>
33583364
<Position25>
3359-
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
3360-
<Caret Line="28" Column="92"/>
3365+
<Filename Value="sources\installermanager.pas"/>
3366+
<Caret Line="1966" Column="46" TopLine="1912"/>
33613367
</Position25>
33623368
<Position26>
3363-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
3364-
<Caret Line="148" Column="24" TopLine="140"/>
3369+
<Filename Value="sources\installerfpc.pas"/>
3370+
<Caret Line="2796" Column="30" TopLine="2782"/>
33653371
</Position26>
3372+
<Position27>
3373+
<Filename Value="sources\installercore.pas"/>
3374+
<Caret Line="42" Column="22" TopLine="28"/>
3375+
</Position27>
3376+
<Position28>
3377+
<Filename Value="sources\installerfpc.pas"/>
3378+
<Caret Line="2796" TopLine="2782"/>
3379+
</Position28>
3380+
<Position29>
3381+
<Filename Value="sources\installercore.pas"/>
3382+
<Caret Line="41" Column="18" TopLine="28"/>
3383+
</Position29>
3384+
<Position30>
3385+
<Filename Value="sources\installerfpc.pas"/>
3386+
<Caret Line="2796" TopLine="2782"/>
3387+
</Position30>
33663388
</JumpHistory>
33673389
<RunParams>
33683390
<FormatVersion Value="2"/>

‎fpcupdeluxespecials.lpi

+8-10
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,18 @@
1616
<TextName Value="don.alfredo.fpcupdeluxe"/>
1717
<TextDesc Value="Installer for FPC and Lazarus."/>
1818
</XPManifest>
19-
<Resources Count="13">
19+
<Resources Count="11">
2020
<Resource_0 FileName="sources\fpcup.ini" Type="RCDATA" ResourceName="FPCUP_INI"/>
2121
<Resource_1 FileName="sources\settings.ini" Type="RCDATA" ResourceName="SETTINGS_INI"/>
2222
<Resource_2 FileName="patches\patchfpc\glibc_compat_3_2_2.patch" Type="RCDATA" ResourceName="GLIBC_COMPAT_3_2_2"/>
2323
<Resource_3 FileName="chimp.png" Type="RCDATA" ResourceName="SPLASH_LOGO"/>
24-
<Resource_4 FileName="icons\gitlablabel.png" Type="RCDATA" ResourceName="GITLABLABEL"/>
25-
<Resource_5 FileName="icons\svnlabel.png" Type="RCDATA" ResourceName="SVNLABEL"/>
26-
<Resource_6 FileName="languages\fpcupdeluxe.en.po" Type="RCDATA" ResourceName="FPCUPDELUXE.EN"/>
27-
<Resource_7 FileName="languages\fpcupdeluxe.zh.po" Type="RCDATA" ResourceName="FPCUPDELUXE.ZH"/>
28-
<Resource_8 FileName="languages\fpcupdeluxe.ko.po" Type="RCDATA" ResourceName="FPCUPDELUXE.KO"/>
29-
<Resource_9 FileName="languages\fpcupdeluxe.de.po" Type="RCDATA" ResourceName="FPCUPDELUXE.DE"/>
30-
<Resource_10 FileName="languages\fpcupdeluxe.fr.po" Type="RCDATA" ResourceName="FPCUPDELUXE.FR"/>
31-
<Resource_11 FileName="languages\fpcupdeluxe.nl.po" Type="RCDATA" ResourceName="FPCUPDELUXE.NL"/>
32-
<Resource_12 FileName="languages\fpcupdeluxe.uk.po" Type="RCDATA" ResourceName="FPCUPDELUXE.UK"/>
24+
<Resource_4 FileName="languages\fpcupdeluxe.en.po" Type="RCDATA" ResourceName="FPCUPDELUXE.EN"/>
25+
<Resource_5 FileName="languages\fpcupdeluxe.zh.po" Type="RCDATA" ResourceName="FPCUPDELUXE.ZH"/>
26+
<Resource_6 FileName="languages\fpcupdeluxe.ko.po" Type="RCDATA" ResourceName="FPCUPDELUXE.KO"/>
27+
<Resource_7 FileName="languages\fpcupdeluxe.de.po" Type="RCDATA" ResourceName="FPCUPDELUXE.DE"/>
28+
<Resource_8 FileName="languages\fpcupdeluxe.fr.po" Type="RCDATA" ResourceName="FPCUPDELUXE.FR"/>
29+
<Resource_9 FileName="languages\fpcupdeluxe.nl.po" Type="RCDATA" ResourceName="FPCUPDELUXE.NL"/>
30+
<Resource_10 FileName="languages\fpcupdeluxe.uk.po" Type="RCDATA" ResourceName="FPCUPDELUXE.UK"/>
3331
</Resources>
3432
</General>
3533
<i18n>

0 commit comments

Comments
 (0)