diff options
Diffstat (limited to 'src/windows/installer')
-rw-r--r-- | src/windows/installer/wix/ChangeLog | 6 | ||||
-rw-r--r-- | src/windows/installer/wix/features.wxi | 35 | ||||
-rw-r--r-- | src/windows/installer/wix/files.wxi | 60 | ||||
-rw-r--r-- | src/windows/installer/wix/lang/strings_1033.wxl | 3 | ||||
-rw-r--r-- | src/windows/installer/wix/site-local.wxi | 20 |
5 files changed, 106 insertions, 18 deletions
diff --git a/src/windows/installer/wix/ChangeLog b/src/windows/installer/wix/ChangeLog index fe818ac8c..6eb2aa9a6 100644 --- a/src/windows/installer/wix/ChangeLog +++ b/src/windows/installer/wix/ChangeLog @@ -1,3 +1,9 @@ +2005-11-01 Jeffrey Altman <jaltman@mit.edu> + + Add support for Network Identity Manager Framework + + Move leash32.exe to component that is disabled by default + 2004-12-18 Jeffrey Altman <jaltman@mit.edu> Add Debug Symbols as an optional install feature for diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index 12e25c9cb..890dcb709 100644 --- a/src/windows/installer/wix/features.wxi +++ b/src/windows/installer/wix/features.wxi @@ -47,13 +47,24 @@ AllowAdvertise="no" Description="$(loc.StrKerberosClientDebugDesc)" Display="expand" - InstallDefault="$(var.DebugSymInstallDefault)" + InstallDefault="$(var.DebugSymInstallDefault)" Level="$(var.DebugSymLowLevel)" Title="$(loc.StrKerberosClientDebugTitle)"> <ComponentRef Id="cmf_bin_debug"/> </Feature> <?endif?> + <Feature + Id="feaKfwLeashExe" + AllowAdvertise="no" + Description="$(loc.StrLeashExeDesc)" + Display="expand" + InstallDefault="local" + Level="130" + Title="$(loc.StrLeashExeTitle)"> + <ComponentRef Id="cmf_leash32_exe" /> + </Feature> + <ComponentRef Id="cmf_aklog_exe" /> <ComponentRef Id="cmf_comerr32_dll" /> <ComponentRef Id="cmf_gss_exe" /> @@ -75,14 +86,13 @@ <ComponentRef Id="cmf_krbcc32_dll" /> <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" /> + <ComponentRef Id="cmf_nidmgr32_dll" /> + <ComponentRef Id="cmf_krb5cred_dll" /> + <ComponentRef Id="cmf_krb5cred_en_us_dll" /> + <ComponentRef Id="cmf_krb4cred_dll" /> + <ComponentRef Id="cmf_krb4cred_en_us_dll" /> + <ComponentRef Id="cmf_netidmgr_exe" /> <!-- Kerberos IV options --> <ComponentRef Id="rcm_krb4_1" /> @@ -94,6 +104,14 @@ <ComponentRef Id="rcm_krb5_1" /> <ComponentRef Id="rcm_krb5_2" /> <ComponentRef Id="rcm_krb5_3" /> + + + <!-- 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" /> <?ifdef OldHelp?> <ComponentRef Id="cmf_leash32_hlp" /> @@ -231,6 +249,7 @@ <ComponentRef Id="cmp_dirinc_loadfuncs" /> <ComponentRef Id="cmp_dirinc_wshelper" /> <ComponentRef Id="cmp_dirinc_wshelper_arpa" /> + <ComponentRef Id="cmp_dirinc_netidmgr" /> <ComponentRef Id="cmp_dirlib_i386" /> <ComponentRef Id="cmp_dirinstall_nsis" /> <ComponentRef Id="cmp_dirinstall_wix" /> diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index 386402ce7..a5732222e 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -190,7 +190,7 @@ <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" Show="minimized" /> + <Shortcut Id="sc_leash32_exe_startup" Advertise="no" Directory="StartupFolder" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Arguments="[LEASHAUTOINIT]" Target="[dirbin]netidmgr.exe" Show="minimized" /> </Component> <?ifdef OldHelp?> <Component Id="cmf_leash32_hlp" Guid="919616D6-1605-4A79-8E33-C18A0D0F25E3" DiskId="1"> @@ -293,6 +293,30 @@ <File Id="fil_xpprof32_dll" LongName="xpprof32.dll" Name="xpprof32.dll" KeyPath="yes" /> </Component> + <!-- NetIDMgr --> + <Component Id="cmf_nidmgr32_dll" Guid="EEBA3A0D-CE3D-42F1-8854-D7F63F597202" DiskId="1"> + <File Id="fil_nidmgr32_dll" LongName="nidmgr32.dll" Name="nidmgr32.dll" KeyPath="yes" /> + </Component> + <Component Id="cmf_krb5cred_dll" Guid="27A7723A-F0D9-4F06-892C-54F0AC6014C3" DiskId="1"> + <File Id="fil_krb5cred_dll" LongName="krb5cred.dll" Name="krb5cred.dll" KeyPath="yes" /> + </Component> + <Component Id="cmf_krb5cred_en_us_dll" Guid="EA9ABE05-A85B-43BB-8741-50D3C3128632" DiskId="1"> + <File Id="fil_krb5cred_en_us_dll" LongName="krb5cred_en_us.dll" Name="krb5cenu.dll" KeyPath="yes" /> + </Component> + <Component Id="cmf_krb4cred_dll" Guid="E3B86954-9D5D-4929-A5E6-B22ED03E6D6C" DiskId="1"> + <File Id="fil_krb4cred_dll" LongName="krb4cred.dll" Name="krb4cred.dll" KeyPath="yes" /> + </Component> + <Component Id="cmf_krb4cred_en_us_dll" Guid="3FF40A29-E2C3-40F3-B81C-2948494BE4B0" DiskId="1"> + <File Id="fil_krb4cred_en_us_dll" LongName="krb5cred_en_us.dll" Name="krb4cenu.dll" KeyPath="yes" /> + </Component> + <Component Id="cmf_netidmgr_exe" Guid="AEB06D67-B4F3-45B1-AC1E-5C1AFF747756" DiskId="1"> + <File Id="fil_netidmgr_exe" LongName="netidmgr.exe" Name="netidmgr.exe" KeyPath="yes" /> + <File Id="fil_netidmgr_exe_manifest" LongName="netidmgr.exe.manifest" Name="netidmgr.emn" /> + <File Id="fil_netidmgr_chm" LongName="netidmgr.chm" Name="netidmgr.chm" /> + <Shortcut Id="sc_netidmgr_exe_startup" Advertise="no" Directory="StartupFolder" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Arguments="[LEASHAUTOINIT]" Target="[dirbin]netidmgr.exe" Show="minimized" /> + </Component> + <!-- /NetIDMgr --> + <!-- Debug symbols --> <?ifdef Debug?> <Component Id="cmf_bin_debug" Guid="C8468854-8261-4781-8119-A612636841E3" DiskId="1"> @@ -323,6 +347,10 @@ <File Id="fil_mit2ms_pdb" LongName="mit2ms.pdb" Name="mit2ms.pdb" /> <File Id="fil_wshelp32_pdb" LongName="wshelp32.pdb" Name="wshelp32.pdb" /> <File Id="fil_xpprof32_pdb" LongName="xpprof32.pdb" Name="xpprof32.pdb" /> + <File Id="fil_krb4cred_pdb" LongName="krb4cred.pdb" Name="krb4cred.pdb" /> + <File Id="fil_krb5cred_pdb" LongName="krb5cred.pdb" Name="krb5cred.pdb" /> + <File Id="fil_netidmgr_pdb" LongName="netidmgr.pdb" Name="netidmgr.pdb" /> + <File Id="fil_nidmgr32_pdb" LongName="nidmgr32.pdb" Name="nidmgr32.pdb" /> </Component> <?endif?> @@ -598,6 +626,36 @@ <File Id="fil_loadfuncs_h" LongName="loadfuncs.h" Name="LO87BD~1.H" KeyPath="yes" /> </Component> </Directory> + <Directory Id="dirinc_netidmgr" Name="netidmgr" src="$(var.IncDir)netidmgr\"> + <Component Id="cmp_dirinc_netidmgr" Guid="EBD8BA04-574A-4081-A994-BCEC8ACBC878" DiskId="1"> + <File Id="fil_hashtable_h" LongName="hashtable.h" Name="HASHTA~1.H" /> + <File Id="fil_kconfig_h" LongName="kconfig.h" Name="kconfig.h" /> + <File Id="fil_kcreddb_h" LongName="kcreddb.h" Name="kcreddb.h" /> + <File Id="fil_khaction_h" LongName="khaction.h" Name="khaction.h" /> + <File Id="fil_khactiondef_h" LongName="khactiondef.h" Name="KHACTI~1.H" /> + <File Id="fil_khalerts_h" LongName="khalerts.h" Name="khalerts.h" /> + <File Id="fil_khconfigui_h" LongName="khconfigui.h" Name="KHCONF~1.H" /> + <File Id="fil_khdefs_h" LongName="khdefs.h" Name="khdefs.h" /> + <File Id="fil_kherr_h" LongName="kherr.h" Name="kherr.h" /> + <File Id="fil_kherror_h" LongName="kherror.h" Name="kherror.h" /> + <File Id="fil_khhelp_h" LongName="khhelp.h" Name="khhelp.h" /> + <File Id="fil_khhtlink_h" LongName="khhtlink.h" Name="khhtlink.h" /> + <File Id="fil_khlist_h" LongName="khlist.h" Name="khlist.h" /> + <File Id="fil_khmsgtypes_h" LongName="khmsgtypes.h" Name="KHMSGT~1.H" /> + <File Id="fil_khnewcred_h" LongName="khnewcred.h" Name="KHNEWC~1.H" /> + <File Id="fil_khprops_h" LongName="khprops.h" Name="khprops.h" /> + <File Id="fil_khremote_h" LongName="khremote.h" Name="khremote.h" /> + <File Id="fil_khrescache_h" LongName="khrescache.h" Name="KHRESC~1.H" /> + <File Id="fil_khtracker_h" LongName="khtracker.h" Name="KHTRAC~1.H" /> + <File Id="fil_khuidefs_h" LongName="khuidefs.h" Name="khuidefs.h" KeyPath="yes" /> + <File Id="fil_kmm_h" LongName="kmm.h" Name="kmm.h" /> + <File Id="fil_kmq_h" LongName="kmq.h" Name="kmq.h" /> + <File Id="fil_kplugin_h" LongName="kplugin.h" Name="kplugin.h" /> + <File Id="fil_mstring_h" LongName="mstring.h" Name="mstring.h" /> + <File Id="fil_sync_h" LongName="sync.h" Name="sync.h" /> + <File Id="fil_utils_h" LongName="utils.h" Name="utils.h" /> + </Component> + </Directory> <Directory Id="dirinc_wshelper" Name="wshelper" src="$(var.IncDir)wshelper\"> <Component Id="cmp_dirinc_wshelper" Guid="5A4FCD76-6DC6-455c-B465-FD8123252EBD" DiskId="1"> <File Id="fil_hesiod_h" LongName="hesiod.h" Name="hesiod.h" /> diff --git a/src/windows/installer/wix/lang/strings_1033.wxl b/src/windows/installer/wix/lang/strings_1033.wxl index 41067361a..722782b3c 100644 --- a/src/windows/installer/wix/lang/strings_1033.wxl +++ b/src/windows/installer/wix/lang/strings_1033.wxl @@ -42,6 +42,9 @@ <String Id="StrKerberosClientDebugTitle">Debug symbols</String> <String Id="StrKerberosClientDebugDesc">Debugging symbols for Kerberos for Windows components.</String> + <String Id="StrLeashExeTitle">Leash Credentials Manager</String> + <String Id="StrLeashExeDesc">Leash credentials manager</String> + <String Id="KerberosSDKTitle">SDK</String> <String Id="KerberosSDKDesc">Libraries and header files for developing software with Kerberos</String> diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi index e0081309d..345bdbf95 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="c:\temp\kfw\kfw-2.6.6-alpha\"?> + <?define TargetDir="c:\temp\kfw\kfw-3.0.0-beta-1\"?> <!-- ConfigDir should point to directory containing configuration files (krb5.ini, krb.con, krbrealm.con) to be bundled with the installer. @@ -26,10 +26,11 @@ <?define BuildLang="1033"?> <?endif?> - <!-- ProductCode is an uppercase GUID. Each major release should have a - new product code. Different language versions should have different - product codes --> - <?define ProductCode="FD5B1F41-81BB-4BBC-9F7E-4B971660AE1A"?> + <!-- ProductCode is an uppercase GUID. Each release should have its + own ProductCode. If one is not defined, we generate a random one. --> + <?ifndef ProductCode?> + <?define ProductCode="????????-????-????-????-????????????"?> + <?endif?> <!-- DefaultRealm, is your default realm. Must be uppercase --> <?define DefaultRealm="ATHENA.MIT.EDU"?> @@ -47,7 +48,8 @@ <?define Debug?> <!-- <?define Release?> --> - <!-- We are including debug symbols anyway. Undefine this for a leaner installer without debug syms. --> + <!-- We are including debug symbols anyway. Undefine this for a leaner + installer without debug syms. --> <?define DebugSyms?> <!-- Optional defines --> @@ -70,9 +72,9 @@ <?endif?> <?ifndef VersionMajor?> - <?define VersionMajor="2"?> - <?define VersionMinor="6"?> - <?define VersionPatch="6"?> + <?define VersionMajor="3"?> + <?define VersionMinor="0"?> + <?define VersionPatch="0"?> <?else?> <?if Not ($(var.VersionMinor) And $(var.VersionPatch))?> <?error VersionMajor, VersionMinor and VersionPatch should be specified together?> |