KfW build automation:

Consolidate all command line switch info in one section of the config.xml, flatten structure.  
Don't prune .../site/... .  
Use getopts negate option where possible.  
New method of dealing with repository options, driven from config xml.
Adjust code to find switches in new place.

Hardwire default config to bkwconfig.xml.  Makes "bkw.pl" the out-of-the-box command line.
Hardwire unixfind path to C:\tools\cygwin\bin.
Add filver to required programs list.

Update documentation.

Target_Version: 1.6.1
Ticket: 5521
Tags: pullup

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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/windows/build/makeZip.pl b/src/windows/build/makeZip.pl
index 12215ddcd6..1a1b533c33 100644
--- a/src/windows/build/makeZip.pl
+++ b/src/windows/build/makeZip.pl
@@ -9,15 +9,15 @@ use Data::Dumper;
 sub makeZip {

     local ($zip, $config)   = @_;

 

-    local $src          = $config->{CommandLine}->{Directories}->{src}->{path};

-    local $out          = $config->{CommandLine}->{Directories}->{out}->{path};

-    local @switches     = $config->{CommandLine}->{Options};

-    local $zipname      = $zip->{filename};

-    local $filestem     = $config->{Stages}->{PostPackage}->{Config}->{FileStem}->{name};

-    $zipname            =~ s/%filestem%/$filestem/g;

+    local $odr      = $config->{Config};    ## Options, directories, repository, environment.

+    local $src      = $odr->{src}->{value};

+    local $out      = $odr->{out}->{value};

+    local $zipname  = $zip->{filename};

+    local $filestem = $config->{Stages}->{PostPackage}->{Config}->{FileStem}->{name};

+    $zipname        =~ s/%filestem%/$filestem/g;

     if (exists $zip->{Requires}) {

         local $bMakeIt  = 1;

-        local $rverb    = $switches[0]->{repository}->{value};

+        local $rverb    = $odr->{repository}->{value};

         local $j        = 0;

         while ($zip->{Requires}->{Switch}[$j]) {                    ## Check Require switches

             local $switch    = $zip->{Requires}->{Switch}[$j];