More changes for 64 bit builds

Remove debug messages.

Add components to copylist elements.

Change some more xxx32xxx to xxx%WL%xxx.

Component: windows
TargetVersion: 1.7
Ticket: 5817 5819

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/kpkoch-ccapi@20576 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 26 insertions, 26 deletions

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index efe6b45..bd844d8 100644
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -229,7 +229,7 @@ sub main {
         $odr->{package}->{def} = 0;
         }
 
-    if ($vverbose) {print "Debug -- Config: ".Dumper($config);}
+    if ($verbose) {print "Debug -- Config: ".Dumper($config);}
     
     # Test the unix find command:
     # List of directories where it might be:
diff --git a/src/windows/build/copyfiles.pl b/src/windows/build/copyfiles.pl
index 9c1e84c..e765f8e 100644
--- a/src/windows/build/copyfiles.pl
+++ b/src/windows/build/copyfiles.pl
@@ -53,7 +53,7 @@ sub copyFiles {
     my $CpuTag              = $xml->{Config}->{CpuTag}->{value};
     my $DebugFragment       = ($odr->{debug}->{def})  ? "-DEBUG" : "";
     my $CpuFragment         = $odr->{cpu}->{value};
-	my $ArchFragment		= ($CpuFragment =~ /386/) ? "32" : "64";
+    my $ArchFragment        = ($CpuFragment =~ /386/) ? "32" : "64";
 
     $FileStemFragment       = $xml->{Config}->{FileStem}->{name};    
     $fromRoot               = $xml->{Config}->{From}->{root};    
diff --git a/src/windows/build/corebinaryfiles.xml b/src/windows/build/corebinaryfiles.xml
index f643876..8277018 100644
--- a/src/windows/build/corebinaryfiles.xml
+++ b/src/windows/build/corebinaryfiles.xml
@@ -17,8 +17,8 @@
     <File name="gss-server.pdb" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="gss.exe"        from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="gss.pdb"        from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="gssapi32.dll"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="gssapi32.pdb"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="gssapi%WL%.dll" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="gssapi%WL%.pdb" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="k524init.exe"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="k524init.pdb"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="k5sprt%WL%.dll" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
@@ -44,19 +44,19 @@
     <File name="krb5cred.dll"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="krb5cred.pdb"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="krb5cred_en_us.dll" from="staging\bin\%cpu%" to="\bin\%cpu%\" component="base" />
-    <File name="krb5_32.dll"    from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="krb5_32.pdb"    from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="krbcc32.dll"    from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="krbcc32.pdb"    from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="krbcc32s.exe"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="krbcc32s.pdb"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="krb5_%WL%.dll"  from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="krb5_%WL%.pdb"  from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="krbcc%WL%.dll"  from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="krbcc%WL%.pdb"  from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="krbcc%WL%s.exe" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="krbcc%WL%s.pdb" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="kvno.exe"       from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="kvno.pdb"       from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="leash32.chm"    from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="leash32.exe"    from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="leash32.pdb"    from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="leashw32.dll"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="leashw32.pdb"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="leash%WL%.chm"  from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="leash" />
+    <File name="leash%WL%.exe"  from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="leash" />
+    <File name="leash%WL%.pdb"  from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="leash" />
+    <File name="leashw%WL%.dll" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="leash" />
+    <File name="leashw%WL%.pdb" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="leash" />
     <File name="mit2ms.exe"     from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="mit2ms.pdb"     from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="ms2mit.exe"     from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
@@ -64,15 +64,15 @@
     <File name="netidmgr.chm"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="netidmgr.exe"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
     <File name="netidmgr.pdb"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="nidmgr32.dll"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="nidmgr32.pdb"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="wshelp32.dll"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="wshelp32.pdb"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="xpprof32.dll"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
-    <File name="xpprof32.pdb"   from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="nidmgr%WL%.dll" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="nidmgr%WL%.pdb" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="wshelp%WL%.dll" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="wshelp%WL%.pdb" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="xpprof%WL%.dll" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
+    <File name="xpprof%WL%.pdb" from="staging\bin\%cpu%"     to="\bin\%cpu%\" component="base" />
 
-		<File name="netidmgr.exe"   from="staging\bin\%cpu%\w2k"     to="\bin\%cpu%\w2k" component="base" />
-    <File name="netidmgr.pdb"   from="staging\bin\%cpu%\w2k"     to="\bin\%cpu%\w2k" component="base" />
-    <File name="nidmgr32.dll"   from="staging\bin\%cpu%\w2k"     to="\bin\%cpu%\w2k" component="base" />
-    <File name="nidmgr32.pdb"   from="staging\bin\%cpu%\w2k"     to="\bin\%cpu%\w2k" component="base" />
-	</Files>
\ No newline at end of file
+		<File name="netidmgr.exe"   from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" component="base" />
+    <File name="netidmgr.pdb"   from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" component="base" />
+    <File name="nidmgr%WL%.dll" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" component="base" />
+    <File name="nidmgr%WL%.pdb" from="staging\bin\%cpu%\w2k" to="\bin\%cpu%\w2k" component="base" />
+	</Files>