Uncomment w2k files in corebinaries.xml

Factor processing of <Prunes> xml into pruneFiles.pl.

Factor processing of <Zips> xml into zipXML.pl.

Move SRC zip XML to <FetchSources> section of config file.

Call zipXML in /REPOSITORY CHECKOUT section of script.

Keep track of cleaning of OUTDIR so SRC zip isn't removed during packaging.

Remove UNIXFIND from config file.  If UNIXFIND isn't present in the config file, set the in-memory UNIXFIND to c:\tools\cygwin\bin.  UNIXFIND is now an implementation detail stored in the in-memory config XML, like the versions read from kerberos.ver.

Prune more temporary files before making SDK zip.

Remove redundant custom files from sdkfiles.xml.  Copy *.* from staging/inc instead of *.h -- one .c file is also required.

Target_Version: 1.6.1
Ticket: 5490
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19375 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 37 insertions, 29 deletions

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index 37c1a5c43b..a7a34ee2a3 100644
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -12,7 +12,6 @@
                     of the repositories will cause pismere/athena to be created under <src>.    -->

             <src        path    ="C:\projects\Autobuild" />

             <out        path    ="C:\projects\Autobuild\public" /> <!-- Must be absolute path. -->

-            <unixfind   path    ="c:\cygwin\bin" />

             </Directories>

         <Options>

             <debug      value="0" />

@@ -33,8 +32,38 @@
                 <SVNURL     name="svn.mit.edu" />   <!-- NB:  No protocol or slashes!! -->

                 <USERNAME   name="" />              <!-- Needed for svn/plink.  Override from command line -->

                 </Config>

-        </FetchSources>

-        <Make></Make>

+            <Zips>

+                <Zip dummy="foo" /> <!-- To force desired XML::Simple behavior    -->

+                <Zip name="SRC" filename="%filestem%-src.zip" topdir="%filestem%-final">

+                    <CopyList>

+                        <Files>

+                            <!-- File from    paths are relative to <src>/pismere.  -->

+                            <!-- File to      paths are relative to <out>.          -->

+                            <File dummy="foo" /> <!-- Forces XML::Simple behavior   -->

+                            <!-- Without this, XML::Simple does not make an anonymous array and I can't figure out how to iterate over it. -->

+                            <File name="*.*" from="athena"  to="src\athena" />

+                            <File name="*.*" from="doc"     to="src\doc" />

+                            <File name="*.*" from="scripts" to="src\scripts" />

+                            </Files>

+                    </CopyList>

+                    <Prunes> <!-- Files to be removed from current build to match what is in the 3.1 distribution:    -->

+                        <Prune dummy="foo" />

+                        <Prune name="CVS" />

+                        <Prune name=".cvsignore" flags="i" />

+                        <Prune name="Changelog"  flags="i" />

+                        <Prune name="site" />

+                        </Prunes>

+                    <Requires>

+                        <Switch dummy="foo" />

+                        <Switch name="REPOSITORY" value="CHECKOUT"/>

+                        <ErrorMsg text="Can't build source zip unless /REPOSITORY CHECKOUT is specified." />

+                        </Requires>

+                    </Zip>

+                </Zips>

+            </FetchSources>

+        <Make>

+            <!-- Script checks for prunes. -->

+            </Make>

         <PrePackage>

             <CopyList>

                 <Config>

@@ -110,33 +139,12 @@
                         <Prune dummy="foo" />

                         <Prune name="*.exe" />

                         <Prune name="*.msi" />

+                        <Prune name="*.dll" />

+                        <Prune name="*.obj" />

+                        <Prune name="*.wixobj" />

+                        <Prune name="custom.lib" />

+                        <Prune name="custom.exp" />

                         </Prunes>

-                </Zip>

-                <Zip name="SRC" filename="%filestem%-src.zip" topdir="%filestem%-final">

-                    <CopyList>

-                        <Files>

-                            <!-- File from    paths are relative to <src>/pismere.  -->

-                            <!-- File to      paths are relative to <out>.          -->

-                            <File dummy="foo" /> <!-- Forces XML::Simple behavior   -->

-                            <!-- Without this, XML::Simple does not make an anonymous array and I can't figure out how to iterate over it. -->

-                            <File name="*.*" from="athena"  to="src\athena" />

-                            <File name="*.*" from="doc"     to="src\doc" />

-                            <File name="*.*" from="scripts" to="src\scripts" />

-                            </Files>

-                    </CopyList>

-                    <Prunes> <!-- Files to be removed from current build to match what is in the 3.1 distribution:    -->

-                        <Prune dummy="foo" />

-                        <Prune name="CVS" />

-                        <Prune name=".cvsignore" flags="i" />

-                        <Prune name="Changelog" flags="i" />

-                        <Prune name="obj" />

-                        <Prune name="site" />

-                        </Prunes>

-                    <Requires>

-                        <Switch dummy="foo" />

-                        <Switch name="REPOSITORY" value="CHECKOUT"/>

-                        <ErrorMsg text="Can't build source zip unless /REPOSITORY CHECKOUT is specified." />

-                        </Requires>

                     </Zip>

                 </Zips>            

             <CopyList>            <!-- Copied at end of post-package step.    -->