Skip to content

Commit 940a856

Browse files
LongDirtyAnimAlfLongDirtyAnimAlf
committed
Solve compiler switch bugger.
Allow identical duplicates for -k compiler switch.
1 parent fb4e902 commit 940a856

6 files changed

+133
-58
lines changed

‎fpcupdeluxe.lps

+121-52
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
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"/>
77
<BuildModes Active="Default"/>
8-
<Units Count="206">
8+
<Units Count="208">
99
<Unit0>
1010
<Filename Value="up.lpr"/>
1111
<IsPartOfProject Value="True"/>
1212
<UnitName Value="fpcupdeluxe"/>
13-
<TopLine Value="200"/>
14-
<CursorPos X="3" Y="213"/>
1513
<UsageCount Value="200"/>
1614
<Loaded Value="True"/>
1715
</Unit0>
@@ -22,6 +20,8 @@
2220
<HasResources Value="True"/>
2321
<ResourceBaseClass Value="Form"/>
2422
<EditorIndex Value="1"/>
23+
<TopLine Value="2233"/>
24+
<CursorPos X="35" Y="2247"/>
2525
<UsageCount Value="200"/>
2626
<Loaded Value="True"/>
2727
<LoadedDesigner Value="True"/>
@@ -41,7 +41,7 @@
4141
<Filename Value="sources\updeluxe\syneditpopup.pas"/>
4242
<IsPartOfProject Value="True"/>
4343
<UnitName Value="SynEditPopup"/>
44-
<UsageCount Value="136"/>
44+
<UsageCount Value="142"/>
4545
</Unit3>
4646
<Unit4>
4747
<Filename Value="sources\updeluxe\aboutfrm.pas"/>
@@ -53,46 +53,43 @@
5353
<EditorIndex Value="-1"/>
5454
<TopLine Value="38"/>
5555
<CursorPos X="38" Y="51"/>
56-
<UsageCount Value="136"/>
56+
<UsageCount Value="142"/>
5757
</Unit4>
5858
<Unit5>
5959
<Filename Value="sources\updeluxe\infounit.pas"/>
6060
<IsPartOfProject Value="True"/>
6161
<ComponentName Value="InfoForm"/>
6262
<HasResources Value="True"/>
6363
<ResourceBaseClass Value="Form"/>
64-
<UsageCount Value="136"/>
64+
<UsageCount Value="142"/>
6565
</Unit5>
6666
<Unit6>
6767
<Filename Value="sources\updeluxe\modulesettings.pas"/>
6868
<IsPartOfProject Value="True"/>
6969
<ComponentName Value="Form3"/>
7070
<HasResources Value="True"/>
7171
<ResourceBaseClass Value="Form"/>
72-
<UsageCount Value="136"/>
72+
<UsageCount Value="142"/>
7373
</Unit6>
7474
<Unit7>
7575
<Filename Value="sources\fpcup.ini"/>
7676
<IsPartOfProject Value="True"/>
77-
<IsVisibleTab Value="True"/>
7877
<EditorIndex Value="3"/>
79-
<TopLine Value="97"/>
80-
<UsageCount Value="136"/>
78+
<UsageCount Value="142"/>
8179
<Loaded Value="True"/>
8280
<DefaultSyntaxHighlighter Value="Ini"/>
8381
</Unit7>
8482
<Unit8>
8583
<Filename Value="sources\settings.ini"/>
8684
<IsPartOfProject Value="True"/>
87-
<UsageCount Value="136"/>
85+
<UsageCount Value="142"/>
8886
<DefaultSyntaxHighlighter Value="Ini"/>
8987
</Unit8>
9088
<Unit9>
9189
<Filename Value="sources\revision.inc"/>
9290
<IsPartOfProject Value="True"/>
9391
<EditorIndex Value="4"/>
94-
<CursorPos X="21" Y="3"/>
95-
<UsageCount Value="136"/>
92+
<UsageCount Value="142"/>
9693
<Loaded Value="True"/>
9794
</Unit9>
9895
<Unit10>
@@ -101,15 +98,15 @@
10198
<ComponentName Value="SubarchForm"/>
10299
<HasResources Value="True"/>
103100
<ResourceBaseClass Value="Form"/>
104-
<UsageCount Value="136"/>
101+
<UsageCount Value="142"/>
105102
</Unit10>
106103
<Unit11>
107104
<Filename Value="sources\text.txt"/>
108105
<IsPartOfProject Value="True"/>
109106
<EditorIndex Value="-1"/>
110107
<TopLine Value="3"/>
111108
<CursorPos Y="32"/>
112-
<UsageCount Value="94"/>
109+
<UsageCount Value="100"/>
113110
<DefaultSyntaxHighlighter Value="None"/>
114111
</Unit11>
115112
<Unit12>
@@ -139,9 +136,7 @@
139136
<Filename Value="sources\installermanager.pas"/>
140137
<UnitName Value="installerManager"/>
141138
<EditorIndex Value="-1"/>
142-
<TopLine Value="396"/>
143-
<CursorPos X="33" Y="410"/>
144-
<UsageCount Value="27"/>
139+
<UsageCount Value="30"/>
145140
</Unit15>
146141
<Unit16>
147142
<Filename Value="sources\NumCPULib.pas"/>
@@ -189,10 +184,12 @@
189184
</Unit21>
190185
<Unit22>
191186
<Filename Value="sources\m_crossinstaller.pas"/>
192-
<EditorIndex Value="-1"/>
193-
<TopLine Value="118"/>
194-
<CursorPos X="40" Y="140"/>
195-
<UsageCount Value="39"/>
187+
<IsVisibleTab Value="True"/>
188+
<EditorIndex Value="5"/>
189+
<TopLine Value="814"/>
190+
<CursorPos Y="804"/>
191+
<UsageCount Value="40"/>
192+
<Loaded Value="True"/>
196193
</Unit22>
197194
<Unit23>
198195
<Filename Value="sources\crossinstallers\m_any_to_linux_base.pas"/>
@@ -1534,67 +1531,139 @@
15341531
<CursorPos X="5" Y="1131"/>
15351532
<UsageCount Value="10"/>
15361533
</Unit205>
1534+
<Unit206>
1535+
<Filename Value="C:\microchip\h3\usb_apps_device\apps\hid_basic\firmware\src\packs\ATSAMD11D14AM_DFP\component\fuses.h"/>
1536+
<EditorIndex Value="-1"/>
1537+
<CursorPos X="32" Y="7"/>
1538+
<UsageCount Value="11"/>
1539+
<DefaultSyntaxHighlighter Value="C++"/>
1540+
</Unit206>
1541+
<Unit207>
1542+
<Filename Value="..\..\GitLocal\BatteryNew\Firmware\Controler\V002\src\packs\ATSAMD10D14AS_DFP\component\sysctrl.h"/>
1543+
<EditorIndex Value="-1"/>
1544+
<TopLine Value="588"/>
1545+
<CursorPos X="30" Y="601"/>
1546+
<UsageCount Value="10"/>
1547+
<DefaultSyntaxHighlighter Value="C++"/>
1548+
</Unit207>
15371549
</Units>
1538-
<JumpHistory Count="15" HistoryIndex="14">
1550+
<JumpHistory Count="29" HistoryIndex="28">
15391551
<Position1>
1540-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
1541-
<Caret Line="10" Column="28"/>
1552+
<Filename Value="sources\m_crossinstaller.pas"/>
1553+
<Caret Line="786" TopLine="765"/>
15421554
</Position1>
15431555
<Position2>
1544-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
1545-
<Caret Line="192" Column="22" TopLine="172"/>
1556+
<Filename Value="sources\m_crossinstaller.pas"/>
1557+
<Caret Line="788" TopLine="767"/>
15461558
</Position2>
15471559
<Position3>
1548-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
1549-
<Caret Line="193" Column="23" TopLine="173"/>
1560+
<Filename Value="sources\m_crossinstaller.pas"/>
1561+
<Caret Line="736" TopLine="722"/>
15501562
</Position3>
15511563
<Position4>
1552-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
1553-
<Caret Line="288" Column="68" TopLine="268"/>
1564+
<Filename Value="sources\m_crossinstaller.pas"/>
1565+
<Caret Line="776" Column="20" TopLine="759"/>
15541566
</Position4>
15551567
<Position5>
1556-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
1557-
<Caret Line="353" Column="39" TopLine="331"/>
1568+
<Filename Value="sources\m_crossinstaller.pas"/>
1569+
<Caret Line="788" TopLine="768"/>
15581570
</Position5>
15591571
<Position6>
1560-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
1561-
<Caret Line="391" Column="70" TopLine="369"/>
1572+
<Filename Value="sources\m_crossinstaller.pas"/>
1573+
<Caret Line="791" TopLine="774"/>
15621574
</Position6>
15631575
<Position7>
1564-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
1565-
<Caret Line="392" Column="65" TopLine="370"/>
1576+
<Filename Value="sources\m_crossinstaller.pas"/>
1577+
<Caret Line="788" TopLine="774"/>
15661578
</Position7>
15671579
<Position8>
1568-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
1569-
<Caret Line="599" TopLine="581"/>
1580+
<Filename Value="sources\m_crossinstaller.pas"/>
1581+
<Caret Line="791" TopLine="776"/>
15701582
</Position8>
15711583
<Position9>
1572-
<Filename Value="sources\fpcup.ini"/>
1573-
<Caret Line="105" Column="26" TopLine="102"/>
1584+
<Filename Value="sources\m_crossinstaller.pas"/>
1585+
<Caret Line="793" TopLine="776"/>
15741586
</Position9>
15751587
<Position10>
1576-
<Filename Value="sources\fpcup.ini"/>
1577-
<Caret Line="22" Column="23"/>
1588+
<Filename Value="sources\m_crossinstaller.pas"/>
1589+
<Caret Line="794" TopLine="776"/>
15781590
</Position10>
15791591
<Position11>
1580-
<Filename Value="sources\updeluxe\extrasettings.pas"/>
1581-
<Caret Line="599" TopLine="581"/>
1592+
<Filename Value="sources\m_crossinstaller.pas"/>
1593+
<Caret Line="796" Column="14" TopLine="774"/>
15821594
</Position11>
15831595
<Position12>
1584-
<Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
1585-
<Caret Line="2382" TopLine="2364"/>
1596+
<Filename Value="sources\m_crossinstaller.pas"/>
1597+
<Caret Line="791" TopLine="774"/>
15861598
</Position12>
15871599
<Position13>
1588-
<Filename Value="up.lpr"/>
1589-
<Caret Line="228" TopLine="203"/>
1600+
<Filename Value="sources\m_crossinstaller.pas"/>
1601+
<Caret Line="763" TopLine="750"/>
15901602
</Position13>
15911603
<Position14>
1592-
<Filename Value="up.lpr"/>
1604+
<Filename Value="sources\m_crossinstaller.pas"/>
1605+
<Caret Line="767" TopLine="750"/>
15931606
</Position14>
15941607
<Position15>
1595-
<Filename Value="up.lpr"/>
1596-
<Caret Line="213" Column="3" TopLine="200"/>
1608+
<Filename Value="sources\m_crossinstaller.pas"/>
1609+
<Caret Line="780" Column="45" TopLine="765"/>
15971610
</Position15>
1611+
<Position16>
1612+
<Filename Value="sources\m_crossinstaller.pas"/>
1613+
<Caret Line="788" TopLine="773"/>
1614+
</Position16>
1615+
<Position17>
1616+
<Filename Value="sources\m_crossinstaller.pas"/>
1617+
<Caret Line="763" TopLine="750"/>
1618+
</Position17>
1619+
<Position18>
1620+
<Filename Value="sources\m_crossinstaller.pas"/>
1621+
<Caret Line="767" TopLine="750"/>
1622+
</Position18>
1623+
<Position19>
1624+
<Filename Value="sources\m_crossinstaller.pas"/>
1625+
<Caret Line="768" TopLine="750"/>
1626+
</Position19>
1627+
<Position20>
1628+
<Filename Value="sources\m_crossinstaller.pas"/>
1629+
<Caret Line="769" TopLine="750"/>
1630+
</Position20>
1631+
<Position21>
1632+
<Filename Value="sources\m_crossinstaller.pas"/>
1633+
<Caret Line="770" TopLine="750"/>
1634+
</Position21>
1635+
<Position22>
1636+
<Filename Value="sources\m_crossinstaller.pas"/>
1637+
<Caret Line="772" TopLine="751"/>
1638+
</Position22>
1639+
<Position23>
1640+
<Filename Value="sources\m_crossinstaller.pas"/>
1641+
<Caret Line="780" TopLine="765"/>
1642+
</Position23>
1643+
<Position24>
1644+
<Filename Value="sources\m_crossinstaller.pas"/>
1645+
<Caret Line="763" TopLine="756"/>
1646+
</Position24>
1647+
<Position25>
1648+
<Filename Value="sources\m_crossinstaller.pas"/>
1649+
<Caret Line="774" Column="30" TopLine="756"/>
1650+
</Position25>
1651+
<Position26>
1652+
<Filename Value="sources\m_crossinstaller.pas"/>
1653+
<Caret Line="804" Column="24" TopLine="826"/>
1654+
</Position26>
1655+
<Position27>
1656+
<Filename Value="sources\m_crossinstaller.pas"/>
1657+
<Caret Line="836" Column="49" TopLine="818"/>
1658+
</Position27>
1659+
<Position28>
1660+
<Filename Value="sources\revision.inc"/>
1661+
<Caret Line="2" Column="13"/>
1662+
</Position28>
1663+
<Position29>
1664+
<Filename Value="sources\m_crossinstaller.pas"/>
1665+
<Caret Line="761" TopLine="757"/>
1666+
</Position29>
15981667
</JumpHistory>
15991668
<RunParams>
16001669
<FormatVersion Value="2"/>

‎fpcupdeluxespecials.lps

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
<ProjectSession>
44
<PathDelim Value="\"/>
55
<Version Value="12"/>
6-
<ManyBuildModesSelection Value="linux64musl,solarisx64oi,darwin32carbon,darwin32cocoa,darwin64cocoa,darwin64cocoalegacy,darwin64QT5,openbsdx64,openbsd32,haiku32QT5,haiku64QT5,darwinppccarbon,darwinppccocoa,darwinppc64cocoa"/>
6+
<ManyBuildModesSelection Value="linux64musl,solarisx64oi,darwin32carbon,darwin32cocoa,darwin64cocoa,darwin64cocoalegacy,darwin64QT5,openbsdx64,openbsd32,haiku32QT5,haiku64QT5,darwinppccarbon,darwinppccocoa,darwinppc64cocoa,darwinarm64cocoa"/>
77
<Units Count="130">
88
<Unit0>
99
<Filename Value="up.lpr"/>
1010
<IsPartOfProject Value="True"/>
1111
<UnitName Value="fpcupdeluxe"/>
12-
<IsVisibleTab Value="True"/>
1312
<EditorIndex Value="1"/>
1413
<TopLine Value="196"/>
1514
<CursorPos Y="227"/>
@@ -71,7 +70,9 @@
7170
<Unit7>
7271
<Filename Value="sources\fpcup.ini"/>
7372
<IsPartOfProject Value="True"/>
73+
<EditorIndex Value="2"/>
7474
<UsageCount Value="50"/>
75+
<Loaded Value="True"/>
7576
<DefaultSyntaxHighlighter Value="Ini"/>
7677
</Unit7>
7778
<Unit8>
@@ -83,7 +84,11 @@
8384
<Unit9>
8485
<Filename Value="sources\revision.inc"/>
8586
<IsPartOfProject Value="True"/>
87+
<IsVisibleTab Value="True"/>
88+
<EditorIndex Value="3"/>
89+
<CursorPos X="28" Y="2"/>
8690
<UsageCount Value="50"/>
91+
<Loaded Value="True"/>
8792
</Unit9>
8893
<Unit10>
8994
<Filename Value="sources\processutils.pas"/>

‎public/gitrevision.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[master]v2.4.0bp-2850(2ed3a76)
1+
[master]v2.4.0b-2852(1b41f28)

‎sources/m_crossinstaller.pas

+2-1
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ implementation
316316
'-FN',
317317
'-Fo',
318318
'-d',
319+
'-k',
319320
'-u',
320321
'-I',
321-
'-k',
322322
'-O'
323323
);
324324

@@ -771,6 +771,7 @@ procedure TCrossInstaller.AddFPCCFGSnippet(const aSnip: string; const AddToCross
771771
CheckValidOption:=(Pos(compilerswitch,aSnippd)=1);
772772
if CheckValidOption then
773773
begin
774+
if compilerswitch='-k' then break;
774775
// Check for literal duplicate
775776
CheckValidOption:=(Pos(aSnippd,FFPCCFGSnippet)=0);
776777
break;

‎sources/revision.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
const
2-
{%H-}DELUXEVERSION='2.4.0cp';
2+
{%H-}DELUXEVERSION='2.4.0c';
33
{%H-}RevisionStr='489';
4-
{%H-}VersionDate='20231224';
4+
{%H-}VersionDate='20231225';

‎up.res

-620 KB
Binary file not shown.

0 commit comments

Comments
 (0)