compile fixes

Author: grahamegrieve

library/fsl/fsl_cpu.pas

@@ -133,7 +133,7 @@ function TCPUUsageData.cpuUsage : Single;
   {$IFDEF WINDOWS}
     if (FHandle <> 0) then
     begin
-      FLock.Lock;
+      FLock.Lock('cpuUage');
       try
         result := FLastUsage;
         ThisTime := GetTickCount; //Get the time elapsed since last query

library/version.inc

@@ -1,3 +1,3 @@
- FHIR_CODE_FULL_VERSION = '3.5.0';
- FHIR_CODE_RELEASE_DATE = '2024-03-29';
- FHIR_CODE_RELEASE_DATETIME = '20240329082959.571Z';
+ FHIR_CODE_FULL_VERSION = '3.5.1';
+ FHIR_CODE_RELEASE_DATE = '2024-04-22';
+ FHIR_CODE_RELEASE_DATETIME = '20240422000004.033Z';

server/admin/install_log.pas

@@ -165,7 +165,7 @@ procedure TInstallProgressForm.addToLog(s: String);
 
 procedure TInstallerListener.log(const s: String);
 begin
-  FThread.Flock.Lock;
+  FThread.Flock.Lock('installer.listener');
   try
     FThread.FIncoming.add(s);
   finally
@@ -191,7 +191,7 @@ destructor TInstallerThread.Destroy;
 
 procedure TInstallerThread.getLog(ts: TStringList; var status : String);
 begin
-  FLock.lock;
+  FLock.lock('installer.log');
   try
     ts.Assign(FIncoming);
     FIncoming.Clear;

server/console_form.pas

@@ -676,7 +676,7 @@ procedure TPackageClientThread.Execute;
   try
     list := client.search('', '', '', false);
     list.SortE(compare);
-    MainConsoleForm.Flock.Lock;
+    MainConsoleForm.Flock.Lock('pck.exec');
     try
       MainConsoleForm.FThreadPackages := list;
     finally
@@ -2766,7 +2766,7 @@ procedure TMainConsoleForm.Timer1Timer(Sender: TObject);
   tsth := TStringList.Create;
   try
     d := 0;
-    Flock.Lock;
+    Flock.Lock('console.timer');
     try
       st := FStatus;
       ss := FServerStatus;
@@ -2812,7 +2812,7 @@ procedure TMainConsoleForm.Timer1Timer(Sender: TObject);
           sBar.Panels[0].Text := 'Connected';
           if not FTelnet.connected then
           begin
-            Flock.Lock;
+            Flock.Lock('consoler.timer2');
             try
               FStatus := csDiconnected;
             finally
@@ -2902,7 +2902,7 @@ procedure TMainConsoleForm.ToolButton3Click(Sender: TObject);
     FLines.clear;
     mConsole.Lines.Clear;
     FTelnet.Disconnect;
-    FLock.lock;
+    FLock.lock('console.button3');
     try
       FStatus := csDiconnected;
     finally
@@ -2937,7 +2937,7 @@ procedure TMainConsoleForm.processIncomingLine(line : String);
   reply : String;
 begin
   reply := '';
-  FLock.Lock;
+  FLock.Lock('console.line');
   try
     case FStatus of
       csDiconnected :
@@ -3228,7 +3228,7 @@ procedure TMainConsoleForm.DoIncoming(Sender: TIdTelnet; const Buffer: TIdBytes)
 
 procedure TMainConsoleForm.DoConnected(Sender: TObject);
 begin
-  FLock.Lock;
+  FLock.Lock('console.connected');
   try
     FStatus := csUsername;
   finally
@@ -3250,7 +3250,7 @@ procedure TMainConsoleForm.DoDisconnected(Sender: TObject);
   FConnected := false;
   btnClearCache.enabled := false;
   btnFetchThreads.enabled := false;
-  FLock.Lock;
+  FLock.Lock('console.disconnect');
   try
     FStatus := csDiconnected;
   finally

server/fhirconsole.lpi

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="12"/>
@@ -18,8 +19,7 @@
     <VersionInfo>
       <MajorVersionNr Value="3"/>
       <MinorVersionNr Value="5"/>
-      <RevisionNr Value="0"/>
-      <Attributes pvaDebug="False"/>
+      <RevisionNr Value="1"/>
     </VersionInfo>
     <BuildModes Count="8">
       <Item1 Name="default" Default="True"/>
@@ -126,7 +126,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
-            <Libraries Value="\usr\local\lib64\"/>
+            <Libraries Value="\usr\local\lib64"/>
             <OtherUnitFiles Value="admin;tx;..\library\fsl\tests;..\library\fhir\tests;..\library\fhir4\tests;..\library\fhir4b\tests;..\library\fhir5\tests;..\library\ftx\tests;..\library\fxver\tests;..\library\cda\tests;..\library\v2\tests;..\library\fdb\tests;modules;tests;..\library\fcomp\tests"/>
             <UnitOutputDirectory Value="lib\console\$(BuildMode)"/>
           </SearchPaths>
@@ -219,7 +219,10 @@
             </Debugging>
           </Linking>
           <Other>
-            <CustomOptions Value="-WM11.0&#10;-XR/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk&#10;-gw2&#10;-gw3"/>
+            <CustomOptions Value="-WM11.0
+-XR/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+-gw2
+-gw3"/>
           </Other>
         </CompilerOptions>
       </Item6>
@@ -276,7 +279,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
-            <Libraries Value="\usr\local\lib64\"/>
+            <Libraries Value="\usr\local\lib64"/>
             <OtherUnitFiles Value="admin;tx;..\library\fsl\tests;..\library\fhir\tests;..\library\fhir4\tests;..\library\fhir4b\tests;..\library\fhir5\tests;..\library\ftx\tests;..\library\fxver\tests;..\library\cda\tests;..\library\v2\tests;..\library\fdb\tests;modules;tests;..\library\fcomp\tests"/>
             <UnitOutputDirectory Value="lib\console\$(BuildMode)"/>
           </SearchPaths>
@@ -507,7 +510,7 @@
         <Name Value="ELibraryException"/>
       </Item3>
       <Item4>
-        <Name Value="&lt;Unknown Class&gt;"/>
+        <Name Value="&lt;Unknown Class>"/>
       </Item4>
       <Item5>
         <Name Value="0000000eEIdSocketError"/>

server/fhirserver.dproj

@@ -92,7 +92,7 @@
     <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
     <VerInfo_MajorVer>3</VerInfo_MajorVer>
     <VerInfo_MinorVer>5</VerInfo_MinorVer>
-    <VerInfo_Release>0</VerInfo_Release>
+    <VerInfo_Release>1</VerInfo_Release>
     <VerInfo_Debug>false</VerInfo_Debug>
   </PropertyGroup>
   <PropertyGroup Condition="&apos;$(Base_Win32)&apos;!=&apos;&apos;">
@@ -167,7 +167,7 @@
     <DCC_RangeChecking>true</DCC_RangeChecking>
     <DCC_DebugDCUs>false</DCC_DebugDCUs>
     <VerInfo_MajorVer>3</VerInfo_MajorVer>
-    <VerInfo_Release>0</VerInfo_Release>
+    <VerInfo_Release>1</VerInfo_Release>
     <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
     <VerInfo_MinorVer>5</VerInfo_MinorVer>
     <VerInfo_Debug>false</VerInfo_Debug>

server/fhirserver.lpi

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="12"/>
@@ -20,7 +19,7 @@
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
       <MinorVersionNr Value="5"/>
-      <RevisionNr Value="0"/>
+      <RevisionNr Value="1"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes Count="8">
@@ -1037,7 +1036,7 @@
         <Name Value="EPackageCrawlerException"/>
       </Item50>
       <Item51>
-        <Name Value="&lt;Unknown Class>"/>
+        <Name Value="&lt;Unknown Class&gt;"/>
       </Item51>
       <Item52>
         <Name Value="EDateFormatError"/>

toolkit2/fhirtoolkit.lpi

@@ -17,7 +17,7 @@
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
       <MinorVersionNr Value="5"/>
-      <RevisionNr Value="0"/>
+      <RevisionNr Value="1"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes>