Implement environment variable settings from the config xml file. See notes in bkwco...

Target_Version: 1.6.1
Ticket: 5521
Tags: pullup

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

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index 654396685429239c74e57e42972ab9a823b4ff09..b7c11d181c4682f409700c070e39ca69ac9e24a1 100644 (file)
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -2,7 +2,7 @@
 <!-- BKW: Build Kerberos for Windows -->\r
 <BKW_Config>\r
     <Config>\r
-        <!-- All the parameters are specified here.  They can be over-ridden\r
+        <!-- All the parameters are specified here.  Most can be over-ridden\r
                 on the command line.\r
 \r
             Parameters are grouped into Options, Directories, Repository and Environment.\r
@@ -46,7 +46,6 @@
         <!-- Environment variables: -->>\r
         <KH_RELEASE def="1" env="1" value="OFFICIAL" options="OFFICIAL PRERELEASE PRIVATE" />\r
         <NODEBUG    def="1" env="1" />  <!-- Interacts with /DEBUG -->\r
-        \r
         </Config>\r
     <Stages>\r
         <FetchSources>\r

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index c7ecf072088cea966f5a41158ff0ca915c01eff5..6ea7c7f33484c7ee38866e5ec8c29b4cb5dcc5b6 100644 (file)
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -176,6 +176,13 @@ sub main {
     # Scan the configuration for switch definitions:\r
     while (($sw, $val) = each %$odr) {\r
         next if (! exists $val->{def}); ## ?? Should always exist.\r
+\r
+        # Set/clear environment variables:\r
+        if ($val->{env}) {\r
+            if ($val->{def})    {$ENV{$sw}   = (exists $val->{value}) ? $val->{value} : 1; }\r
+            else                {delete $ENV{$sw};  }\r
+            }\r
+\r
         # If the switch is in the command line, override the stored value:\r
         if (exists $OPT->{$sw}) {\r
             if (exists $val->{value}) {\r