pull up r19458 from trunk

 r19458@cathode-dark-space:  jaltman | 2007-04-13 03:21:25 -0400
 ticket: 5527

      sdkfiles.xml - add msi-deployment-guide.txt

      copyfiles.xml - add msi-deployment-guide.txt
         and do not copy netiddev.chm twice

ticket: 5527
version_fixed: 1.6.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19506 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/build/copyfiles.xml b/src/windows/build/copyfiles.xml
index d571be63dcff44b05bec7ff9e5b30e34661a5fe0..2fb3747c8a2877b337d2c6968f0373631dfaf241 100644 (file)
--- a/src/windows/build/copyfiles.xml
+++ b/src/windows/build/copyfiles.xml
@@ -121,12 +121,13 @@
           <File name="gss.exe"              from="..\target\bin\i386\%bldtype%\"    to="\bin\i386" />\r
           <File name="comerr32.dll"         from="..\target\bin\i386\%bldtype%\"    to="\bin\i386" />\r
           <File name="netiddev.chm"         from="..\target\bin\i386\%bldtype%\"                            to="\doc" />\r
-          <File name="NetIddev.chm"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\doc\"   to="\doc" newname="netiddev.chm" />\r
+<!-- why copy twice?          <File name="NetIddev.chm"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\doc\"   to="\doc" newname="netiddev.chm" /> -->\r
 \r
         <!-- Build-INdependent files, always copied: -->\r
         <File name="relnotes.html"          from="..\doc\kerberos\"                                         to="\doc" />\r
         <File name="leash_userdoc.pdf"      from="auth\leash\help\"                                         to="\doc" />\r
         <File name="NetIdMgr.pdf"           from="auth\krb5\src\windows\identity\doc\"                      to="\doc" newname="netidmgr_userdoc.pdf" />\r
+        <File name="msi-deployment-guide.txt" from="auth\krb5\src\windows\installer\wix\"   to="\doc" />\r
         <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\"            to="\sample\templates\credprov\" />\r
         <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\images\"     to="\sample\templates\credprov\images" />\r
         <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\lang\"       to="\sample\templates\credprov\lang" />\r

diff --git a/src/windows/build/sdkfiles.xml b/src/windows/build/sdkfiles.xml
index 5ef7f48fb0ee2e355b49790d67b870c7f57cca28..3c1481f17cbd106f888f671919d722853de74cab 100644 (file)
--- a/src/windows/build/sdkfiles.xml
+++ b/src/windows/build/sdkfiles.xml
@@ -7,6 +7,7 @@
 \r
                <File name="relnotes.html"  from="doc\kerberos"                 to="doc" />\r
                <File name="kclient.rtf"    from="athena\auth\krb4\kclient\doc" to="doc" />\r
+                <File name="msi-deployment-guide.txt" from="athena\auth\krb5\src\windows\installer\wix\"   to="\doc" />\r
 \r
                <File  name="*.*"           from="staging\inc"                  to="inc" />\r
                <!-- loadfuncs.c is deliberately here.  Otherwise, *.h would work. -->\r