[java-identity-provider] branch master updated: Remove ia64 service and setup from the Installer

Rod Widdowson rdw at steadingsoftware.com
Thu Apr 26 11:03:00 EDT 2018


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

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=011c6db7cf124642cbd950a2a114d32e3f009ce9

The following commit(s) were added to refs/heads/master by this push:
       new  011c6db   Remove ia64 service and setup from the Installer
011c6db is described below

commit 011c6db7cf124642cbd950a2a114d32e3f009ce9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Apr 26 15:48:34 2018 +0100

    Remove ia64 service and setup from the Installer
    
    It is not shipped with the latest procrun.
---
 idp-installer/src/main/wix/procrun.wxs | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/idp-installer/src/main/wix/procrun.wxs b/idp-installer/src/main/wix/procrun.wxs
index 38de585..d0edbd3 100644
--- a/idp-installer/src/main/wix/procrun.wxs
+++ b/idp-installer/src/main/wix/procrun.wxs
@@ -20,7 +20,6 @@
     <Fragment>
         <DirectoryRef Id="PROCRUNROOT">
             <Directory Id="dir64" Name="amd64" />
-            <Directory Id="diria64" Name="ia64" />
         </DirectoryRef>
         <Binary Id="DoRandomSrc" SourceFile="scripts\shib_random.vbs" />
         <CustomAction Id="MakeRandom" BinaryKey="DoRandomSrc" VBScriptCall="" Execute="immediate" />
@@ -46,7 +45,6 @@
 	    
 		Any 64 bit architecture - do not install the 32 bit service, otherwise do
 		X64 install the 32 bit file and the x64 service
-		IA64 install the ia64 service
 	    
 	    -->
             <Component Id="procrun_32_service" Directory="PROCRUNROOT" Guid="{544A5D33-CF99-4384-A74D-79FB29DE904D}">
@@ -72,18 +70,6 @@
                  <fw:FirewallException Id="Win64Shibd_idp" Program="[#file_procrun_AMD64_service]" Name="Win64Shibd_idp" Description="The Shibboleth IdP" Protocol="tcp" Scope="any" />
             </Component>
 
-            <Component Id="procrun_IA64_Service" Directory="diria64" Guid="{38261437-73B7-4E9A-BB6A-B1752157D379}">
-                <Condition>Intel64</Condition>
-                <File Id="file_procrun_IA64_service" KeyPath="yes" Source="$(var.ProcrunSrc)\ia64\prunsrv.exe" Name="$(var.ServiceName).exe" />
-                <?if $(var.msitype) != "x86" ?>
-                <ServiceInstall Id="ServiceIA" Name="$(var.ServiceName)" DisplayName="Shibboleth 3 IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="normal" />
-                <?endif ?>
-            </Component>
-            <Component Id="procrun_IA64_Firewall" Directory="diria64" Guid="{FD33F998-E151-48BB-815F-25D96D8E48DA}" KeyPath="yes">
-                <Condition>Not NO_FIREWALL And Intel64</Condition>
-                <fw:FirewallException Id="WinIA64Shibd_idp" Program="[#file_procrun_IA64_service]" Name="WinIA64Shibd_idp" Description="The Shibboleth IdP" Protocol="tcp" Scope="any" />
-            </Component>
-
             <!-- Configure the service -->
 
             <Component Id="ServiceParameters" Directory="PROCRUNROOT" Guid="{EC1EA760-0113-4CAD-9719-ADFF1885FC53}" KeyPath="yes">

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


More information about the commits mailing list