diff --git a/build/windows-full-release.bat b/build/windows-full-release.bat deleted file mode 100644 index 9e0dd21a1..000000000 --- a/build/windows-full-release.bat +++ /dev/null @@ -1,169 +0,0 @@ -:: requirements -:: -:: you need to have the following: -:: * you need to have run windows-all.bat, and pass the same parameter to this batch -:: * dcc64 + the wind64 release dcus from a delphi install in c:\tools\dcc64\dcc64 -:: * ksign installed (https://www.ksoftware.net/code-signing-certificates), along with the signing certificate (which is not in the github repo) -:: * innosetup 6 installed -:: * gh installed (https://cli.github.com/) - -:: ---- initial set up ---------- -:: 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 - - -git pull - -if errorlevel 1 goto Quit - -set FSDIR=%CD% -setlocal -set "tmp=c:\temp" - -:: %1 is the version we're going to release - -IF %2.==. GOTO No2 -set "tmp=%2" - -:No2 - -:: check a version was provided -IF %1.==. GOTO NoVer -GOTO OK - -:NoVer -echo You need to provide the new version as a parameter to this batch file -pause -exit /b 1 - -:OK - - -@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 - -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 -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.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 - -:: ========================================================================================= -:: todo: sign the 4 binaries -:: echo ## sign the binaries ## -:: the password batch file is never in git, but has the format -:: @echo off -:: setlocal -:: set HI_PASSWORD="...." - -signtool sign /f install\cert\healthintersections.cer /d "FHIRServer" /fd SHA256 /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com exec\64\FHIRConsole.exe -signtool sign /f install\cert\healthintersections.cer /d "FHIRServer" /fd SHA256 /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com exec\64\FHIRServer.debug.exe -signtool sign /f install\cert\healthintersections.cer /d "FHIRServer" /fd SHA256 /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com exec\64\FHIRServer.exe -signtool sign /f install\cert\healthintersections.cer /d "FHIRServer" /fd SHA256 /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com exec\64\FHIRToolkit.exe - -:: ========================================================================================= -:: OK, now build the installers -echo ## Build Installs ## -utilities\codescan\codescan.exe -install install\install.iss -product FHIRServer -version %1 || goto :error -install\tools\iscc.exe install\install.iss -q -utilities\codescan\codescan.exe -install install\install-tk.iss -product FHIRToolkit -version %1 || goto :error -install\tools\iscc.exe install\install-tk.iss -q -utilities\codescan\codescan.exe -check install\build\fhirserver-win64-%1.exe -message "Creating the server install failed" || goto :error -utilities\codescan\codescan.exe -check install\build\fhirtoolkit-win64-%1.exe -message "Creating the toolkit install failed" || goto :error - -signtool sign /f install\cert\healthintersections.cer /fd SHA256 /d "FHIRServer" /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com install\build\fhirserver-win64-%1.exe -signtool sign /f install\cert\healthintersections.cer /fd SHA256 /d "FHIRServer" /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com install\build\fhirtoolkit-win64-%1.exe - -cd install -cd build -..\..\install\tools\7z a -r -tzip fhirserver-win64-%1.zip fhirserver-win64-%1.exe -cd .. -cd .. - -:: ========================================================================================= -:: now time to do the github release - -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 - -:: ========================================================================================= -:: echo Post note on Zulip -zulip-send --stream tooling/releases --subject "FHIR Tools" --message "New FHIRServer and Toolkit v"%1" released (see https://github.com/HealthIntersections/fhirserver/releases/v"%1")" --config-file .zuliprc - -:: ========================================================================================= -echo Build/Release Process Finished -pause -exit /b 0 - -:: ========================================================================================= -:error -echo Build failed! -pause -exit /b %errorlevel% - - -:Quit \ No newline at end of file diff --git a/install/install-tk.iss b/install/install-tk.iss index 84a507238..6acfa2b58 100644 --- 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.2.3 +AppVerName=FHIRToolkit v3.4.1 ; compilation control OutputDir=..\install\build -OutputBaseFilename=fhirtoolkit-win64-3.2.3 +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.2.3 +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.2.3.0 +VersionInfoVersion=3.4.1.0 ; dialog support LicenseFile=..\license diff --git a/install/install.iss b/install/install.iss index ca9a8a04d..5aaa09255 100644 --- 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.2.3 +AppVerName=FHIRServer v3.4.1 ; compilation control OutputDir=..\install\build -OutputBaseFilename=fhirserver-win64-3.2.3 +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.2.3 +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.2.3.0 +VersionInfoVersion=3.4.1.0 ; dialog support LicenseFile=..\license diff --git a/library/version.inc b/library/version.inc index d988c5588..e8912a2f9 100644 --- a/library/version.inc +++ b/library/version.inc @@ -1,3 +1,3 @@ - FHIR_CODE_FULL_VERSION = '3.2.3'; + FHIR_CODE_FULL_VERSION = '3.4.1'; FHIR_CODE_RELEASE_DATE = '2024-03-10'; - FHIR_CODE_RELEASE_DATETIME = '20240310104512.918Z'; + FHIR_CODE_RELEASE_DATETIME = '20240310111623.382Z'; diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi index 33df5826f..fddc8ab24 100644 --- a/server/fhirconsole.lpi +++ b/server/fhirconsole.lpi @@ -17,8 +17,8 @@ - - + + diff --git a/server/fhirserver.dproj b/server/fhirserver.dproj index dd405ed13..bacd1e6be 100644 --- a/server/fhirserver.dproj +++ b/server/fhirserver.dproj @@ -91,8 +91,8 @@ CompanyName=;FileVersion=2.1.3.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) true 3 - 2 - 3 + 4 + 1 false @@ -167,9 +167,9 @@ true false 3 - 3 + 1 none - 2 + 4 false diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi index 2ffccd880..e6fbc108f 100644 --- a/server/fhirserver.lpi +++ b/server/fhirserver.lpi @@ -18,8 +18,8 @@ - - + + diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi index d0b527dbe..351373b53 100644 --- a/toolkit2/fhirtoolkit.lpi +++ b/toolkit2/fhirtoolkit.lpi @@ -16,8 +16,8 @@ - - + +