mysql-copyright -> more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD).

Servers.fgl -> made sure all charset files were accounted for (cp 1256 was missing)


Build-tools/mysql-copyright:
  more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD).
VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl:
  made sure all charset files were accounted for (cp 1256 was missing)
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl:
  made sure all charset files were accounted for (cp 1256 was missing)
VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl:
  made sure all charset files were accounted for (cp 1256 was missing)

4 files changed, 179 insertions, 92 deletions

diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright
index dbe494b8aab..1906675d470 100755
--- a/Build-tools/mysql-copyright
+++ b/Build-tools/mysql-copyright
@@ -12,11 +12,12 @@ use Getopt::Long;
 
 $opt_help    = 0;
 $opt_version = 0;
+$opt_verbose = 0;
 $opt_target  = "mysql-copyright-target-";
 $opt_target .= `date +%d%m%y-%H%M%S`;
 chop $opt_target;
 
-GetOptions("help","version","target=s") || error();
+GetOptions("help","version","target=s", "verbose") || error();
 
 # fix the directory prefix for target dir
 
@@ -68,15 +69,12 @@ sub main
     }
     # if the distfile is mysql-3.22.22-alpha.tar.gz, then
     # distname is 'mysql-3.22.22-alpha' and suffix '.tar.gz'
-    print "distfile $distfile\n";
     if ($distfile =~
       m/^($REG_BASENAME)([\-\_])($REG_VERSION){1}([\.\-\+]\w+\-\w+)?[\.\-\+](.*)?$/xo) 
     {
       $distname= $1.$2.$3;
-      print "distname $distname\n";
       $suffix= $5;
       $fileext = $6;
-      print "suffix $suffix fileext $fileext\n";
       $newdistname= $1."com".$2.$3;
       $newdistname .= $suffix if $win_flag;
     }
@@ -84,8 +82,6 @@ sub main
     chomp($destdir= `tar ztf ../$distfile | head -1`);
     # remove slash from the end
     $destdir= substr($destdir, 0, -1);
-		print "destdir: $destdir\n";
-		print "distname: $distname\n";
     
     if ("$destdir" ne "$distname")
     {
@@ -110,24 +106,32 @@ sub main
     # remove readline subdir and update configure accordingly
     system("rm -rf $destdir/cmd-line-utils/readline");
     if ($win_flag) {
-      #`(cd $destdir)`;
-      'cd $destdir';
+      chdir("$destdir") or (print "$! Unable to change directory to $destdir!\n" && exit(0));
     } else {
-      unlink ("$destdir/configure") or die "Can't delete $destdir/configure: $!\n";
-      `(cd $destdir ; sed -e 's!\ cmd-line-utils\/readline\/Makefile\ dnl!!g' < configure.in > configure.in.new)`;
-      rename ("$destdir/configure.in.new","$destdir/configure.in") or die "Can't rename $destdir/configure.in.new: $!\n";;
-      `(cd $destdir ; autoconf)`;
+      chdir("$destdir");
+      unlink ("configure") or die "Can't delete $destdir/configure: $!\n";
+      open(CONFIGURE,"<configure.in") or die "$! Unable to open configure.in to read from!\n";
+      undef $/;
+      my $configure = <CONFIGURE>;
+      close(CONFIGURE);
+      $configure =~ s|cmd\-line\-utils/readline/Makefile dnl\n?||g;
+      open(CONFIGURE,">configure.in") or die "$! Unable to open configure.in to write to!\n";
+      print CONFIGURE $configure;
+      close(CONFIGURE);
+      `autoconf`;
+      if (! -f "configure") {
+        print "\"./configure\" was not produced, exiting!\n";
+        exit(0);
+      }
     }
 
     # fix file copyrights
     &fix_usage_copyright();
     &add_copyright();
     
-    #chdir("..");
-    my $cwd = `pwd`;
-    print "current dir is $cwd\n" ;
     # rename the directory with new distribution name
-    print "renaming $destdir $newdistname\n"; 
+    chdir("$WD/$dir");
+    print "renaming $destdir $newdistname\n" if $opt_verbose; 
     rename($destdir, $newdistname);
     
     # tar the new distribution
@@ -137,9 +141,20 @@ sub main
   
     # remove temporary directory
     chdir($WD) or print "$! Unable to move up one dir\n";
-    print "deleting temp dir $dir\n"; 
-    if (-d "$WD/$dir") {
-      system("rm -rf $WD/$dir") or print "$! Unable to delete $WD/$dir!\n";
+    `cd $WD`;
+    my $cwd = getcwd();
+    print "current dir is $cwd\n" if $opt_verbose ;
+    if (-e $dir) {
+      print "Trying to delete $dir\n" if $opt_verbose;
+      if ( system("rm -rf $dir")){ 
+        print "$! Unable to delete $dir!\n";
+      }
+    }
+    if (-e $opt_target) {
+      print "Trying to delete $opt_target\n" if $opt_verbose;
+      if ( system("rm -rf $opt_target")) {
+        print "$! Unable to delete $opt_target!\n";
+      }
     }
 
   }
@@ -157,7 +172,7 @@ sub fix_usage_copyright
   foreach my $Cfile (@Cfiles)
   {
     chop $Cfile;
-    `replace "This is free software," "This is commercial software," "and you are welcome to modify and redistribute it under the GPL license" "please see the file MySQLEULA.txt for details" -- "$Cfile"`;
+    `replace "This is free software," "This is commercial software," "and you are welcome to modify and redistribute it under the GPL license" "please see the file MySQLEULA.txt for details" -- "$Cfile"` if -f $Cfile; 
   }
 }
 
diff --git a/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl b/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
index 8a626c56253..b51c37f8db2 100755
--- a/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
+++ b/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
@@ -41,31 +41,55 @@ file1=C:\mysql\share\korean\errmsg.txt
 fulldirectory=
 
 [share\charsets]
-file15=C:\mysql\share\charsets\latin1.conf
-file16=C:\mysql\share\charsets\latin2.conf
-file0=C:\mysql\share\charsets\win1251ukr.conf
-file17=C:\mysql\share\charsets\latin5.conf
+file0=C:\mysql\share\charsets\cp1250.xml
+file1=C:\mysql\share\charsets\cp1251.conf
+file2=C:\mysql\share\charsets\cp1251.xml
+file3=C:\mysql\share\charsets\cp1256.xml
 file1=C:\mysql\share\charsets\cp1257.conf
-file18=C:\mysql\share\charsets\Readme
-file2=C:\mysql\share\charsets\croat.conf
-file19=C:\mysql\share\charsets\swe7.conf
-file3=C:\mysql\share\charsets\danish.conf
-file4=C:\mysql\share\charsets\dec8.conf
-file5=C:\mysql\share\charsets\dos.conf
-file6=C:\mysql\share\charsets\estonia.conf
-file7=C:\mysql\share\charsets\german1.conf
-file8=C:\mysql\share\charsets\greek.conf
-file9=C:\mysql\share\charsets\hebrew.conf
-file20=C:\mysql\share\charsets\usa7.conf
-file21=C:\mysql\share\charsets\win1250.conf
-file10=C:\mysql\share\charsets\hp8.conf
-fulldirectory=
-file22=C:\mysql\share\charsets\win1251.conf
-file11=C:\mysql\share\charsets\hungarian.conf
-file23=C:\mysql\share\charsets\cp1251.conf
-file12=C:\mysql\share\charsets\Index
-file13=C:\mysql\share\charsets\koi8_ru.conf
-file14=C:\mysql\share\charsets\koi8_ukr.conf
+file4=C:\mysql\share\charsets\cp1257.xml
+file5=C:\mysql\share\charsets\cp850.xml
+file6=C:\mysql\share\charsets\cp852.xml
+file7=C:\mysql\share\charsets\cp866.xml
+file8=C:\mysql\share\charsets\croat.conf
+file9=C:\mysql\share\charsets\danish.conf
+file10=C:\mysql\share\charsets\dec8.conf
+file10=C:\mysql\share\charsets\dec8.xml
+file11=C:\mysql\share\charsets\dos.conf
+file12=C:\mysql\share\charsets\estonia.conf
+file13=C:\mysql\share\charsets\geostd8.xml
+file14=C:\mysql\share\charsets\german1.conf
+file15=C:\mysql\share\charsets\greek.xml
+file16=C:\mysql\share\charsets\greek.conf
+file17=C:\mysql\share\charsets\hebrew.xml
+file18=C:\mysql\share\charsets\hebrew.conf
+file19=C:\mysql\share\charsets\hp8.xml
+file20=C:\mysql\share\charsets\hp8.conf
+file21=C:\mysql\share\charsets\hungarian.conf
+file22=C:\mysql\share\charsets\keybcs2.xml
+file23=C:\mysql\share\charsets\koi8_ru.conf
+file24=C:\mysql\share\charsets\koi8_ukr.conf
+file25=C:\mysql\share\charsets\koi8r.xml
+file26=C:\mysql\share\charsets\koi8u.xml
+file27=C:\mysql\share\charsets\latin1.conf
+file28=C:\mysql\share\charsets\latin1.xml
+file29=C:\mysql\share\charsets\latin2.conf
+file30=C:\mysql\share\charsets\latin2.xml
+file31=C:\mysql\share\charsets\latin5.conf
+file32=C:\mysql\share\charsets\latin5.xml
+file33=C:\mysql\share\charsets\latin7.xml
+file34=C:\mysql\share\charsets\macce.xml
+file35=C:\mysql\share\charsets\macroman.xml
+file36=C:\mysql\share\charsets\swe7.conf
+file37=C:\mysql\share\charsets\swe7.xml
+file38=C:\mysql\share\charsets\usa7.conf
+file39=C:\mysql\share\charsets\win1250.conf
+file40=C:\mysql\share\charsets\win1251ukr.conf
+file41=C:\mysql\share\charsets\win1251.conf
+file42=C:\mysql\share\charsets\Index
+file43=C:\mysql\share\charsets\Index.xml
+file44=C:\mysql\share\charsets\Readme
+file45=C:\mysql\share\charsets\languages.html
+fulldirectory=
 
 [Embedded\DLL\debug]
 file0=C:\mysql\embedded\DLL\debug\libmysqld.dll
diff --git a/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl b/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
index c54ff378a55..6564512de2c 100755
--- a/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
+++ b/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
@@ -43,31 +43,55 @@ file1=C:\mysql\share\korean\errmsg.txt
 fulldirectory=
 
 [share\charsets]
-file15=C:\mysql\share\charsets\latin1.conf
-file16=C:\mysql\share\charsets\latin2.conf
-file0=C:\mysql\share\charsets\win1251ukr.conf
-file17=C:\mysql\share\charsets\latin5.conf
+file0=C:\mysql\share\charsets\cp1250.xml
+file1=C:\mysql\share\charsets\cp1251.conf
+file2=C:\mysql\share\charsets\cp1251.xml
+file3=C:\mysql\share\charsets\cp1256.xml
 file1=C:\mysql\share\charsets\cp1257.conf
-file18=C:\mysql\share\charsets\Readme
-file2=C:\mysql\share\charsets\croat.conf
-file19=C:\mysql\share\charsets\swe7.conf
-file3=C:\mysql\share\charsets\danish.conf
-file4=C:\mysql\share\charsets\dec8.conf
-file5=C:\mysql\share\charsets\dos.conf
-file6=C:\mysql\share\charsets\estonia.conf
-file7=C:\mysql\share\charsets\german1.conf
-file8=C:\mysql\share\charsets\greek.conf
-file9=C:\mysql\share\charsets\hebrew.conf
-file20=C:\mysql\share\charsets\usa7.conf
-file21=C:\mysql\share\charsets\win1250.conf
-file10=C:\mysql\share\charsets\hp8.conf
-fulldirectory=
-file22=C:\mysql\share\charsets\win1251.conf
-file11=C:\mysql\share\charsets\hungarian.conf
-file23=C:\mysql\share\charsets\cp1251.conf
-file12=C:\mysql\share\charsets\Index
-file13=C:\mysql\share\charsets\koi8_ru.conf
-file14=C:\mysql\share\charsets\koi8_ukr.conf
+file4=C:\mysql\share\charsets\cp1257.xml
+file5=C:\mysql\share\charsets\cp850.xml
+file6=C:\mysql\share\charsets\cp852.xml
+file7=C:\mysql\share\charsets\cp866.xml
+file8=C:\mysql\share\charsets\croat.conf
+file9=C:\mysql\share\charsets\danish.conf
+file10=C:\mysql\share\charsets\dec8.conf
+file10=C:\mysql\share\charsets\dec8.xml
+file11=C:\mysql\share\charsets\dos.conf
+file12=C:\mysql\share\charsets\estonia.conf
+file13=C:\mysql\share\charsets\geostd8.xml
+file14=C:\mysql\share\charsets\german1.conf
+file15=C:\mysql\share\charsets\greek.xml
+file16=C:\mysql\share\charsets\greek.conf
+file17=C:\mysql\share\charsets\hebrew.xml
+file18=C:\mysql\share\charsets\hebrew.conf
+file19=C:\mysql\share\charsets\hp8.xml
+file20=C:\mysql\share\charsets\hp8.conf
+file21=C:\mysql\share\charsets\hungarian.conf
+file22=C:\mysql\share\charsets\keybcs2.xml
+file23=C:\mysql\share\charsets\koi8_ru.conf
+file24=C:\mysql\share\charsets\koi8_ukr.conf
+file25=C:\mysql\share\charsets\koi8r.xml
+file26=C:\mysql\share\charsets\koi8u.xml
+file27=C:\mysql\share\charsets\latin1.conf
+file28=C:\mysql\share\charsets\latin1.xml
+file29=C:\mysql\share\charsets\latin2.conf
+file30=C:\mysql\share\charsets\latin2.xml
+file31=C:\mysql\share\charsets\latin5.conf
+file32=C:\mysql\share\charsets\latin5.xml
+file33=C:\mysql\share\charsets\latin7.xml
+file34=C:\mysql\share\charsets\macce.xml
+file35=C:\mysql\share\charsets\macroman.xml
+file36=C:\mysql\share\charsets\swe7.conf
+file37=C:\mysql\share\charsets\swe7.xml
+file38=C:\mysql\share\charsets\usa7.conf
+file39=C:\mysql\share\charsets\win1250.conf
+file40=C:\mysql\share\charsets\win1251ukr.conf
+file41=C:\mysql\share\charsets\win1251.conf
+file42=C:\mysql\share\charsets\Index
+file43=C:\mysql\share\charsets\Index.xml
+file44=C:\mysql\share\charsets\Readme
+file45=C:\mysql\share\charsets\languages.html
+fulldirectory=
 
 [Embedded\DLL\debug]
 file0=C:\mysql\embedded\DLL\debug\libmysqld.dll
diff --git a/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl b/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
index 8a626c56253..b51c37f8db2 100755
--- a/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
+++ b/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
@@ -41,31 +41,55 @@ file1=C:\mysql\share\korean\errmsg.txt
 fulldirectory=
 
 [share\charsets]
-file15=C:\mysql\share\charsets\latin1.conf
-file16=C:\mysql\share\charsets\latin2.conf
-file0=C:\mysql\share\charsets\win1251ukr.conf
-file17=C:\mysql\share\charsets\latin5.conf
+file0=C:\mysql\share\charsets\cp1250.xml
+file1=C:\mysql\share\charsets\cp1251.conf
+file2=C:\mysql\share\charsets\cp1251.xml
+file3=C:\mysql\share\charsets\cp1256.xml
 file1=C:\mysql\share\charsets\cp1257.conf
-file18=C:\mysql\share\charsets\Readme
-file2=C:\mysql\share\charsets\croat.conf
-file19=C:\mysql\share\charsets\swe7.conf
-file3=C:\mysql\share\charsets\danish.conf
-file4=C:\mysql\share\charsets\dec8.conf
-file5=C:\mysql\share\charsets\dos.conf
-file6=C:\mysql\share\charsets\estonia.conf
-file7=C:\mysql\share\charsets\german1.conf
-file8=C:\mysql\share\charsets\greek.conf
-file9=C:\mysql\share\charsets\hebrew.conf
-file20=C:\mysql\share\charsets\usa7.conf
-file21=C:\mysql\share\charsets\win1250.conf
-file10=C:\mysql\share\charsets\hp8.conf
-fulldirectory=
-file22=C:\mysql\share\charsets\win1251.conf
-file11=C:\mysql\share\charsets\hungarian.conf
-file23=C:\mysql\share\charsets\cp1251.conf
-file12=C:\mysql\share\charsets\Index
-file13=C:\mysql\share\charsets\koi8_ru.conf
-file14=C:\mysql\share\charsets\koi8_ukr.conf
+file4=C:\mysql\share\charsets\cp1257.xml
+file5=C:\mysql\share\charsets\cp850.xml
+file6=C:\mysql\share\charsets\cp852.xml
+file7=C:\mysql\share\charsets\cp866.xml
+file8=C:\mysql\share\charsets\croat.conf
+file9=C:\mysql\share\charsets\danish.conf
+file10=C:\mysql\share\charsets\dec8.conf
+file10=C:\mysql\share\charsets\dec8.xml
+file11=C:\mysql\share\charsets\dos.conf
+file12=C:\mysql\share\charsets\estonia.conf
+file13=C:\mysql\share\charsets\geostd8.xml
+file14=C:\mysql\share\charsets\german1.conf
+file15=C:\mysql\share\charsets\greek.xml
+file16=C:\mysql\share\charsets\greek.conf
+file17=C:\mysql\share\charsets\hebrew.xml
+file18=C:\mysql\share\charsets\hebrew.conf
+file19=C:\mysql\share\charsets\hp8.xml
+file20=C:\mysql\share\charsets\hp8.conf
+file21=C:\mysql\share\charsets\hungarian.conf
+file22=C:\mysql\share\charsets\keybcs2.xml
+file23=C:\mysql\share\charsets\koi8_ru.conf
+file24=C:\mysql\share\charsets\koi8_ukr.conf
+file25=C:\mysql\share\charsets\koi8r.xml
+file26=C:\mysql\share\charsets\koi8u.xml
+file27=C:\mysql\share\charsets\latin1.conf
+file28=C:\mysql\share\charsets\latin1.xml
+file29=C:\mysql\share\charsets\latin2.conf
+file30=C:\mysql\share\charsets\latin2.xml
+file31=C:\mysql\share\charsets\latin5.conf
+file32=C:\mysql\share\charsets\latin5.xml
+file33=C:\mysql\share\charsets\latin7.xml
+file34=C:\mysql\share\charsets\macce.xml
+file35=C:\mysql\share\charsets\macroman.xml
+file36=C:\mysql\share\charsets\swe7.conf
+file37=C:\mysql\share\charsets\swe7.xml
+file38=C:\mysql\share\charsets\usa7.conf
+file39=C:\mysql\share\charsets\win1250.conf
+file40=C:\mysql\share\charsets\win1251ukr.conf
+file41=C:\mysql\share\charsets\win1251.conf
+file42=C:\mysql\share\charsets\Index
+file43=C:\mysql\share\charsets\Index.xml
+file44=C:\mysql\share\charsets\Readme
+file45=C:\mysql\share\charsets\languages.html
+fulldirectory=
 
 [Embedded\DLL\debug]
 file0=C:\mysql\embedded\DLL\debug\libmysqld.dll