From 80159117f3b5eaf259fc23f40ac3f7fa9083c33a Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Fri, 23 May 2014 00:18:38 +0400
Subject: [PATCH] Fix travis build error (race condition between src/ and
box/).
---
.gitignore | 2 +-
src/CMakeLists.txt | 3 ---
src/box/CMakeLists.txt | 5 ++++-
src/{ => box}/bootstrap.snap | Bin
4 files changed, 5 insertions(+), 5 deletions(-)
rename src/{ => box}/bootstrap.snap (100%)
diff --git a/.gitignore b/.gitignore
index f5b067bc7e..ed0a5d2a42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@ extra/rpm.spec
src/trivia/config.h
install_manifest.txt
lcov
-src/bootstrap.h
+src/box/bootstrap.h
src/lua/*.lua.c
src/box/lua/*.lua.c
src/tarantool
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index abcd7fcbeb..ac07d96088 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,8 +26,6 @@ lua_source(lua_sources lua/bsdsocket.lua)
lua_source(lua_sources lua/errno.lua)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/third_party/luafun)
lua_source(lua_sources ../third_party/luafun/fun.lua)
-set(bin_sources)
-bin_source(bin_sources bootstrap.snap bootstrap.h)
add_custom_target(generate_lua_sources
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/box
@@ -88,7 +86,6 @@ set (common_sources
lua/errno.c
lua/bsdsocket.cc
${lua_sources}
- ${bin_sources}
)
if (ENABLE_TRACE)
diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt
index 04e4ffff9c..68fdeda8c4 100644
--- a/src/box/CMakeLists.txt
+++ b/src/box/CMakeLists.txt
@@ -8,6 +8,8 @@ lua_source(lua_sources lua/box.lua)
lua_source(lua_sources lua/box_net.lua)
lua_source(lua_sources lua/misc.lua)
lua_source(lua_sources lua/tuple.lua)
+set(bin_sources)
+bin_source(bin_sources bootstrap.snap bootstrap.h)
add_custom_target(box_generate_lua_sources
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/box
@@ -47,4 +49,5 @@ add_library(box
lua/tuple.cc
lua/slab.cc
lua/index.cc
- lua/space.cc)
+ lua/space.cc
+ ${bin_sources})
diff --git a/src/bootstrap.snap b/src/box/bootstrap.snap
similarity index 100%
rename from src/bootstrap.snap
rename to src/box/bootstrap.snap
--
GitLab