Final tweaks before release.

LongDirtyAnimAlf · Jul 12, 2023 · 503f66e · 503f66e
1 parent 13d6942
commit 503f66e
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 51 deletions.
diff --git a/fpcupdeluxe.lps b/fpcupdeluxe.lps
@@ -5,7 +5,7 @@
     <Version Value="12"/>
     <ManyBuildModesSelection Value="win32,win64,linuxi386,linux64,linuxaarch64,linuxaarch64QT5,linuxaarch64QT5zip,linuxarm,linuxarmQT5,linuxarmQT5zip,linuxarmv6,linuxi386QT5,linuxx64QT5,linuxx64QT5zip,linuxppc64,freebsdi386,freebsdx64,solarisx64,dragonflyx64,netbsdx64,netbsdi386"/>
     <BuildModes Active="Default"/>
-    <Units Count="11">
+    <Units Count="14">
       <Unit0>
         <Filename Value="up.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -21,8 +21,9 @@
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
+        <TopLine Value="3530"/>
+        <CursorPos Y="3559"/>
         <UsageCount Value="192"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -33,7 +34,7 @@
         <ComponentName Value="Form2"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="5"/>
         <UsageCount Value="192"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -84,7 +85,8 @@
       <Unit9>
         <Filename Value="sources\revision.inc"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="3"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="6"/>
         <UsageCount Value="21"/>
         <Loaded Value="True"/>
       </Unit9>
@@ -96,8 +98,34 @@
         <ResourceBaseClass Value="Form"/>
         <UsageCount Value="21"/>
       </Unit10>
+      <Unit11>
+        <Filename Value="sources\installercore.pas"/>
+        <UnitName Value="installerCore"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="136"/>
+        <CursorPos X="47" Y="151"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit11>
+      <Unit12>
+        <Filename Value="sources\fpcuputil.pas"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="4296"/>
+        <CursorPos Y="4321"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit12>
+      <Unit13>
+        <Filename Value="C:\fpcupsystems\stable\fpcsrc\packages\rtl-objpas\src\inc\strutils.pp"/>
+        <UnitName Value="StrUtils"/>
+        <EditorIndex Value="4"/>
+        <TopLine Value="160"/>
+        <CursorPos X="10" Y="175"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit13>
     </Units>
-    <JumpHistory Count="12" HistoryIndex="11">
+    <JumpHistory Count="17" HistoryIndex="16">
       <Position1>
         <Filename Value="sources\updeluxe\extrasettings.pas"/>
         <Caret Line="581" Column="41" TopLine="571"/>
@@ -145,6 +173,25 @@
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
         <Caret Line="4004" Column="18" TopLine="3991"/>
       </Position12>
+      <Position13>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+      </Position13>
+      <Position14>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="3550" Column="117" TopLine="3528"/>
+      </Position14>
+      <Position15>
+        <Filename Value="sources\installercore.pas"/>
+        <Caret Line="151" Column="47" TopLine="136"/>
+      </Position15>
+      <Position16>
+        <Filename Value="sources\fpcuputil.pas"/>
+        <Caret Line="4416" Column="16" TopLine="4404"/>
+      </Position16>
+      <Position17>
+        <Filename Value="sources\fpcuputil.pas"/>
+        <Caret Line="4427" Column="38" TopLine="4404"/>
+      </Position17>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>

diff --git a/fpcupdeluxespecials.lps b/fpcupdeluxespecials.lps
@@ -9,18 +9,19 @@
         <Filename Value="up.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="fpcupdeluxe"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="52"/>
-        <CursorPos X="20" Y="70"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="196"/>
+        <CursorPos Y="227"/>
         <UsageCount Value="50"/>
+        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <IsVisibleTab Value="True"/>
         <UsageCount Value="50"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -985,7 +986,7 @@
         <UsageCount Value="10"/>
       </Unit129>
     </Units>
-    <JumpHistory Count="10" HistoryIndex="9">
+    <JumpHistory Count="12" HistoryIndex="11">
       <Position1>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
         <Caret Line="4219" Column="22" TopLine="4212"/>
@@ -1024,6 +1025,13 @@
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
         <Caret Line="360" Column="19" TopLine="359"/>
       </Position10>
+      <Position11>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+      </Position11>
+      <Position12>
+        <Filename Value="up.lpr"/>
+        <Caret Line="227" TopLine="196"/>
+      </Position12>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>

diff --git a/fpcupdeluxetrunk.lpi b/fpcupdeluxetrunk.lpi
@@ -37,7 +37,7 @@
         <Item1 Value="tform1.caption"/>
       </ExcludedIdentifiers>
     </i18n>
-    <BuildModes Count="12">
+    <BuildModes Count="11">
       <Item1 Name="default" Default="True"/>
       <Item2 Name="debug">
         <CompilerOptions>
@@ -256,38 +256,7 @@ if TargetOS=&apos;openbsd&apos; then
           </Linking>
         </CompilerOptions>
       </Item8>
-      <Item9 Name="linuxmuslx64">
-        <MacroValues Count="1">
-          <Macro2 Name="LCLWidgetType" Value="gtk2"/>
-        </MacroValues>
-        <CompilerOptions>
-          <Version Value="11"/>
-          <PathDelim Value="\"/>
-          <Target>
-            <Filename Value="deluxebin\fpcupdeluxe-$(TargetCPU)-$(TargetOS)-musl"/>
-          </Target>
-          <SearchPaths>
-            <IncludeFiles Value="$(ProjOutDir);sources;..\mORMot"/>
-            <OtherUnitFiles Value="sources;sources\updeluxe;sources\crossinstallers;synaser;dcpcrypt;dcpcrypt\Ciphers;dcpcrypt\Hashes;logger;..\mORMot\CrossPlatform;..\mORMot2\src\core;..\mORMot2\src\lib;..\mORMot2\src\net;..\mORMot;..\mORMot\SQLite3;downloader\src\forms;downloader\src\common"/>
-            <UnitOutputDirectory Value="buildlibs\$NameOnly($(ProjFile))\fpcupdeluxetrunk\$(TargetCPU)-$(TargetOS)-musl"/>
-          </SearchPaths>
-          <CodeGeneration>
-            <TargetCPU Value="x86_64"/>
-            <TargetOS Value="linux"/>
-            <Optimizations>
-              <OptimizationLevel Value="2"/>
-            </Optimizations>
-          </CodeGeneration>
-          <Linking>
-            <Debugging>
-              <GenerateDebugInfo Value="False"/>
-              <UseLineInfoUnit Value="False"/>
-              <StripSymbols Value="True"/>
-            </Debugging>
-          </Linking>
-        </CompilerOptions>
-      </Item9>
-      <Item10 Name="win64arm64">
+      <Item9 Name="win64arm64">
         <MacroValues Count="1">
           <Macro3 Name="LCLWidgetType" Value="win32"/>
         </MacroValues>
@@ -328,8 +297,8 @@ if TargetOS=&apos;openbsd&apos; then
             <CustomOptions Value="-dDisableRemoteLog"/>
           </Other>
         </CompilerOptions>
-      </Item10>
-      <Item11 Name="linuxx64QT6">
+      </Item9>
+      <Item10 Name="linuxx64QT6">
         <MacroValues Count="1">
           <Macro4 Name="LCLWidgetType" Value="qt6"/>
         </MacroValues>
@@ -362,8 +331,8 @@ if TargetOS=&apos;openbsd&apos; then
             <CustomOptions Value="-k&quot;-rpath=./&quot;"/>
           </Other>
         </CompilerOptions>
-      </Item11>
-      <Item12 Name="linuxx64QT6zip">
+      </Item10>
+      <Item11 Name="linuxx64QT6zip">
         <MacroValues Count="1">
           <Macro4 Name="LCLWidgetType" Value="qt6"/>
         </MacroValues>
@@ -396,10 +365,10 @@ if TargetOS=&apos;openbsd&apos; then
             <CustomOptions Value="-k&quot;-rpath=./&quot;"/>
           </Other>
         </CompilerOptions>
-      </Item12>
+      </Item11>
       <SharedMatrixOptions Count="4">
         <Item1 ID="322994045052" Modes="darwinarm64cocoa" Type="IDEMacro" MacroName="LCLWidgetType" Value="cocoa"/>
-        <Item2 ID="369111111759" Modes="linuxloongarch64,openbsdx64,openbsdi386,freebsdaarch64,freebsdx64,linuxmuslx64" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/>
+        <Item2 ID="369111111759" Modes="linuxloongarch64,openbsdx64,openbsdi386,freebsdaarch64,freebsdx64" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/>
         <Item3 ID="636969686655" Modes="win64arm64" Type="IDEMacro" MacroName="LCLWidgetType" Value="win32"/>
         <Item4 ID="457001635124" Modes="linuxx64QT6,linuxx64QT6zip" Type="IDEMacro" MacroName="LCLWidgetType" Value="qt6"/>
       </SharedMatrixOptions>

diff --git a/fpcupdeluxetrunk.lps b/fpcupdeluxetrunk.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <PathDelim Value="\"/>
     <Version Value="12"/>
-    <ManyBuildModesSelection Value="darwinarm64cocoa,linuxloongarch64,openbsdx64,openbsdi386,freebsdaarch64,freebsdx64,linuxmuslx64,linuxx64QT6,linuxx64QT6zip"/>
+    <ManyBuildModesSelection Value="darwinarm64cocoa,linuxloongarch64,openbsdx64,openbsdi386,freebsdaarch64,freebsdx64,linuxx64QT6,linuxx64QT6zip"/>
     <Units Count="16">
       <Unit0>
         <Filename Value="up.lpr"/>

diff --git a/public/gitrevision.txt b/public/gitrevision.txt
@@ -1 +1 @@
-[master]v2.2.0tp-2782(d2cb0ae)
+[master]v2.2.0tp-2783(13d6942)
diff --git a/up.res b/up.res