Skip to content

Commit 776d4be

Browse files
author
Grahame Grieve
committed
Merge remote-tracking branch 'origin/master'
2 parents aa7c1f8 + 32f814f commit 776d4be

10 files changed

Lines changed: 33 additions & 30 deletions

File tree

build/windows-libraries.bat

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,29 @@ cd ..
6767

6868
Rem -- now build
6969

70+
echo build tzdb
7071
tools\lazarus\lazbuild.exe source\tzdb\dist\tzdb_fpc.lpk -q -q --build-all
72+
echo build extrahighlighters
7173
tools\lazarus\lazbuild.exe source\extrasyn\extrahighlighters.lpk -q -q --build-all
74+
echo build extrahighlighters_dsgn
7275
tools\lazarus\lazbuild.exe source\extrasyn\extrahighlighters_dsgn.lpk -q -q --build-all
76+
echo build zxing
7377
tools\lazarus\lazbuild.exe source\ZXing.Delphi\Lazarus\Package\zxing.lpk -q -q --build-all
78+
echo build idetester
7479
tools\lazarus\lazbuild.exe source\lazarus-ide-tester\package\idetester.lpk -q -q --build-all
80+
echo build idetester_dsgn
7581
tools\lazarus\lazbuild.exe source\lazarus-ide-tester\ide\idetester_dsgn.lpk -q -q --build-all
82+
echo build FrameViewer09
7683
tools\lazarus\lazbuild.exe source\HtmlViewer\package\FrameViewer09.lpk -q -q --build-all
84+
echo build markdownengine
7785
tools\lazarus\lazbuild.exe source\delphi-markdown\packages\markdownengine.lpk -q -q --build-all
86+
echo build markdowntests
7887
tools\lazarus\lazbuild.exe source\delphi-markdown\tests\markdowntests.lpk -q -q --build-all
88+
echo build Pdfium
7989
tools\lazarus\lazbuild.exe source\PdfiumLib\Package\Pdfium.lpk -q -q --build-all
90+
echo build pascalast
8091
tools\lazarus\lazbuild.exe source\DelphiAST\Package\pascalast.lpk -q -q --build-all
92+
echo all packages built
8193

8294

8395
chdir /d %FSDIR% &rem restore current directory

build/windows-release.bat

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,6 @@ exit /b 1
4242
@echo off
4343

4444
call build\windows-libraries.bat %tmp%
45-
rem call build\windows-fhirserver.bat %tmp%
46-
47-
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
48-
del library\version.inc
49-
utilities\codescan\codescan.exe -check !library\version.inc -message "setting up the version failed" || goto :error
50-
utilities\codescan\codescan.exe -version %1
51-
utilities\codescan\codescan.exe -check library\version.inc -message "saving the version failed" || goto :error
52-
utilities\codescan\codescan.exe -check release-notes.md -message "Please provide some release notes" || goto :error
5345

5446
utilities\codescan\codescan.exe -proj-version c:\work\fhirserver\server\fhirconsole.lpi -version %1 -debug false || goto :error
5547
utilities\codescan\codescan.exe -proj-version server\fhirserver.lpi -version %1 -debug true || goto :error

install/install-tk.iss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
; AppID can never be changed as subsequent installations require the same installation ID each time
44
AppID=FHIRToolkit
55
AppName=Health Intersections FHIR Toolkit
6-
AppVerName=FHIRToolkit v3.8.7
6+
AppVerName=FHIRToolkit v3.8.8
77

88
; compilation control
99
OutputDir=..\install\build
10-
OutputBaseFilename=fhirtoolkit-win64-3.8.7
10+
OutputBaseFilename=fhirtoolkit-win64-3.8.8
1111
Compression=lzma2/ultra64
1212

1313
; 64 bit
@@ -32,11 +32,11 @@ UninstallFilesDir={app}\uninstall
3232
; win2000+ add/remove programs support
3333
AppPublisher=Health Intersections P/L
3434
AppPublisherURL=http://www.healthintersections.com.au
35-
AppVersion=3.8.7
35+
AppVersion=3.8.8
3636
AppSupportURL=https://github.com/grahamegrieve/fhirserver
3737
AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
3838
AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
39-
VersionInfoVersion=3.8.7.0
39+
VersionInfoVersion=3.8.8.0
4040

4141
; dialog support
4242
LicenseFile=..\license

install/install.iss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
; AppID can never be changed as subsequent installations require the same installation ID each time
44
AppID=FHIRServer
55
AppName=Health Intersections FHIR Server
6-
AppVerName=FHIRServer v3.8.7
6+
AppVerName=FHIRServer v3.8.8
77

88
; compilation control
99
OutputDir=..\install\build
10-
OutputBaseFilename=fhirserver-win64-3.8.7
10+
OutputBaseFilename=fhirserver-win64-3.8.8
1111
Compression=lzma2/ultra64
1212

1313
; 64 bit
@@ -34,11 +34,11 @@ UninstallFilesDir={app}\uninstall
3434
; win2000+ add/remove programs support
3535
AppPublisher=Health Intersections P/L
3636
AppPublisherURL=http://www.healthintersections.com.au
37-
AppVersion=3.8.7
37+
AppVersion=3.8.8
3838
AppSupportURL=https://github.com/grahamegrieve/fhirserver
3939
AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
4040
AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
41-
VersionInfoVersion=3.8.7.0
41+
VersionInfoVersion=3.8.8.0
4242

4343
; dialog support
4444
LicenseFile=..\license

library/version.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FHIR_CODE_FULL_VERSION = '3.8.8-SNAPSHOT';
2-
FHIR_CODE_RELEASE_DATE = '2025-08-21';
3-
FHIR_CODE_RELEASE_DATETIME = '20250821044225.657Z';
1+
FHIR_CODE_FULL_VERSION = '3.8.9-SNAPSHOT';
2+
FHIR_CODE_RELEASE_DATE = '2025-09-05';
3+
FHIR_CODE_RELEASE_DATETIME = '20250905044312.170Z';

release-notes.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
## Change Notes for 3.8.8:
1+
## Change Notes for {ver}:
22

3-
* Add support for testing snomed
4-
* Revise handling of inactive codes
3+
*
54

65
## Conformance Notes:
76

8-
* tx.fhir.org passed 344 HL7 terminology service tests (mode 'tx.fhir.org', tests v1.7.7-SNAPSHOT, runner v6.6.4)
7+
*

server/fhirconsole.lpi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<VersionInfo>
1919
<MajorVersionNr Value="3"/>
2020
<MinorVersionNr Value="8"/>
21-
<RevisionNr Value="7"/>
21+
<RevisionNr Value="8"/>
2222
<Attributes pvaDebug="False"/>
2323
</VersionInfo>
2424
<BuildModes Count="8">

server/fhirserver.dproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
9393
<VerInfo_MajorVer>3</VerInfo_MajorVer>
9494
<VerInfo_MinorVer>8</VerInfo_MinorVer>
95-
<VerInfo_Release>7</VerInfo_Release>
95+
<VerInfo_Release>8</VerInfo_Release>
9696
<VerInfo_Debug>false</VerInfo_Debug>
9797
</PropertyGroup>
9898
<PropertyGroup Condition="&apos;$(Base_Win32)&apos;!=&apos;&apos;">
@@ -167,7 +167,7 @@
167167
<DCC_RangeChecking>true</DCC_RangeChecking>
168168
<DCC_DebugDCUs>false</DCC_DebugDCUs>
169169
<VerInfo_MajorVer>3</VerInfo_MajorVer>
170-
<VerInfo_Release>7</VerInfo_Release>
170+
<VerInfo_Release>8</VerInfo_Release>
171171
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
172172
<VerInfo_MinorVer>8</VerInfo_MinorVer>
173173
<VerInfo_Debug>false</VerInfo_Debug>

server/fhirserver.lpi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<CONFIG>
32
<ProjectOptions>
43
<Version Value="12"/>
@@ -20,7 +19,8 @@
2019
<UseVersionInfo Value="True"/>
2120
<MajorVersionNr Value="3"/>
2221
<MinorVersionNr Value="8"/>
23-
<RevisionNr Value="7"/>
22+
<RevisionNr Value="8"/>
23+
<Attributes pvaDebug="False"/>
2424
</VersionInfo>
2525
<BuildModes Count="8">
2626
<Item1 Name="default" Default="True"/>
@@ -1001,7 +1001,7 @@
10011001
<Name Value="EPackageCrawlerException"/>
10021002
</Item50>
10031003
<Item51>
1004-
<Name Value="&lt;Unknown Class>"/>
1004+
<Name Value="&lt;Unknown Class&gt;"/>
10051005
</Item51>
10061006
<Item52>
10071007
<Name Value="EDateFormatError"/>

toolkit2/fhirtoolkit.lpi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<UseVersionInfo Value="True"/>
1818
<MajorVersionNr Value="3"/>
1919
<MinorVersionNr Value="8"/>
20-
<RevisionNr Value="7"/>
20+
<RevisionNr Value="8"/>
2121
<Attributes pvaDebug="False"/>
2222
</VersionInfo>
2323
<BuildModes>

0 commit comments

Comments
 (0)