mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  linux.site:/home/marty/MySQL/mysql-5.1-new
This commit is contained in:
marty@linux.site 2006-01-31 20:11:42 +01:00
commit 902ec857ce
5 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
win/build-vs71.bat
View file

@ -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"

7
win/build-vs8.bat
View file

@ -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"

2
win/cmakefiles/base
View file

@ -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")

4
win/cmakefiles/sql
View file

@ -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

2
win/configure.js
View file

@ -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));