[java-idp-jetty-base] 02/02: GEN-330 Build Windows installers in our standard flow

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch dev/IDP-2147
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=f6c4b54256dbe94c1df42b808204f8f5e798e6b5

commit f6c4b54256dbe94c1df42b808204f8f5e798e6b5
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Nov 7 14:15:17 2023 +0000

    GEN-330 Build Windows installers in our standard flow
    
    https://shibboleth.atlassian.net/browse/GEN-330
    
    Set the msi version directly from the jetty version
---
 src/main/wix/Jetty-Main.wxs | 2 +-
 src/main/wix/wix.vcxproj    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/wix/Jetty-Main.wxs b/src/main/wix/Jetty-Main.wxs
index 3be023b..5d37a32 100644
--- a/src/main/wix/Jetty-Main.wxs
+++ b/src/main/wix/Jetty-Main.wxs
@@ -13,7 +13,7 @@
 <?define UpgradeUUID="FB2B7404-37B2-4CE5-8E2E-EEB53F9FF472"?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="Jetty Installer for the Shibboleth IdP V5" Language="1033" Version="11.0.13.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)" InstallerVersion="310"><SummaryInformation Description="Jetty Installation for Shibboleth IdP V5" Manufacturer="The Shibboleth Consortium" />
+    <Package Name="Jetty Installer for the Shibboleth IdP V5" Language="1033" Version="$(var.jettyVersion).0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)" InstallerVersion="310"><SummaryInformation Description="Jetty Installation for Shibboleth IdP V5" Manufacturer="The Shibboleth Consortium" />
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />
         <MediaTemplate EmbedCab="yes" />
diff --git a/src/main/wix/wix.vcxproj b/src/main/wix/wix.vcxproj
index 5c9c681..e24ede5 100644
--- a/src/main/wix/wix.vcxproj
+++ b/src/main/wix/wix.vcxproj
@@ -13,7 +13,7 @@
 	<JettyBaseUnpackDir>..\..\..\target\idp-jetty-base</JettyBaseUnpackDir>
 	<JettyUnpackDir>..\..\..\target\jetty-home-$(JettyVersion)</JettyUnpackDir>
 	<ProcrunUnpackDir>..\..\..\target\procrun</ProcrunUnpackDir>
-	<DefineConstants>ProcrunSrc=$(ProcrunUnpackDir);jettyBaseSrc=$(JettyBaseUnpackDir);jettySrc=$(JettyUnpackDir)</DefineConstants>
+	<DefineConstants>ProcrunSrc=$(ProcrunUnpackDir);jettyBaseSrc=$(JettyBaseUnpackDir);jettySrc=$(JettyUnpackDir);jettyVersion=$(JettyVersion)</DefineConstants>
 	<SuppressIces>ICE61</SuppressIces>
     </PropertyGroup>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.