Commit bff86566 authored by unknown's avatar unknown

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
parent 22b62cd3
@echo off @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 del cmakecache.txt
copy win\vs71cache.txt cmakecache.txt copy win\vs71cache.txt cmakecache.txt
cmake -G "Visual Studio 7 .NET 2003" cmake -G "Visual Studio 7 .NET 2003"
......
@echo off @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 del cmakecache.txt
copy win\vs8cache.txt cmakecache.txt copy win\vs8cache.txt cmakecache.txt
cmake -G "Visual Studio 8 2005" cmake -G "Visual Studio 8 2005"
......
PROJECT(MySql) 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_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996 -D_DEBUG")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996 -D_DEBUG") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996 -D_DEBUG")
......
...@@ -70,14 +70,14 @@ ADD_CUSTOM_COMMAND( ...@@ -70,14 +70,14 @@ ADD_CUSTOM_COMMAND(
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
SOURCE ${CMAKE_SOURCE_DIR}/include/mysql_version.h.in SOURCE ${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
OUTPUT ${CMAKE_SOURCE_DIR}/include/mysql_version.h 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) DEPENDS ${CMAKE_SOURCE_DIR}/include/mysql_version.h.in)
# Handlerton file # Handlerton file
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
SOURCE ${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in SOURCE ${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in
OUTPUT ${CMAKE_SOURCE_DIR}/sql/handlerton.cc 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) DEPENDS ${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in)
# Error file # Error file
......
...@@ -11,7 +11,7 @@ try ...@@ -11,7 +11,7 @@ try
var args = WScript.Arguments 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++) for (i=0; i < args.Count(); i++)
{ {
configfile.WriteLine(args.Item(i)); configfile.WriteLine(args.Item(i));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment