diff options
author | Tom Yu <tlyu@mit.edu> | 2004-09-13 16:02:55 +0000 |
---|---|---|
committer | Tom Yu <tlyu@mit.edu> | 2004-09-13 16:02:55 +0000 |
commit | 407edab4f2e3501869cb069b79ed5315d579324d (patch) | |
tree | 5aec7082eb44b6b548d03442bf129851c7e9c102 /src | |
parent | 758169e60557dfe7960f2dd20bca9e6ed09bffaa (diff) | |
download | krb5-407edab4f2e3501869cb069b79ed5315d579324d.zip krb5-407edab4f2e3501869cb069b79ed5315d579324d.tar.gz krb5-407edab4f2e3501869cb069b79ed5315d579324d.tar.bz2 |
pullup from trunk
ticket: 2707
version_fixed: 1.3.6
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-3@16748 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r-- | src/windows/installer/wix/ChangeLog | 5 | ||||
-rw-r--r-- | src/windows/installer/wix/config.wxi | 87 | ||||
-rw-r--r-- | src/windows/installer/wix/features.wxi | 38 | ||||
-rw-r--r-- | src/windows/installer/wix/files.wxi | 133 | ||||
-rw-r--r-- | src/windows/installer/wix/kfw.wxs | 10 | ||||
-rw-r--r-- | src/windows/installer/wix/property.wxi | 35 | ||||
-rw-r--r-- | src/windows/installer/wix/site-local.wxi | 2 |
7 files changed, 304 insertions, 6 deletions
diff --git a/src/windows/installer/wix/ChangeLog b/src/windows/installer/wix/ChangeLog index f8aa27c..bc0f952 100644 --- a/src/windows/installer/wix/ChangeLog +++ b/src/windows/installer/wix/ChangeLog @@ -1,3 +1,8 @@ +2004-09-12 Asanka Herath <asanka@mit.edu> + + Updates to Wix installer to satisfy the needs of MIT SWRT + Add msi-deployment-guide.txt + 2004-08-20 Asanka Herath <asanka@mit.edu> New WiX 2.0 MSI for KFW
\ No newline at end of file diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi index 508a937..f3f5afc 100644 --- a/src/windows/installer/wix/config.wxi +++ b/src/windows/installer/wix/config.wxi @@ -51,4 +51,91 @@ <?define SystemDir="$(env.SystemRoot)\System32\"?> <?include lang\config_$(var.BuildLang).wxi?> + + <!-- Configuration macros --> + <?ifndef LeashAfsStatus?> + <?define LeashAfsStatus="1"?> + <?endif?> + <?ifndef LeashCreateMissingConfig?> + <?define LeashCreateMissingConfig="0"?> + <?endif?> + <?ifndef LeashAutoRenewTickets?> + <?define LeashAutoRenewTickets="1"?> + <?endif?> + <?ifndef LeashLockFileLocations?> + <?define LeashLockFileLocations="0"?> + <?endif?> + <?ifndef LeashMsLsaImport?> + <?define LeashMsLsaImport="2"?> + <?endif?> + <?ifndef LeashLifetime?> + <?define LeashLifetime="0"?> + <?endif?> + <?ifndef LeashRenewTill?> + <?define LeashRenewTill="0"?> + <?endif?> + <?ifndef LeashRenewable?> + <?define LeashRenewable="0"?> + <?endif?> + <?ifndef LeashForwardable?> + <?define LeashForwardable="1"?> + <?endif?> + <?ifndef LeashNoAddresses?> + <?define LeashNoAddresses="1"?> + <?endif?> + <?ifndef LeashProxiable?> + <?define LeashProxiable="0"?> + <?endif?> + <?ifndef LeashPublicIp?> + <?define LeashPublicIp="0"?> + <?endif?> + <?ifndef LeashUseKrb4?> + <?define LeashUseKrb4="1"?> + <?endif?> + <?ifndef LeashHideKinitOptions?> + <?define LeashHideKinitOptions="0"?> + <?endif?> + <?ifndef LeashLifeMin?> + <?define LeashLifeMin="5"?> + <?endif?> + <?ifndef LeashLifeMax?> + <?define LeashLifeMax="1440"?> + <?endif?> + <?ifndef LeashRenewMin?> + <?define LeashRenewMin="600"?> + <?endif?> + <?ifndef LeashRenewMax?> + <?define LeashRenewMax="43200"?> + <?endif?> + <?ifndef LeashUppercaseRealm?> + <?define LeashUppercaseRealm="1"?> + <?endif?> + <?ifndef LeashTimeHost?> + <?define LeashTimeHost="time"?> + <?endif?> + <?ifndef LeashPreserveKinitOptions?> + <?define LeashPreserveKinitOptions="0"?> + <?endif?> + <!-- These actually have no defaults. --> + <?ifndef Krb4KrbRealms?> + <?define Krb4KrbRealms=""?> + <?endif?> + <?ifndef Krb4KrbConf?> + <?define Krb4KrbConf=""?> + <?endif?> + <?ifndef Krb4ConfigDir?> + <?define Krb4ConfigDir=""?> + <?endif?> + <?ifndef Krb4TicketFile?> + <?define Krb4TicketFile=""?> + <?endif?> + <?ifndef Krb5Config?> + <?define Krb5Config=""?> + <?endif?> + <?ifndef Krb5CcName?> + <?define Krb5CcName=""?> + <?endif?> + <?ifndef Krb5PreserveIdentity?> + <?define Krb5PreserveIdentity="1"?> + <?endif?> </Include>
\ No newline at end of file diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index aaece45..a5a195b 100644 --- a/src/windows/installer/wix/features.wxi +++ b/src/windows/installer/wix/features.wxi @@ -61,12 +61,50 @@ <ComponentRef Id="cmf_krbcc32s_exe" /> <ComponentRef Id="cmf_krbv4w32_dll" /> <ComponentRef Id="cmf_leash32_exe" /> + + <!-- Leash config options --> + <ComponentRef Id="rcm_leash_1" /> + <ComponentRef Id="rcm_leash_2" /> + <ComponentRef Id="rcm_leash_3" /> + <ComponentRef Id="rcm_leash_5" /> + <ComponentRef Id="rcm_leash_6" /> + + <!-- Kerberos IV options --> + <ComponentRef Id="rcm_krb4_1" /> + <ComponentRef Id="rcm_krb4_2" /> + <ComponentRef Id="rcm_krb4_3" /> + <ComponentRef Id="rcm_krb4_4" /> + + <!-- Kerberos V options --> + <ComponentRef Id="rcm_krb5_1" /> + <ComponentRef Id="rcm_krb5_2" /> + <ComponentRef Id="rcm_krb5_3" /> + <?ifdef OldHelp?> <ComponentRef Id="cmf_leash32_hlp" /> <?else?> <ComponentRef Id="cmf_leash32_chm" /> <?endif?> <ComponentRef Id="cmf_leashw32_dll" /> + + <!-- Leash dll options --> + <ComponentRef Id="rcm_leashdll_1" /> + <ComponentRef Id="rcm_leashdll_2" /> + <ComponentRef Id="rcm_leashdll_3" /> + <ComponentRef Id="rcm_leashdll_4" /> + <ComponentRef Id="rcm_leashdll_5" /> + <ComponentRef Id="rcm_leashdll_6" /> + <ComponentRef Id="rcm_leashdll_7" /> + <ComponentRef Id="rcm_leashdll_8" /> + <ComponentRef Id="rcm_leashdll_9" /> + <ComponentRef Id="rcm_leashdll_10" /> + <ComponentRef Id="rcm_leashdll_11" /> + <ComponentRef Id="rcm_leashdll_12" /> + <ComponentRef Id="rcm_leashdll_13" /> + <ComponentRef Id="rcm_leashdll_15" /> + <ComponentRef Id="rcm_leashdll_16" /> + <ComponentRef Id="rcm_leashdll_17" /> + <ComponentRef Id="cmf_ms2mit_exe" /> <ComponentRef Id="cmf_wshelp32_dll" /> <ComponentRef Id="cmf_xpprof32_dll" /> diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index 419e675..b27ebc0 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -30,6 +30,39 @@ <Directory Id="dirMIT" Name="MIT"> <Directory Id="KERBEROSDIR" Name="Kerberos"> <Directory Id="dirbin" Name="bin" src="$(var.BinDir)"> + + <!-- Kerberos IV options --> + <Component Id="rcm_krb4_1" Guid="34262966-9196-49D6-86C9-AE98D3116DC0" DiskId="1"> + <Registry Id="reg_krb4_1" Root="HKLM" Key="Software\MIT\Kerberos4" Name="krb.realms" Type="string" Value="[KRB4KRBREALMS]" KeyPath="yes"/> + <Condition>KRB4KRBREALMS</Condition> + </Component> + <Component Id="rcm_krb4_2" Guid="812334C6-EBDF-482C-8CB3-A6398AF9EDFC" DiskId="1"> + <Registry Id="reg_krb4_2" Root="HKLM" Key="Software\MIT\Kerberos4" Name="krb.conf" Type="string" Value="[KRB4KRBCONF]" KeyPath="yes"/> + <Condition>KRB4KRBCONF</Condition> + </Component> + <Component Id="rcm_krb4_3" Guid="5556ECD9-8721-41C2-846C-034C239B48F1" DiskId="1"> + <Registry Id="reg_krb4_3" Root="HKLM" Key="Software\MIT\Kerberos4" Name="configdir" Type="string" Value="[KRB4CONFIGDIR]" KeyPath="yes"/> + <Condition>KRB4CONFIGDIR</Condition> + </Component> + <Component Id="rcm_krb4_4" Guid="61371A93-7F59-439D-A89C-070E100F465B" DiskId="1"> + <Registry Id="reg_krb4_4" Root="HKLM" Key="Software\MIT\Kerberos4" Name="ticketfile" Type="string" Value="[KRB4TICKETFILE]" KeyPath="yes"/> + <Condition>KRB4TICKETFILE</Condition> + </Component> + + <!-- Kerberos V options --> + <Component Id="rcm_krb5_1" Guid="E190F8B9-51FA-4FB1-884C-C8AFA37F8653" DiskId="1"> + <Registry Id="reg_krb5_1" Root="HKLM" Key="Software\MIT\kerberos5" Name="config" Type="string" Value="[KRB5CONFIG]" KeyPath="yes" /> + <Condition>KRB5CONFIG</Condition> + </Component> + <Component Id="rcm_krb5_2" Guid="AE7D4305-6193-4094-8C82-73862AE01DCE" DiskId="1"> + <Registry Id="reg_krb5_2" Root="HKLM" Key="Software\MIT\kerberos5" Name="ccname" Type="string" Value="[KRB5CCNAME]" KeyPath="yes" /> + <Condition>KRB5CCNAME</Condition> + </Component> + <Component Id="rcm_krb5_3" Guid="853EE035-99AA-489A-8FB6-74C76624E92A" DiskId="1"> + <Registry Id="reg_krb5_3" Root="HKLM" Key="Software\MIT\kerberos5" Name="PreserveInitialTicketIdentity" Type="integer" Value="[KRB5PRESERVEIDENTITY]" KeyPath="yes" /> + <Condition>KRB5PRESERVEIDENTITY</Condition> + </Component> + <Component Id="cmf_aklog_exe" Guid="38840074-3D15-45CB-8022-C4A603FC697A" DiskId="1"> <File Id="fil_aklog_exe" LongName="aklog.exe" Name="aklog.exe" KeyPath="yes" /> <Registry Id="reg_ts_aklog_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\aklog" Action="createKeyAndRemoveKeyOnUninstall" /> @@ -114,6 +147,34 @@ <Registry Id="reg_ts_leash32_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Action="createKeyAndRemoveKeyOnUninstall" /> <Registry Id="reg_ts_leash32_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Name="Flags" Type="integer" Value="1032" /> </Component> + + <!-- Leash32 configuration --> + <Component Id="rcm_leash_1" Guid="B91648A0-26F7-43BB-A954-202FF3811E3C" DiskId="1"> + <Registry Id="reg_leash_1" Root="HKLM" Key="Software\MIT\Leash32\Settings" Name="AfsStatus" Type="integer" Value="[LEASHAFSSTATUS]" KeyPath="yes"/> + <Condition>LEASHAFSSTATUS</Condition> + </Component> + <Component Id="rcm_leash_2" Guid="0D8DCC52-F855-4C46-86A1-198E6EE0CB8A" DiskId="1"> + <Registry Id="reg_leash_2" Root="HKLM" Key="Software\MIT\Leash32\Settings" Name="createmissingconfig" Type="integer" Value="[LEASHCREATEMISSINGCONFIG]" KeyPath="yes"/> + <Condition>LEASHCREATEMISSINGCONFIG</Condition> + </Component> + <Component Id="rcm_leash_3" Guid="9610A7E3-251F-4286-B776-1C3AF5DE7815" DiskId="1"> + <Registry Id="reg_leash_3" Root="HKLM" Key="Software\MIT\Leash32\Settings" Name="AutoRenewTickets" Type="integer" Value="[LEASHAUTORENEWTICKETS]" KeyPath="yes"/> + <Condition>LEASHAUTORENEWTICKETS</Condition> + </Component> + <!-- + <Component Id="rcm_leash_4" Guid="815AED84-2437-4EBC-B561-F847833DB3A5" DiskId="1"> + <Registry Id="reg_leash_4" Root="HKLM" Key="Software\MIT\Leash" Action="createKey" KeyPath="yes"/> + </Component> + --> + <Component Id="rcm_leash_5" Guid="A0D3D75F-762E-4D5C-909B-53E7396CEDB6" DiskId="1"> + <Registry Id="reg_leash_5" Root="HKLM" Key="Software\MIT\Leash" Name="lock_file_locations" Type="integer" Value="[LEASHLOCKFILELOCATIONS]" KeyPath="yes"/> + <Condition>LEASHLOCKFILELOCATIONS</Condition> + </Component> + <Component Id="rcm_leash_6" Guid="F675C145-6F9D-4BC4-9DA0-CAFB47A96A71" DiskId="1"> + <Registry Id="reg_leash_6" Root="HKLM" Key="Software\MIT\Leash" Name="MsLsaImport" Type="integer" Value="[LEASHMSLSAIMPORT]" KeyPath="yes"/> + <Condition>LEASHMSLSAIMPORT</Condition> + </Component> + <Component Id="csc_leashStartup" Guid="3408C97D-68D6-4207-9142-BF82F7C62DC0" DiskId="1"> <Registry Id="reg_sc_leash_marker" Root="HKLM" Key="$(var.KfwRegRoot)\Client\$(var.VersionString)" Name="LeashAutoStart" Type="integer" Value="1" KeyPath="yes" /> <Shortcut Id="sc_leash32_exe_startup" Advertise="no" Directory="StartupFolder" LongName="Leash Kerberos Ticket Manager.lnk" Name="Leash.lnk" Arguments="[LEASHAUTOINIT]" Target="[dirbin]leash32.exe"/> @@ -130,6 +191,78 @@ <Component Id="cmf_leashw32_dll" Guid="8C145D48-A2FC-4C28-BC05-4368545F1184" DiskId="1"> <File Id="fil_leashw32_dll" LongName="leashw32.dll" Name="leashw32.dll" KeyPath="yes" /> </Component> + + <!-- Leash DLL configuration --> + <Component Id="rcm_leashdll_1" Guid="54C949DA-AF1E-4412-81AF-F502BD5904D2" DiskId="1"> + <Registry Id="reg_leashdll_1" Root="HKLM" Key="Software\MIT\Leash" Name="lifetime" Type="integer" Value="[LEASHLIFETIME]" KeyPath="yes"/> + <Condition>LEASHLIFETIME</Condition> + </Component> + <Component Id="rcm_leashdll_2" Guid="9B553794-45E7-49FB-B6D9-1C3C9BB6E00D" DiskId="1"> + <Registry Id="reg_leashdll_2" Root="HKLM" Key="Software\MIT\Leash" Name="renew_till" Type="integer" Value="[LEASHRENEWTILL]" KeyPath="yes"/> + <Condition>LEASHRENEWTILL</Condition> + </Component> + <Component Id="rcm_leashdll_3" Guid="E3D1284C-17F6-41E3-9AA7-2ED05432060F" DiskId="1"> + <Registry Id="reg_leashdll_3" Root="HKLM" Key="Software\MIT\Leash" Name="renewable" Type="integer" Value="[LEASHRENEWABLE]" KeyPath="yes"/> + <Condition>LEASHRENEWABLE</Condition> + </Component> + <Component Id="rcm_leashdll_4" Guid="A02831D5-48B2-4E82-A670-EDCEBC197273" DiskId="1"> + <Registry Id="reg_leashdll_4" Root="HKLM" Key="Software\MIT\Leash" Name="forwardable" Type="integer" Value="[LEASHFORWARDABLE]" KeyPath="yes"/> + <Condition>LEASHFORWARDABLE</Condition> + </Component> + <Component Id="rcm_leashdll_5" Guid="5FDB0C01-6668-43E3-9C83-2CD364D97BF3" DiskId="1"> + <Registry Id="reg_leashdll_5" Root="HKLM" Key="Software\MIT\Leash" Name="noaddresses" Type="integer" Value="[LEASHNOADDRESSES]" KeyPath="yes"/> + <Condition>LEASHNOADDRESSES</Condition> + </Component> + <Component Id="rcm_leashdll_6" Guid="999BD59C-5C1E-446E-9D38-F4E26DD27D09" DiskId="1"> + <Registry Id="reg_leashdll_6" Root="HKLM" Key="Software\MIT\Leash" Name="proxiable" Type="integer" Value="[LEASHPROXIABLE]" KeyPath="yes"/> + <Condition>LEASHPROXIABLE</Condition> + </Component> + <Component Id="rcm_leashdll_7" Guid="C908AA17-DD21-4193-BA1D-535A2FD3D803" DiskId="1"> + <Registry Id="reg_leashdll_7" Root="HKLM" Key="Software\MIT\Leash" Name="publicip" Type="integer" Value="[LEASHPUBLICIP]" KeyPath="yes"/> + <Condition>LEASHPUBLICIP</Condition> + </Component> + <Component Id="rcm_leashdll_8" Guid="02926245-2327-46F9-AEF6-89E2DB0D90E1" DiskId="1"> + <Registry Id="reg_leashdll_8" Root="HKLM" Key="Software\MIT\Leash" Name="usekrb4" Type="integer" Value="[LEASHUSEKRB4]" KeyPath="yes"/> + <Condition>LEASHUSEKRB4</Condition> + </Component> + <Component Id="rcm_leashdll_9" Guid="B45BBA29-7A67-4FF7-AAA4-80044D46C451" DiskId="1"> + <Registry Id="reg_leashdll_9" Root="HKLM" Key="Software\MIT\Leash" Name="hide_kinit_options" Type="integer" Value="[LEASHHIDEKINITOPTIONS]" KeyPath="yes"/> + <Condition>LEASHHIDEKINITOPTIONS</Condition> + </Component> + <Component Id="rcm_leashdll_10" Guid="1DDC4D78-BDB4-48CD-A4E9-024FA9706100" DiskId="1"> + <Registry Id="reg_leashdll_10" Root="HKLM" Key="Software\MIT\Leash" Name="life_min" Type="integer" Value="[LEASHLIFEMIN]" KeyPath="yes"/> + <Condition>LEASHLIFEMIN</Condition> + </Component> + <Component Id="rcm_leashdll_11" Guid="39134333-58C7-4C6B-B690-2322D3AE928A" DiskId="1"> + <Registry Id="reg_leashdll_11" Root="HKLM" Key="Software\MIT\Leash" Name="life_max" Type="integer" Value="[LEASHLIFEMAX]" KeyPath="yes"/> + <Condition>LEASHLIFEMAX</Condition> + </Component> + <Component Id="rcm_leashdll_12" Guid="BBB6F5C3-290F-4A21-A630-E8630C6EAB67" DiskId="1"> + <Registry Id="reg_leashdll_12" Root="HKLM" Key="Software\MIT\Leash" Name="renew_min" Type="integer" Value="[LEASHRENEWMIN]" KeyPath="yes"/> + <Condition>LEASHRENEWMIN</Condition> + </Component> + <Component Id="rcm_leashdll_13" Guid="0F86A73E-DB31-45E7-9156-BE0EC99076A7" DiskId="1"> + <Registry Id="reg_leashdll_13" Root="HKLM" Key="Software\MIT\Leash" Name="renew_max" Type="integer" Value="[LEASHRENEWMAX]" KeyPath="yes"/> + <Condition>LEASHRENEWMAX</Condition> + </Component> + <!-- + <Component Id="rcm_leashdll_14" Guid="FE0F06A2-62E7-46C1-9BFF-337C50DB78C7" DiskId="1"> + <Registry Id="reg_leashdll_14" Root="HKLM" Key="Software\MIT\Leash32\Settings" Action="createKey" /> + </Component> + --> + <Component Id="rcm_leashdll_15" Guid="2DAC4693-6435-4278-A584-3D2B74BE87D5" DiskId="1"> + <Registry Id="reg_leashdll_15" Root="HKLM" Key="Software\MIT\Leash32\Settings" Name="uppercaserealm" Type="integer" Value="[LEASHUPPERCASEREALM]" KeyPath="yes"/> + <Condition>LEASHUPPERCASEREALM</Condition> + </Component> + <Component Id="rcm_leashdll_16" Guid="FE3DDD47-CCDE-44F8-8C86-97F2C3545443" DiskId="1"> + <Registry Id="reg_leashdll_16" Root="HKLM" Key="Software\MIT\Leash32\Settings" Name="timehost" Type="string" Value="[LEASHTIMEHOST]" KeyPath="yes"/> + <Condition>LEASHTIMEHOST</Condition> + </Component> + <Component Id="rcm_leashdll_17" Guid="1B685E1B-32F2-49A5-9B7D-4288741A2C17" DiskId="1"> + <Registry Id="reg_leashdll_17" Root="HKLM" Key="Software\MIT\Leash" Name="preserve_kinit_options" Type="integer" Value="[LEASHPRESERVEKINITOPTIONS]" KeyPath="yes"/> + <Condition>LEASHPRESERVEKINITOPTIONS</Condition> + </Component> + <Component Id="cmf_ms2mit_exe" Guid="63D189DC-5EE4-49E2-B5E9-6E74A28602C8" DiskId="1"> <File Id="fil_ms2mit_exe" LongName="ms2mit.exe" Name="ms2mit.exe" KeyPath="yes" /> <Registry Id="reg_ts_ms2mit_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\ms2mit" Action="createKeyAndRemoveKeyOnUninstall" /> diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs index 233fefd..2f7e413 100644 --- a/src/windows/installer/wix/kfw.wxs +++ b/src/windows/installer/wix/kfw.wxs @@ -108,13 +108,15 @@ Id="ListRunningProcesses" BinaryKey="binCustom" DllEntry="ListRunningProcesses" - Execute="immediate" /> - + Execute="immediate" + Return="ignore" /> + <CustomAction Id="KillRunningProcesses" BinaryKey="binCustom" DllEntry="KillRunningProcesses" - Execute="immediate" /> + Execute="immediate" + Return="ignore" /> <AdminExecuteSequence /> <InstallExecuteSequence> @@ -152,7 +154,7 @@ </ComplianceCheck> <!-- We embed all the files in a single cabinet. --> - <Media Id="1" Cabinet="Disk1" CompressionLevel="mszip" EmbedCab="yes" /> + <Media Id="1" Cabinet="Disk1" CompressionLevel="high" EmbedCab="yes" /> <!-- Custom table used by KillProcesses custom action --> <CustomTable Id="KillProcess"> diff --git a/src/windows/installer/wix/property.wxi b/src/windows/installer/wix/property.wxi index 52a5cf4..545e8f5 100644 --- a/src/windows/installer/wix/property.wxi +++ b/src/windows/installer/wix/property.wxi @@ -38,7 +38,7 @@ <Property Id="ARPHELPLINK">http://web.mit.edu/kerberos</Property> <Property Id="INSTALLLEVEL">50</Property> <Property Id="ComponentDownload">http://web.mit.edu/kerberos</Property> - + <Property Id="UPGRADENSIS"> <RegistrySearch Id="regsrch_NSIS" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="UninstallString" Type="registry" /> </Property> @@ -50,4 +50,37 @@ <Property Id="CantRemoveNSISError">$(loc.CantRemoveNSIS)</Property> <Property Id="NoIE501Error">$(loc.IE501Required)</Property> <!-- Additional properties relating to the UI are in the appropriate UI.wxi file --> + + <!-- Configuration properties. If these properties are defined, then + the corresponding component will be enabled. --> +<?ifdef UseDefaultProperties?> + <Property Id="LEASHAFSSTATUS">$(var.LeashAfsStatus)</Property> + <Property Id="LEASHCREATEMISSINGCONFIG">$(var.LeashCreateMissingConfig)</Property> + <Property Id="LEASHAUTORENEWTICKETS">$(var.LeashAutoRenewTickets)</Property> + <Property Id="LEASHLOCKFILELOCATIONS">$(var.LeashLockFileLocations)</Property> + <Property Id="LEASHMSLSAIMPORT">$(var.LeashMsLsaImport)</Property> + <Property Id="LEASHLIFETIME">$(var.LeashLifetime)</Property> + <Property Id="LEASHRENEWTILL">$(var.LeashRenewTill)</Property> + <Property Id="LEASHRENEWABLE">$(var.LeashRenewable)</Property> + <Property Id="LEASHFORWARDABLE">$(var.LeashForwardable)</Property> + <Property Id="LEASHNOADDRESSES">$(var.LeashNoAddresses)</Property> + <Property Id="LEASHPROXIABLE">$(var.LeashProxiable)</Property> + <Property Id="LEASHPUBLICIP">$(var.LeashPublicIp)</Property> + <Property Id="LEASHUSEKRB4">$(var.LeashUseKrb4)</Property> + <Property Id="LEASHHIDEKINITOPTIONS">$(var.LeashHideKinitOptions)</Property> + <Property Id="LEASHLIFEMIN">$(var.LeashLifeMin)</Property> + <Property Id="LEASHLIFEMAX">$(var.LeashLifeMax)</Property> + <Property Id="LEASHRENEWMIN">$(var.LeashRenewMin)</Property> + <Property Id="LEASHRENEWMAX">$(var.LeashRenewMax)</Property> + <Property Id="LEASHUPPERCASEREALM">$(var.LeashUppercaseRealm)</Property> + <Property Id="LEASHTIMEHOST">$(var.LeashTimeHost)</Property> + <Property Id="LEASHPRESERVEKINITOPTIONS">$(var.LeashPreserveKinitOptions)</Property> + <Property Id="KRB4KRBREALMS">$(var.Krb4KrbRealms)</Property> + <Property Id="KRB4KRBCONF">$(var.Krb4KrbConf)</Property> + <Property Id="KRB4CONFIGDIR">$(var.Krb4ConfigDir)</Property> + <Property Id="KRB4TICKETFILE">$(var.Krb4TicketFile)</Property> + <Property Id="KRB5CONFIG">$(var.Krb5Config)</Property> + <Property Id="KRB5CCNAME">$(var.Krb5CcName)</Property> + <Property Id="KRB5PRESERVEIDENTITY">$(var.Krb5PreserveIdentity)</Property> +<?endif?> </Include>
\ No newline at end of file diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi index 5cfbda3..074492e 100644 --- a/src/windows/installer/wix/site-local.wxi +++ b/src/windows/installer/wix/site-local.wxi @@ -6,7 +6,7 @@ <!-- TargetDir should point to build target directory and must end with a backslash. If not specified, assume we are in TargetDir\install --> - <?define TargetDir="d:\work\kfwtest\"?> + <?define TargetDir="d:\work\kfwbins\"?> <!-- ConfigDir should point to directory containing configuration files (krb5.ini, krb.con, krbrealm.con) to be bundled with the installer. |