a few corrections necessary for the win32 folder rename

win/build-vs71.bat:
  fixed call out to deploy.bat
win/build-vs8.bat:
  fixed call out to deploy.bat
win/cmakefiles/base:
  changed win32 to win
win/cmakefiles/sql:
  use proper win folder for path
win/configure.js:
  this file should be called from the root so we need to use the path

5 files changed, 16 insertions, 6 deletions

diff --git a/win/build-vs71.bat b/win/build-vs71.bat
index d9a347af192..db92d9c3b72 100644
--- a/win/build-vs71.bat
+++ b/win/build-vs71.bat
@@ -1,5 +1,10 @@
 @echo off
-win\cmakefiles\deploy
+
+REM - First we need to copy all the cmakelists to the proper folders
+cd win\cmakefiles
+call deploy.bat
+cd ..\..
+
 del cmakecache.txt
 copy win\vs71cache.txt cmakecache.txt
 cmake -G "Visual Studio 7 .NET 2003"
diff --git a/win/build-vs8.bat b/win/build-vs8.bat
index e464fa7f012..54789b16503 100644
--- a/win/build-vs8.bat
+++ b/win/build-vs8.bat
@@ -1,5 +1,10 @@
 @echo off
-win\cmakefiles\deploy
+
+REM - First we need to copy all the cmakelists to the proper folders
+cd win\cmakefiles
+call deploy.bat
+cd ..\..
+
 del cmakecache.txt
 copy win\vs8cache.txt cmakecache.txt
 cmake -G "Visual Studio 8 2005"
diff --git a/win/cmakefiles/base b/win/cmakefiles/base
index 13108648d5f..20f9307e79c 100644
--- a/win/cmakefiles/base
+++ b/win/cmakefiles/base
@@ -1,6 +1,6 @@
 PROJECT(MySql)
 
-EXEC_PROGRAM(cscript.exe win32 ARGS config-version.js OUT_VARIABLE out)
+EXEC_PROGRAM(cscript.exe win ARGS config-version.js OUT_VARIABLE out)
 
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996 -D_DEBUG")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996 -D_DEBUG")
diff --git a/win/cmakefiles/sql b/win/cmakefiles/sql
index b6161c5cf50..f583b6f8dee 100644
--- a/win/cmakefiles/sql
+++ b/win/cmakefiles/sql
@@ -70,14 +70,14 @@ ADD_CUSTOM_COMMAND(
 ADD_CUSTOM_COMMAND(
 	SOURCE ${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
 	OUTPUT ${CMAKE_SOURCE_DIR}/include/mysql_version.h
-	COMMAND ${CMAKE_SOURCE_DIR}/win32/config-version.js
+	COMMAND ${CMAKE_SOURCE_DIR}/win/config-version.js
 	DEPENDS ${CMAKE_SOURCE_DIR}/include/mysql_version.h.in)
 
 # Handlerton file
 ADD_CUSTOM_COMMAND(
 	SOURCE ${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in
 	OUTPUT ${CMAKE_SOURCE_DIR}/sql/handlerton.cc
-	COMMAND ${CMAKE_SOURCE_DIR}/win32/config-handlerton.js ARGS ${CMAKE_SOURCE_DIR}/win32/configure.data
+	COMMAND ${CMAKE_SOURCE_DIR}/win/config-handlerton.js ARGS ${CMAKE_SOURCE_DIR}/win/configure.data
 	DEPENDS ${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in)
 
 # Error file
diff --git a/win/configure.js b/win/configure.js
index c82e62941d7..b1c269d4eed 100644
--- a/win/configure.js
+++ b/win/configure.js
@@ -11,7 +11,7 @@ try
     
 	var args = WScript.Arguments
 	
-    var configfile = fso.CreateTextFile("configure.data", true);
+    var configfile = fso.CreateTextFile("win\\configure.data", true);
     for (i=0; i < args.Count(); i++)
     {
 		configfile.WriteLine(args.Item(i));