[28947] in CVS-changelog-for-Kerberos-V5
krb5 commit: Stop using the WiX src attribute
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Jun 24 17:11:53 2015
Date: Wed, 24 Jun 2015 17:11:34 -0400
From: Benjamin Kaduk <kaduk@mit.edu>
Message-Id: <201506242111.t5OLBYSW007265@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/0e025dd9bd64169a2acf5c9bea7a17eec7b37a13
commit 0e025dd9bd64169a2acf5c9bea7a17eec7b37a13
Author: Ben Kaduk <kaduk@mit.edu>
Date: Fri May 29 14:46:58 2015 -0400
Stop using the WiX src attribute
The src attribute has been deprecated for a while in favor of
different (more descriptive) attributes for the different XML
elements involved.
For the File element, use the Source attribute.
For the Directory element, use the FileSource attribute.
For the Merge, Binary, and Text elements, use the SourceFile attribute.
This makes the installer build much quieter, with the warnings from
the light.exe invocation all fitting into the default history buffer.
ticket: 8208 (new)
queue: kfw
tags: pullup
target_version: 1.13.3
src/windows/installer/wix/files.wxi | 64 ++++++++++++++--------------
src/windows/installer/wix/kfw.wxs | 2 +-
src/windows/installer/wix/lang/ui_1033.wxi | 24 +++++-----
3 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 5b49fb5..ee18251 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -52,19 +52,19 @@
</RegistryKey>
</Component>
<Component Win64="$(var.Win64)" Id="cmf_kfwcpcc_EXE" Guid="$(var.cmf_kfwcpcc_EXE_guid)">
- <File Id="filekfwcpcc_EXE" Name="kfwcpcc.exe" DiskId="1" src="$(var.BinDir)kfwcpcc.exe" />
+ <File Id="filekfwcpcc_EXE" Name="kfwcpcc.exe" DiskId="1" Source="$(var.BinDir)kfwcpcc.exe" />
</Component>
<?ifdef DebugSyms?>
<Component Win64="$(var.Win64)" Id="cmp_ClientSystemDebug" Guid="$(var.cmp_ClientSystemDebug_guid)">
- <File Id="filekfwlogon_PDB" Name="kfwlogon.pdb" KeyPath="yes" DiskId="1" src="$(var.BinDir)kfwlogon.pdb" />
- <File Id="filekfwcpcc_PDB" Name="kfwcpcc.pdb" DiskId="1" src="$(var.BinDir)kfwcpcc.pdb" />
+ <File Id="filekfwlogon_PDB" Name="kfwlogon.pdb" KeyPath="yes" DiskId="1" Source="$(var.BinDir)kfwlogon.pdb" />
+ <File Id="filekfwcpcc_PDB" Name="kfwcpcc.pdb" DiskId="1" Source="$(var.BinDir)kfwcpcc.pdb" />
</Component>
<?endif?>
</Directory>
<Directory Id="$(var.PIProgramFilesFolder)">
<Directory Id="dirMIT" Name="MIT" SourceName=".">
<Directory Id="KERBEROSDIR" Name="Kerberos">
- <Directory Id="dirbin" Name="bin" src="$(var.BinDir)">
+ <Directory Id="dirbin" Name="bin" FileSource="$(var.BinDir)">
<!-- Kerberos V options -->
<Component Win64="$(var.Win64)" Id="rcm_krb5_1" Guid="$(var.rcm_krb5_1_guid)" DiskId="1">
@@ -360,8 +360,8 @@
</Directory> <!-- /bin -->
- <Directory Id="dirinc" Name="include" src="$(var.IncDir)">
- <Directory Id="dirinc_krb5_gssapi" Name="gssapi" src="$(var.IncDir)gssapi\">
+ <Directory Id="dirinc" Name="include" FileSource="$(var.IncDir)">
+ <Directory Id="dirinc_krb5_gssapi" Name="gssapi" FileSource="$(var.IncDir)gssapi\">
<Component Win64="$(var.Win64)" Id="cmp_dirinc_krb5_gssapi" Guid="BD3C190B-1EBB-4d14-81DD-B2000DC4EAC7" DiskId="1">
<File Id="fil_gssapi_h" Name="gssapi.h" KeyPath="yes" />
<File Id="fil_gssapi_ext_h" Name="gssapi_ext.h" />
@@ -369,7 +369,7 @@
<File Id="fil_gssapi_krb5_h" Name="gssapi_krb5.h" />
</Component>
</Directory>
- <Directory Id="dirinc_krb5_krb5" Name="krb5" src="$(var.IncDir)krb5\">
+ <Directory Id="dirinc_krb5_krb5" Name="krb5" FileSource="$(var.IncDir)krb5\">
<Component Win64="$(var.Win64)" Id="cmp_dirinc_krb5_krb5" Guid="D1E4E3D8-EF04-4DD6-B01E-F87876509869" DiskId="1">
<File Id="fil_krb5_h_inc" Name="krb5.h" KeyPath="yes" />
</Component>
@@ -380,7 +380,7 @@
<File Id="fil_profile_.h" Name="profile.h" />
<File Id="fil_win_mac_.h" Name="win-mac.h" />
</Component>
- <Directory Id="dirinc_windows" Name="windows" src="$(var.SrcDir)windows\include\">
+ <Directory Id="dirinc_windows" Name="windows" FileSource="$(var.SrcDir)windows\include\">
<!-- TODO: CredentialCache.h?
<Component Win64="$(var.Win64)" Id="cmp_dirinc_krbcc" Guid="2CE4B708-7D45-41e4-8A53-BF2D78451A81" DiskId="1">
<File Id="fil_cacheapi_h" Name="cacheapi.h" KeyPath="yes" />
@@ -405,7 +405,7 @@
<File Id="fil_resolv_h" Name="resolv.h" />
<File Id="fil_wshelper_h" Name="wshelper.h" KeyPath="yes" />
</Component>
- <Directory Id="dirinc_wshelper_arpa" Name="arpa" src="$(var.SrcDir)\windows\include\arpa\">
+ <Directory Id="dirinc_wshelper_arpa" Name="arpa" FileSource="$(var.SrcDir)\windows\include\arpa\">
<Component Win64="$(var.Win64)" Id="cmp_dirinc_wshelper_arpa" Guid="42A19215-91D6-4cd6-8BE8-95105849B862" DiskId="1">
<File Id="fil_nameser_h" Name="nameser.h" KeyPath="yes" />
</Component>
@@ -413,9 +413,9 @@
</Directory>
</Directory>
- <Directory Id="dirlib" Name="lib" src="$(var.LibDir)">
+ <Directory Id="dirlib" Name="lib" FileSource="$(var.LibDir)">
<?if $(var.Platform) = "Intel" ?>
- <Directory Id="dirlib_i386" Name="i386" src="$(var.LibDir)">
+ <Directory Id="dirlib_i386" Name="i386" FileSource="$(var.LibDir)">
<Component Win64="$(var.Win64)" Id="cmp_dirlib_i386" Guid="CFEE3ED4-92D4-49e1-BB78-8BCBC60C3E57" DiskId="1">
<File Id="fil_comerr32_lib" Name="comerr32.lib" />
<File Id="fil_getopt_32_lib" Name="getopt.lib" />
@@ -429,7 +429,7 @@
</Directory>
<?endif?>
<?if $(var.Platform) = "x64" ?>
- <Directory Id="dirlib_amd64" Name="amd64" src="$(var.LibDir)">
+ <Directory Id="dirlib_amd64" Name="amd64" FileSource="$(var.LibDir)">
<Component Win64="$(var.Win64)" Id="cmp_dirlib_amd64" Guid="F9A54201-FFD6-4a45-B021-276D9F6C40A2" DiskId="1">
<File Id="fil_comerr64_lib" Name="comerr64.lib" />
<File Id="fil_getopt_64_lib" Name="getopt.lib" />
@@ -444,7 +444,7 @@
<?endif?>
</Directory>
-<!-- <Directory Id="dirdoc" Name="doc" src="$(var.DocDir)">
+<!-- <Directory Id="dirdoc" Name="doc" FileSource="$(var.DocDir)">
<?if $(var.Platform) = "Intel" ?>
<Component Win64="$(var.Win64)" Id="efl_leash_userdoc_pdf" Guid="68FB24DD-5EC2-4db1-AD42-5B9DDEC247C5" DiskId="1">
<File Id="fil_leash_userdoc_pdf" Name="leash_userdoc.pdf" KeyPath="yes">
@@ -462,7 +462,7 @@
<Directory Id="APPDATAMITDIR" Name="MIT">
<Directory Id="APPDATAKERBEROS5DIR" Name="Kerberos5">
<Component Win64="$(var.Win64)" Id="cmf_krb5_ini" Guid="C1AF0670-BBF1-4AA6-B2A6-6C8B1584A1F4" NeverOverwrite="yes" Permanent="yes" DiskId="1">
- <File Id="fil_krb5_ini" Name="krb5.ini" src="$(var.ConfigDir)krb5.ini" KeyPath="yes" />
+ <File Id="fil_krb5_ini" Name="krb5.ini" Source="$(var.ConfigDir)krb5.ini" KeyPath="yes" />
<CreateFolder/>
</Component>
</Directory>
@@ -587,29 +587,29 @@
<?endif?>
<?if $(var.Platform) = "x64" ?>
<?ifndef Debug?>
- <Merge Id="MSVCRT$(var.VCVer)MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x64.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x64.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x64.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x86.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x86.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MEM64" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x64.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFC64" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x64.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFL64" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x64.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
<?else?>
- <Merge Id="MSVCRT$(var.VCVer)MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x64.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x64.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x64.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x86.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x86.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MEM64" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x64.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFC64" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x64.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFL64" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x64.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
<?endif?>
<?else?>
<?ifndef Debug?>
- <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x86.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x86.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
<?else?>
- <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x86.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x86.msm"/>
- <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x86.msm"/>
+ <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" SourceFile="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
<?endif?>
<?endif?>
<?endif?>
diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index 26aec94..c5c0f5f 100755
--- a/src/windows/installer/wix/kfw.wxs
+++ b/src/windows/installer/wix/kfw.wxs
@@ -72,7 +72,7 @@
<?endif?>
<!-- Custom actions -->
- <Binary Id="binCustom" src="custom\custom.dll" />
+ <Binary Id="binCustom" SourceFile="custom\custom.dll" />
<CustomAction
Id="EnableTgtSessionKey"
diff --git a/src/windows/installer/wix/lang/ui_1033.wxi b/src/windows/installer/wix/lang/ui_1033.wxi
index 381f6d6..1360221 100644
--- a/src/windows/installer/wix/lang/ui_1033.wxi
+++ b/src/windows/installer/wix/lang/ui_1033.wxi
@@ -446,7 +446,7 @@
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="374" Height="44" TabSkip="no" Text="[BannerBitmap]" />
<Control Id="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Sunken="yes" TabSkip="no">
- <Text src=".\lang\license.rtf"/>
+ <Text SourceFile=".\lang\license.rtf"/>
</Control>
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="374" Height="0" />
@@ -1226,15 +1226,15 @@
<Property Id="IAgree"><![CDATA[No]]></Property>
<Property Id="BannerBitmap"><![CDATA[bannrbmp]]></Property>
<Property Id="DialogBitmap"><![CDATA[dlgbmp]]></Property>
- <Binary Id="bannrbmp" src="Binary\bannrbmp.bmp" />
- <Binary Id="completi" src="Binary\completi.ico" />
- <Binary Id="custicon" src="Binary\custicon.ico" />
- <Binary Id="dlgbmp" src="Binary\dlgbmp.bmp" />
- <Binary Id="exclamic" src="Binary\exclamic.ico" />
- <Binary Id="info" src="Binary\info.bmp" />
- <Binary Id="insticon" src="Binary\insticon.ico" />
- <Binary Id="New" src="Binary\New.bmp" />
- <Binary Id="removico" src="Binary\removico.ico" />
- <Binary Id="repairic" src="Binary\repairic.ico" />
- <Binary Id="Up" src="Binary\up.bmp" />
+ <Binary Id="bannrbmp" SourceFile="Binary\bannrbmp.bmp" />
+ <Binary Id="completi" SourceFile="Binary\completi.ico" />
+ <Binary Id="custicon" SourceFile="Binary\custicon.ico" />
+ <Binary Id="dlgbmp" SourceFile="Binary\dlgbmp.bmp" />
+ <Binary Id="exclamic" SourceFile="Binary\exclamic.ico" />
+ <Binary Id="info" SourceFile="Binary\info.bmp" />
+ <Binary Id="insticon" SourceFile="Binary\insticon.ico" />
+ <Binary Id="New" SourceFile="Binary\New.bmp" />
+ <Binary Id="removico" SourceFile="Binary\removico.ico" />
+ <Binary Id="repairic" SourceFile="Binary\repairic.ico" />
+ <Binary Id="Up" SourceFile="Binary\up.bmp" />
</Include>
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
