Many files:

  New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver


VC++Files/mysqlserver/dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
VC++Files/bdb/bdb.vcproj:
  New VC7 project files
VC++Files/client/mysql.vcproj:
  New VC7 project files
VC++Files/client/mysqladmin.vcproj:
  New VC7 project files
VC++Files/client/mysqlclient.vcproj:
  New VC7 project files
VC++Files/client/mysqldump.vcproj:
  New VC7 project files
VC++Files/client/mysqlimport.vcproj:
  New VC7 project files
VC++Files/client/mysqlshow.vcproj:
  New VC7 project files
VC++Files/client/mysqltest.vcproj:
  New VC7 project files
VC++Files/comp_err/comp_err.vcproj:
  New VC7 project files
VC++Files/dbug/dbug.vcproj:
  New VC7 project files
VC++Files/heap/heap.vcproj:
  New VC7 project files
VC++Files/innobase/innobase.vcproj:
  New VC7 project files
VC++Files/libmysql/libmysql.vcproj:
  New VC7 project files
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqld/libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqltest/myTest.vcproj:
  New VC7 project files
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  New VC7 project files
VC++Files/myisam/myisam.vcproj:
  New VC7 project files
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  New VC7 project files
VC++Files/myisamchk/myisamchk.vcproj:
  New VC7 project files
VC++Files/myisamlog/myisamlog.vcproj:
  New VC7 project files
VC++Files/myisammrg/myisammrg.vcproj:
  New VC7 project files
VC++Files/myisampack/myisampack.vcproj:
  New VC7 project files
VC++Files/mysql-test/mysql_test_run_new.vcproj:
  New VC7 project files
VC++Files/mysql.sln:
  New VC7 project files
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  New VC7 project files
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  New VC7 project files
VC++Files/mysqldemb/mysqldemb.vcproj:
  New VC7 project files
VC++Files/mysqlserver/mysqlserver.vcproj:
  New VC7 project files
VC++Files/mysys/mysys.vcproj:
  New VC7 project files
VC++Files/perror/perror.vcproj:
  New VC7 project files
VC++Files/regex/regex.vcproj:
  New VC7 project files
VC++Files/replace/replace.vcproj:
  New VC7 project files
VC++Files/sql/mysqld.vcproj:
  New VC7 project files
VC++Files/strings/strings.vcproj:
  New VC7 project files
VC++Files/test1/test1.vcproj:
  New VC7 project files
VC++Files/tests/mysql_client_test.vcproj:
  New VC7 project files
VC++Files/thr_test/thr_test.vcproj:
  New VC7 project files
VC++Files/vio/vio.vcproj:
  New VC7 project files
VC++Files/zlib/zlib.vcproj:
  New VC7 project files
client/mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
sql/des_key_file.cc:
  Visual C++ wants '"' for local include
scripts/make_win_src_distribution.sh:
  New VC7 project files

1 files changed, 10 insertions, 6 deletions

diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index 71d61b7a02d..15e9b106da8 100644
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -199,11 +199,10 @@ copy_dir_files()
        print_debug "Creating directory '$arg'"
        mkdir $BASE/$arg
      fi
-    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp \
-             README INSTALL* LICENSE *.inc *.test *.result \
-	     *.pem Moscow_leap des_key_file *.dat *.000001 \
-	     *.require *.opt
-
+    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp *.dsw \
+             README INSTALL* LICENSE AUTHORS NEWS ChangeLog \
+             *.inc *.test *.result *.pem Moscow_leap des_key_file \
+             *.vcproj *.sln *.dat *.000001 *.require *.opt
     do
       if [ -f $i ]
       then
@@ -234,6 +233,7 @@ copy_dir_dirs() {
     find $arg -type d \
               -and -not -path \*SCCS\* \
               -and -not -path \*.deps\* \
+              -and -not -path \*.libs\* \
               -and -not -path \*autom4te.cache -print
     )|(
       while read v
@@ -326,6 +326,8 @@ do
       $CP -R $i $BASE/$i
     fi
   fi
+  # But remove object files from destination
+  find $BASE/$i -type f -name \*.o | xargs rm -f
 done
 
 #
@@ -339,7 +341,9 @@ mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp
 # Search the tree for plain text files and adapt the line end marker
 #
 find $BASE \( -name "*.dsp" -o -name "*.dsw" -o -name "*.cnf" -o -name "*.ini" \
-           -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \) -type f -print \
+           -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \
+           -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \
+           -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \
 | while read v
   do
     unix_to_dos $v