diff --git a/build/windows-fhirserver.bat b/build/windows-fhirserver.bat index af2079ebf..22c89010e 100644 --- a/build/windows-fhirserver.bat +++ b/build/windows-fhirserver.bat @@ -38,19 +38,6 @@ del *.o /s /q %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 :: ========================================================================================= :: build the web file diff --git a/build/windows-release.bat b/build/windows-release.bat index 9e0dd21a1..5b7bd23b5 100644 --- a/build/windows-release.bat +++ b/build/windows-release.bat @@ -44,11 +44,6 @@ exit /b 1 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 @@ -56,16 +51,11 @@ 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 -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 -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 @@ -92,15 +82,11 @@ del *.o /s /q %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.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 -pause - exec\64\fhirserver.debug.exe -tests -test-settings exec\64\fhir-tests.ini -mode brief if errorlevel 1 goto Quit @@ -143,9 +129,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 diff --git a/build/windows-update.bat b/build/windows-update.bat index 088620aec..af6023eb6 100644 --- a/build/windows-update.bat +++ b/build/windows-update.bat @@ -13,7 +13,5 @@ set "tmp=%1" :No1 call build\windows-libraries.bat %tmp% -pause call build\windows-fhirserver.bat %tmp% -pause diff --git a/library/version.inc b/library/version.inc index a48c02fec..296cdf129 100644 --- a/library/version.inc +++ b/library/version.inc @@ -1,3 +1,3 @@ FHIR_CODE_FULL_VERSION = '3.4.2'; - FHIR_CODE_RELEASE_DATE = '2024-03-13'; - FHIR_CODE_RELEASE_DATETIME = '20240313112143.208Z'; + FHIR_CODE_RELEASE_DATE = '2024-03-18'; + FHIR_CODE_RELEASE_DATETIME = '20240318122018.112Z'; diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi index 3f1e48a43..d7db91eb0 100644 --- a/server/fhirserver.lpi +++ b/server/fhirserver.lpi @@ -1,4 +1,3 @@ - @@ -20,7 +19,8 @@ - + + @@ -1032,7 +1032,7 @@ - +