more work on build infrastructure

HealthIntersections · Jan 12, 2024 · d7247f0 · d7247f0
1 parent d27c3f8
commit d7247f0
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 45 deletions.
diff --git a/build.bat b/build.bat
@@ -0,0 +1,11 @@
+
+git pull
+
+pause
+
+call build\windows-all.bat c:\temp
+
+exec\64\fhirserver.exe -tests -test-settings exec\64\fhir-tests.ini
+
+call build\windows-release %1 c:\temp
+
diff --git a/build/windows-fhirserver.bat b/build/windows-fhirserver.bat
@@ -80,13 +80,26 @@ echo ## compile server
 echo ## compile toolkit
 %tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64-release -q -q --build-all
 
-IF EXIST "C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\fhirserver\win64" (    
-  copy exec\64\*.exe "C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\fhirserver\win64"
-}
-
-IF EXIST exec\64\fhirserver.exe (
-    echo Sucess!
-) ELSE (
-    echo Failed (no server executable found)
-)
+:: =========================================================================================
+:: build the web file
+del exec\pack\fhirserver.web 
+utilities\codescan\codescan.exe -check !exec\pack\fhirserver.web -message "Deleting the web file failed" || goto :error
+cd server
+cd web
+..\..\install\tools\7z a -r -tzip ..\..\exec\pack\fhirserver.web *.*
+cd ..
+cd ..
+utilities\codescan\codescan.exe -check exec\pack\fhirserver.web -message "Creating the web file failed" || goto :error
+
+
+rem IF EXIST "C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\fhirserver\win64" (    
+copy exec\64\*.exe "C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\fhirserver\win64"
+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!
+rem 
+rem echo Failed (no server executable found)
+rem 
+
 chdir /d %FSDIR% 
diff --git a/build/windows-release.bat b/build/windows-release.bat
@@ -41,9 +41,6 @@ exit /b 1
 
 :OK
 
-call load-password.bat
-echo password=%HI_PASSWORD%
-
 
 :: write version and date to source code 
 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
@@ -82,21 +79,10 @@ echo All compile done
 :: setlocal
 :: set HI_PASSWORD="...."
 
-rem install\tools\signtool sign /f install\healthintersections.pfx /p %HI_PASSWORD% /d "FHIRServer" /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com exec\64\FHIRConsole.exe
-rem install\tools\signtool sign /f install\healthintersections.pfx /p %HI_PASSWORD% /d "FHIRServer" /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com exec\64\FHIRServer.debug.exe
-rem install\tools\signtool sign /f install\healthintersections.pfx /p %HI_PASSWORD% /d "FHIRServer" /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com exec\64\FHIRServer.exe
-rem install\tools\signtool sign /f install\healthintersections.pfx /p %HI_PASSWORD% /d "FHIRServer" /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com exec\64\FHIRToolkit.exe
-
-:: =========================================================================================
-:: build the web file
-del exec\pack\fhirserver.web 
-utilities\codescan\codescan.exe -check !exec\pack\fhirserver.web -message "Deleting the web file failed" || goto :error
-cd server
-cd web
-..\..\install\tools\7z a -r -tzip ..\..\exec\pack\fhirserver.web *.*
-cd ..
-cd ..
-utilities\codescan\codescan.exe -check exec\pack\fhirserver.web -message "Creating the web file failed" || goto :error
+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 
@@ -108,10 +94,9 @@ 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
 
-install\tools\signtool sign /f install\healthintersections.pfx /p %HI_PASSWORD% /d "FHIRServer" /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com install\build\fhirserver-win64-%1.exe
-install\tools\signtool sign /f install\healthintersections.pfx /p %HI_PASSWORD% /d "FHIRServer" /du "https://github.com/HealthIntersections/fhirserver" /t http://timestamp.sectigo.com install\build\fhirtoolkit-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\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
 
-set HI_PASSWORD=null
 :: =========================================================================================
 :: now time to do the github release
 

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.0.0
+AppVerName=FHIRToolkit v3.0.3
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirtoolkit-win64-3.0.0
+OutputBaseFilename=fhirtoolkit-win64-3.0.3
 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.0.0
+AppVersion=3.0.3
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
-VersionInfoVersion=3.0.0.0
+VersionInfoVersion=3.0.3.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.0.0
+AppVerName=FHIRServer v3.0.3
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirserver-win64-3.0.0
+OutputBaseFilename=fhirserver-win64-3.0.3
 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.0.0
+AppVersion=3.0.3
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
-VersionInfoVersion=3.0.0.0
+VersionInfoVersion=3.0.3.0
 
 ; dialog support
 LicenseFile=..\license
@@ -108,6 +108,7 @@ Source: "..\exec\pack\ucum.dat";                              DestDir: "{app}";
 Source: "..\exec\pack\lang.dat";                              DestDir: "{app}";       Flags: ignoreversion 
 Source: "..\exec\pack\tz.dat";                                DestDir: "{app}";       Flags: ignoreversion 
 Source: "..\exec\pack\fhir-lang.dat";                         DestDir: "{app}";       Flags: ignoreversion 
+Source: "..\exec\pack\*.properties";                          DestDir: "{app}";       Flags: ignoreversion 
 
 ; 4. Documentation
 Source: "..\license";                                         DestDir: "{app}\doco";  Flags: ignoreversion; DestName: "license.txt";

diff --git a/library/version.inc b/library/version.inc
@@ -1,3 +1,3 @@
- FHIR_CODE_FULL_VERSION = '3.0.3';
+ FHIR_CODE_FULL_VERSION = '3.0.4-SNAPSHOT';
  FHIR_CODE_RELEASE_DATE = '2024-01-12';
- FHIR_CODE_RELEASE_DATETIME = '20240112210839.222Z';
+ FHIR_CODE_RELEASE_DATETIME = '20240112212419.183Z';
diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi
@@ -17,7 +17,7 @@
     </General>
     <VersionInfo>
       <MajorVersionNr Value="3"/>
-      <RevisionNr Value="0"/>
+      <RevisionNr Value="3"/>
       <MinorVersionNr Value="0"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>

diff --git a/server/fhirserver.dproj b/server/fhirserver.dproj
@@ -92,7 +92,7 @@
     <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
     <VerInfo_MajorVer>3</VerInfo_MajorVer>
     <VerInfo_MinorVer>0</VerInfo_MinorVer>
-    <VerInfo_Release>0</VerInfo_Release>
+    <VerInfo_Release>3</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>3</VerInfo_Release>
     <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
     <VerInfo_MinorVer>0</VerInfo_MinorVer>
     <VerInfo_Debug>false</VerInfo_Debug>

diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi
@@ -18,7 +18,7 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
-      <RevisionNr Value="0"/>
+      <RevisionNr Value="3"/>
       <MinorVersionNr Value="0"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>

diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi
@@ -16,7 +16,7 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
-      <RevisionNr Value="0"/>
+      <RevisionNr Value="3"/>
       <MinorVersionNr Value="0"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>