diff options
| author | Tom Yu <tlyu@mit.edu> | 2011-12-12 20:45:29 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2011-12-12 20:45:29 +0000 |
| commit | 4b94b89dad01766239d43f505e4cefab3cac1a79 (patch) | |
| tree | 051b86570d4f81d7b60a00962a4a1d2e9e400fe2 /src/windows/installer | |
| parent | d5484a9106208a7e7d438244de79e3405d77e932 (diff) | |
| download | krb5-4b94b89dad01766239d43f505e4cefab3cac1a79.tar.gz krb5-4b94b89dad01766239d43f505e4cefab3cac1a79.tar.xz krb5-4b94b89dad01766239d43f505e4cefab3cac1a79.zip | |
kfw installer: don't build installer into installer
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7050
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25554 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/installer')
| -rw-r--r-- | src/windows/installer/wix/features.wxi | 4 | ||||
| -rw-r--r-- | src/windows/installer/wix/files.wxi | 42 |
2 files changed, 0 insertions, 46 deletions
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index c9549f35d2..2e0f65f07e 100644 --- a/src/windows/installer/wix/features.wxi +++ b/src/windows/installer/wix/features.wxi @@ -164,10 +164,6 @@ <ComponentRef Id="cmp_dirinc_loadfuncs" /> <ComponentRef Id="cmp_dirinc_wshelper" /> <ComponentRef Id="cmp_dirinc_wshelper_arpa" /> - <ComponentRef Id="cmp_dirinstall_wix" /> - <ComponentRef Id="cmp_dirinstall_wix_lang" /> - <ComponentRef Id="cmp_dirinstall_wix_Binary" /> - <ComponentRef Id="cmp_dirinstall_wix_custom" /> <ComponentRef Id="rcm_common" /> <ComponentRef Id="rcm_sdk" /> </Feature> <!-- /feaKfwSDK --> diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index a889b2e669..5f25c5fa5f 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -420,48 +420,6 @@ <?endif?> </Directory> - <Directory Id="dirinstall" Name="install" src="$(var.InstallDir)"> - <Directory Id="dirinstall_wix" Name="wix" src="$(var.InstallDir)wix\"> - <Component Win64="$(var.Win64)" Id="cmp_dirinstall_wix" Guid="14DD16AB-6920-4ee1-8B78-623F39DB70BB" DiskId="1"> - <File Id="fil_config_wxi" Name="config.wxi" /> - <File Id="fil_features_wxi" Name="features.wxi" /> - <File Id="fil_files_wxi" Name="files.wxi" /> - <File Id="fil_kfw_wxs" Name="kfw.wxs" KeyPath="yes" /> - <File Id="fil_Makefile_" Name="Makefile" /> - <File Id="fil_property_wxi" Name="property.wxi" /> - <File Id="fil_site_local_wxi" Name="site-local-tagged.wxi" /> - </Component> - <Directory Id="dirinstall_wix_lang" Name="lang" src="$(var.InstallDir)wix\lang\"> - <Component Win64="$(var.Win64)" Id="cmp_dirinstall_wix_lang" Guid="70741A69-1103-4B54-B146-2E14C271945D" DiskId="1"> - <File Id="fil_config_1033_wxi" Name="config_1033.wxi" KeyPath="yes" /> - <File Id="fil_strings_1033_wxl" Name="strings_1033.wxl" /> - <File Id="fil_ui_1033_wxi" Name="ui_1033.wxi" /> - </Component> - </Directory> - <Directory Id="dirinstall_wix_Binary" Name="Binary" src="$(var.InstallDir)wix\Binary\"> - <Component Win64="$(var.Win64)" Id="cmp_dirinstall_wix_Binary" Guid="5F021D71-A398-41FD-8F9C-9C0665C18660" DiskId="1"> - <File Id="fil_bannrbmp_bmp" Name="bannrbmp.bmp" /> - <File Id="fil_completi_ico" Name="completi.ico" /> - <File Id="fil_custicon_ico" Name="custicon.ico" /> - <File Id="fil_dlgbmp_bmp" Name="dlgbmp.bmp" /> - <File Id="fil_exclamic_ico" Name="exclamic.ico" /> - <File Id="fil_info_bmp" Name="info.bmp" /> - <File Id="fil_insticon_ico" Name="insticon.ico" /> - <File Id="fil_new_bmp" Name="new.bmp" /> - <File Id="fil_removico_ico" Name="removico.ico" /> - <File Id="fil_repairic_ico" Name="repairic.ico" /> - <File Id="fil_up_bmp" Name="up.bmp" /> - </Component> - </Directory> - <Directory Id="dirinstall_wix_custom" Name="custom" src="$(var.InstallDir)wix\custom\"> - <Component Win64="$(var.Win64)" Id="cmp_dirinstall_wix_custom" Guid="872AA948-39B0-4CDC-B764-7EB69F280E50" DiskId="1"> - <File Id="fil_custom_cpp" Name="custom.cpp" KeyPath="yes" /> - <File Id="fil_custom_h" Name="custom.h" /> - </Component> - </Directory> - </Directory> - </Directory> - <!-- <Directory Id="dirdoc" Name="doc" src="$(var.DocDir)"> <?if $(var.Platform) = "Intel" ?> <Component Win64="$(var.Win64)" Id="efl_leash_userdoc_pdf" Guid="68FB24DD-5EC2-4db1-AD42-5B9DDEC247C5" DiskId="1"> |