Commit 6609e38a authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  linux.site:/home/marty/MySQL/mysql-5.1-new
parents 75322f8d e886b892

win/build-vs71.bat

+6 −1
Original line number Diff line number Diff line 
@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"

win/build-vs8.bat

+6 −1
Original line number Diff line number Diff line 
@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"

win/cmakefiles/base

+1 −1
Original line number Diff line number Diff line 
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")

win/cmakefiles/sql

+2 −2
Original line number Diff line number Diff line
@@ -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

win/configure.js

+1 −1
Original line number Diff line number Diff line
@@ -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));