Merge branch 'master' of https://github.com/HealthIntersections/fhirs…

…erver
HealthIntersections · Mar 11, 2024 · 6d20976 · 6d20976
2 parents 142fd20 + 26172a4
commit 6d20976
Show file tree

Hide file tree

Showing 25 changed files with 1,647 additions and 1,682 deletions.
diff --git a/build/windows-all.bat b/build/windows-all.bat
@@ -5,7 +5,7 @@ REM the folder must exist
 
 set FSDIR=%CD%
 setlocal
-set "tmp=r:\fsbuild"
+set "tmp=c:\temp"
 
 IF %1.==. GOTO No1
 set "tmp=%1"

diff --git a/build/windows-fhirserver.bat b/build/windows-fhirserver.bat
@@ -5,7 +5,7 @@ REM the folder must exist
 
 set FSDIR=%CD%
 setlocal
-set "tmp=r:\fsbuild"
+set "tmp=c:\temp"
 
 md exec\64
 copy exec\pack\*.cfg exec\64\
@@ -19,49 +19,23 @@ set "tmp=%1"
 
 :No1
 
-echo ## compile packages/fhir_indy.lpk
-%tmp%\tools\lazarus\lazbuild.exe packages/fhir_indy.lpk -q -q --build-all
+del *.ppu /s /q
+del *.o /s /q
 
-echo ## compile packages/fhir_fsl.lpk
+%tmp%\tools\lazarus\lazbuild.exe packages/fhir_indy.lpk -q -q --build-all
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir_fsl.lpk -q -q --build-all
-
-echo ## compile packages/fcomp.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fcomp.lpk -q -q --build-all
-
-echo ## compile packages/fhir.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir.lpk -q -q --build-all
-
-echo ## compile packages/fhir2.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir2.lpk -q -q --build-all
-
-echo ## compile packages/fhir3.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir3.lpk -q -q --build-all
-
-echo ## compile packages/fhir4.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir4.lpk -q -q --build-all
-
-echo ## compile packages/fhir4b.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir4b.lpk -q -q --build-all
-
-echo ## compile packages/fhir5.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir5.lpk -q -q --build-all
-
-echo ## compile packages/fhir_xver.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir_xver.lpk -q -q --build-all
-
-echo ## compile packages/fhir_fui.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir_fui.lpk -q -q --build-all
-
-echo ## compile code tools
 %tmp%\tools\lazarus\lazbuild.exe utilities/codescan/codescan.lpi --build-mode=win64 -q -q --build-all
-
-echo ## compile console
 %tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64 -q -q --build-all
-
-echo ## compile server
 %tmp%\tools\lazarus\lazbuild.exe server/fhirserver.lpr --build-mode=win64 -q -q --build-all
-
-echo ## compile toolkit
 %tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64 -q -q --build-all
 
 copy exec\64\fhirserver.exe exec\64\FHIRServer.debug.exe
@@ -71,13 +45,11 @@ del exec\64\fhirconsole.exe
 copy exec\64\fhirtoolkit.exe exec\64\FHIRToolkit.debug.exe
 del exec\64\fhirtoolkit.exe 
 
-echo ## compile console
-%tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64-release -q -q --build-all
+del *.ppu /s /q
+del *.o /s /q
 
-echo ## compile server
+%tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64-release -q -q --build-all
 %tmp%\tools\lazarus\lazbuild.exe server/fhirserver.lpr --build-mode=win64-release -q -q --build-all
-
-echo ## compile toolkit
 %tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64-release -q -q --build-all
 
 :: =========================================================================================
@@ -97,7 +69,7 @@ copy exec\64\*.exe "C:\Users\graha\Health Intersections Dropbox\Health Intersect
 copy exec\pack\fhirserver.web "C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\fhirserver\win64"
 rem }
 
-IF EXIST exec\64\fhirserver.exe echo Sucess!
+IF EXIST exec\64\fhirserver.exe echo Success!
 rem 
 rem echo Failed (no server executable found)
 rem 

diff --git a/build/windows-full-release.bat b/build/windows-full-release.bat
diff --git a/build/windows-libraries.bat b/build/windows-libraries.bat
@@ -5,7 +5,7 @@ REM the folder must exist
 
 set FSDIR=%CD%
 setlocal
-set "tmp=r:\fsbuild"
+set "tmp=c:\temp"
 
 IF %1.==. GOTO No1
 set "tmp=%1"

diff --git a/build/windows-release.bat b/build/windows-release.bat
@@ -11,11 +11,14 @@
 :: user can pass in a parameter if they want the temporary scratch area to be somewhere else than r:\fsbuild (which is a RAM drive)
 :: the folder must exist 
 
-:: =========================================================================================
-:: parameters
+
+git pull
+
+if errorlevel 1 goto Quit
+
 set FSDIR=%CD%
 setlocal
-set "tmp=r:\fsbuild"
+set "tmp=c:\temp"
 
 :: %1 is the version we're going to release
 
@@ -24,12 +27,6 @@ set "tmp=%2"
 
 :No2
 
-@echo off
-
-:: =========================================================================================
-:: checks
-echo ## getting ready ##
-
 :: check a version was provided
 IF %1.==. GOTO NoVer
 GOTO OK
@@ -42,34 +39,71 @@ exit /b 1
 :OK
 
 
-:: write version and date to source code 
+@echo off
+
+call build\windows-libraries.bat %tmp%
+rem call build\windows-fhirserver.bat %tmp%
+
+pause
+
+
+pause
+
 utilities\codescan\codescan.exe -check library\version.inc -message "Not run from the right directory - run in the root directory of the repo" || goto :error
 del library\version.inc
 utilities\codescan\codescan.exe -check !library\version.inc -message "setting up the version failed" || goto :error
 utilities\codescan\codescan.exe -version %1
 utilities\codescan\codescan.exe -check library\version.inc -message "saving the version failed" || goto :error
-
 utilities\codescan\codescan.exe -check release-notes.md -message "Please provide some release notes" || goto :error
 
-del exec\64\*.exe /q /s 1>nul
-del install\build\*.exe 1>nul
-del release-notes-old.md 1>nul
-
-:: ok. we're good to go...
+pause
 
 utilities\codescan\codescan.exe -proj-version c:\work\fhirserver\server\fhirconsole.lpi -version %1 -debug false || goto :error
 utilities\codescan\codescan.exe -proj-version server\fhirserver.lpi -version %1 -debug true || goto :error
 utilities\codescan\codescan.exe -proj-version server\fhirserver.lpi -version %1 -debug false || goto :error
 utilities\codescan\codescan.exe -proj-version toolkit2\fhirtoolkit.lpi -version %1 -debug false || goto :error
 
-call build\windows-fhirserver.bat %2
+pause
+
+REM OK, do the real builds
+del exec\64\*.exe /q /s 1>nul
+del install\build\*.exe 1>nul
+del release-notes-old.md 1>nul
+del *.ppu /s /q
+del *.o /s /q
+
+
+%tmp%\tools\lazarus\lazbuild.exe utilities/codescan/codescan.lpi --build-mode=win64 -q -q --build-all
+%tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64 -q -q --build-all
+%tmp%\tools\lazarus\lazbuild.exe server/fhirserver.lpr --build-mode=win64 -q -q --build-all
+%tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64 -q -q --build-all
+
+copy exec\64\fhirserver.exe exec\64\FHIRServer.debug.exe
+del exec\64\fhirserver.exe 
+copy exec\64\fhirconsole.exe exec\64\FHIRConsole.debug.exe
+del exec\64\fhirconsole.exe 
+copy exec\64\fhirtoolkit.exe exec\64\FHIRToolkit.debug.exe
+del exec\64\fhirtoolkit.exe 
+
+del *.ppu /s /q
+del *.o /s /q
+
+%tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64-release -q -q --build-all
+%tmp%\tools\lazarus\lazbuild.exe server/fhirserver.lpr --build-mode=win64-release -q -q --build-all
+%tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64-release -q -q --build-all
+
+pause
 
 utilities\codescan\codescan.exe -check exec\64\fhirconsole.exe -message "Building the console failed" || goto :error
-utilities\codescan\codescan.exe -check exec\64\fhirserver.exe -message "Building the Debug server failed" || goto :error
+utilities\codescan\codescan.exe -check exec\64\fhirserver.debug.exe -message "Building the Debug server failed" || goto :error
 utilities\codescan\codescan.exe -check exec\64\fhirserver.exe -message "Building the server failed" || goto :error
 utilities\codescan\codescan.exe -check exec\64\fhirtoolkit.exe -message "Building the toolkit failed" || goto :error
 
-echo All compile done
+pause
+
+exec\64\fhirserver.debug.exe -tests -test-settings exec\64\fhir-tests.ini -mode brief
+
+if errorlevel 1 goto Quit
 
 :: =========================================================================================
 :: todo: sign the 4 binaries
@@ -109,7 +143,9 @@ cd ..
 echo ## GitHub Release ##
 git commit -a -m "Release Version %1"
 git push 
+pause
 install\tools\gh release create v%1 "install\build\fhirserver-win64-%1.exe#Windows Server Installer" "install\build\fhirserver-win64-%1.zip#Windows Server Installer Zip" "install\build\fhirtoolkit-win64-%1.exe#Windows Toolkit Installer" -F release-notes.md
+pause
 rename release-notes.md release-notes-old.md
 
 utilities\codescan\codescan.exe -next-version %1
@@ -130,4 +166,4 @@ pause
 exit /b %errorlevel%
 
 
-
+:Quit
diff --git a/build/windows-toolchain.bat b/build/windows-toolchain.bat
@@ -5,7 +5,7 @@ REM the folder must exist
 
 set FSDIR=%CD%
 setlocal
-set "tmp=r:\fsbuild"
+set "tmp=c:\temp"
 
 IF %1.==. GOTO No1
 set "tmp=%1"

diff --git a/build/windows-update.bat b/build/windows-update.bat
@@ -5,7 +5,7 @@ REM the folder must exist
 
 set FSDIR=%CD%
 setlocal
-set "tmp=r:\fsbuild"
+set "tmp=c:\temp"
 
 IF %1.==. GOTO No1
 set "tmp=%1"

diff --git a/install/install-tk.iss b/install/install-tk.iss
@@ -3,11 +3,11 @@
 ; AppID can never be changed as subsequent installations require the same installation ID each time
 AppID=FHIRToolkit
 AppName=Health Intersections FHIR Toolkit
-AppVerName=FHIRToolkit v3.1.12
+AppVerName=FHIRToolkit v3.4.1
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirtoolkit-win64-3.1.12
+OutputBaseFilename=fhirtoolkit-win64-3.4.1
 Compression=lzma2/ultra64
 
 ; 64 bit
@@ -32,11 +32,11 @@ UninstallFilesDir={app}\uninstall
 ; win2000+ add/remove programs support
 AppPublisher=Health Intersections P/L
 AppPublisherURL=http://www.healthintersections.com.au
-AppVersion=3.1.12
+AppVersion=3.4.1
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
-VersionInfoVersion=3.1.12.0
+VersionInfoVersion=3.4.1.0
 
 ; dialog support
 LicenseFile=..\license

diff --git a/install/install.iss b/install/install.iss
@@ -3,11 +3,11 @@
 ; AppID can never be changed as subsequent installations require the same installation ID each time
 AppID=FHIRServer
 AppName=Health Intersections FHIR Server
-AppVerName=FHIRServer v3.1.12
+AppVerName=FHIRServer v3.4.1
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirserver-win64-3.1.12
+OutputBaseFilename=fhirserver-win64-3.4.1
 Compression=lzma2/ultra64
 
 ; 64 bit
@@ -34,11 +34,11 @@ UninstallFilesDir={app}\uninstall
 ; win2000+ add/remove programs support
 AppPublisher=Health Intersections P/L
 AppPublisherURL=http://www.healthintersections.com.au
-AppVersion=3.1.12
+AppVersion=3.4.1
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
-VersionInfoVersion=3.1.12.0
+VersionInfoVersion=3.4.1.0
 
 ; dialog support
 LicenseFile=..\license

diff --git a/library/fhir2/fhir2_profiles.pas b/library/fhir2/fhir2_profiles.pas
@@ -136,7 +136,7 @@ TBaseWorkerContextR2 = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);

diff --git a/library/fhir3/fhir3_profiles.pas b/library/fhir3/fhir3_profiles.pas
@@ -136,7 +136,7 @@ TBaseWorkerContextR3 = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);

diff --git a/library/fhir4/fhir4_profiles.pas b/library/fhir4/fhir4_profiles.pas
@@ -139,7 +139,7 @@ TBaseWorkerContextR4 = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);

diff --git a/library/fhir4b/fhir4b_profiles.pas b/library/fhir4b/fhir4b_profiles.pas
@@ -139,7 +139,7 @@ TBaseWorkerContextR4B = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);

diff --git a/library/fhir5/fhir5_profiles.pas b/library/fhir5/fhir5_profiles.pas
@@ -138,7 +138,7 @@ TBaseWorkerContextR5 = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);