maria-developers team mailing list archive
-
maria-developers team
-
Mailing list archive
-
Message #03370
Re: [Commits] Rev 2817: Make MariaDB compile with VS 2010 in file:///Users/hakan/work/monty_program/maria-5.2/
On 24.06.2010, at 13:39, Kristian Nielsen wrote:
> Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx> writes:
>
>> === modified file 'sql/CMakeLists.txt'
>> --- a/sql/CMakeLists.txt 2010-06-01 19:52:20 +0000
>> +++ b/sql/CMakeLists.txt 2010-06-24 10:44:39 +0000
>> @@ -17,8 +17,7 @@
>> SET(CMAKE_CXX_FLAGS_DEBUG
>> "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
>> SET(CMAKE_C_FLAGS_DEBUG
>> - "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
>> -SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /MAP /MAPINFO:EXPORTS")
>> + "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
>
> Avoid making spurious whitespace-only changes like this (added space at end of line).
Thanks for pointing this out. I did not make it on purpose. Maybe it happened
while copying from the Windows machine.
[cut]
>>
>> === added file 'win/build-vs10_x64.bat'
>> --- a/win/build-vs10_x64.bat 1970-01-01 00:00:00 +0000
>> +++ b/win/build-vs10_x64.bat 2010-06-24 10:44:39 +0000
>> @@ -0,0 +1,18 @@
>> +@echo off
>> +
>> +REM Copyright (C) 2010 Monty Program AB
>> +REM
>> +REM This program is free software; you can redistribute it and/or modify
>> +REM it under the terms of the GNU General Public License as published by
>> +REM the Free Software Foundation; version 2 of the License.
>> +REM
>> +REM This program is distributed in the hope that it will be useful,
>> +REM but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> +REM GNU General Public License for more details.
>> +REM
>> +REM You should have received a copy of the GNU General Public License
>> +REM along with this program; if not, write to the Free Software
>> +REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
>> +cmake -G "Visual Studio 10 Win64"
>> +
>
> You need to add these new files to EXTRA_DIST in Makefile.am.
>
Good to know, I will add it.
>> === modified file 'win/configure-mariadb.sh'
>> --- a/win/configure-mariadb.sh 2009-10-08 19:04:12 +0000
>> +++ b/win/configure-mariadb.sh 2010-06-24 10:44:39 +0000
>> @@ -15,9 +15,7 @@
>> WITH_FEDERATED_STORAGE_ENGINE \
>> WITH_MERGE_STORAGE_ENGINE \
>> WITH_PARTITION_STORAGE_ENGINE \
>> - WITH_MARIA_STORAGE_ENGINE \
>> - WITH_PBXT_STORAGE_ENGINE \
>> - WITH_XTRADB_STORAGE_ENGINE \
>> + WITH_MARIA_STORAGE_ENGINE \
>> + WITH_PBXT_STORAGE_ENGINE \
>> + WITH_XTRADB_STORAGE_ENGINE \
>> WITH_EMBEDDED_SERVER
>> -
>> -
>
> Why?
It looks more consistent to me. Maybe also: why are those lines indented?
Best,
Hakan
--
Hakan Küçükyılmaz, QA/Benchmark Engineer, Stuttgart/Germany
Monty Program Ab, http://askmonty.org/
Skype: hakank_ Phone: +49 171 1919839
References