From fe4cb9465d508ad9079c42a98815e4a986781061 Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Fri, 30 Aug 2013 18:43:46 +0400
Subject: [PATCH] lua-plus-dict: remove lua_ prefix from lua_ipc and lua_socket
files.
---
src/lua/lua_ipc.h => include/lua/ipc.h | 0
src/lua/lua_socket.h => include/lua/socket.h | 0
src/CMakeLists.txt | 4 ++--
src/box/lua/misc.lua | 2 --
src/lua/init.cc | 4 ++--
src/lua/{lua_ipc.cc => ipc.cc} | 2 +-
src/lua/{lua_socket.cc => socket.cc} | 2 +-
test/CMakeLists.txt | 1 -
8 files changed, 6 insertions(+), 9 deletions(-)
rename src/lua/lua_ipc.h => include/lua/ipc.h (100%)
rename src/lua/lua_socket.h => include/lua/socket.h (100%)
rename src/lua/{lua_ipc.cc => ipc.cc} (99%)
rename src/lua/{lua_socket.cc => socket.cc} (99%)
diff --git a/src/lua/lua_ipc.h b/include/lua/ipc.h
similarity index 100%
rename from src/lua/lua_ipc.h
rename to include/lua/ipc.h
diff --git a/src/lua/lua_socket.h b/include/lua/socket.h
similarity index 100%
rename from src/lua/lua_socket.h
rename to include/lua/socket.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b3c2cec6cc..9a6678d780 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,8 +115,8 @@ set (common_sources
lua/errinj.cc
lua/slab.cc
lua/plugin.cc
- lua/lua_ipc.cc
- lua/lua_socket.cc
+ lua/ipc.cc
+ lua/socket.cc
lua/session.cc
lua/cjson.cc
lua/yaml.cc
diff --git a/src/box/lua/misc.lua b/src/box/lua/misc.lua
index 55e6da7aa0..de7bd29fdf 100644
--- a/src/box/lua/misc.lua
+++ b/src/box/lua/misc.lua
@@ -80,8 +80,6 @@ function help()
"box.slab.check()",
"box.fiber.info()",
"box.plugin.info()",
- "box.errinj.info()",
- "box.errinj.set()",
"box.cfg()",
"box.cfg_reload()",
"box.coredump()"
diff --git a/src/lua/init.cc b/src/lua/init.cc
index 9beee872c7..5b197d5978 100644
--- a/src/lua/init.cc
+++ b/src/lua/init.cc
@@ -50,8 +50,8 @@ extern "C" {
#include "lua/fiber.h"
#include "lua/admin.h"
#include "lua/errinj.h"
-#include "lua_ipc.h"
-#include "lua_socket.h"
+#include "lua/ipc.h"
+#include "lua/socket.h"
#include "lua/info.h"
#include "lua/slab.h"
#include "lua/stat.h"
diff --git a/src/lua/lua_ipc.cc b/src/lua/ipc.cc
similarity index 99%
rename from src/lua/lua_ipc.cc
rename to src/lua/ipc.cc
index da40956ca6..86799b5372 100644
--- a/src/lua/lua_ipc.cc
+++ b/src/lua/ipc.cc
@@ -26,7 +26,6 @@
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include "lua_ipc.h"
#include <stdlib.h>
@@ -37,6 +36,7 @@ extern "C" {
} /* extern "C" */
#include "ipc.h"
+#include "lua/ipc.h"
#include "lua/init.h"
static const char channel_lib[] = "box.ipc.channel";
diff --git a/src/lua/lua_socket.cc b/src/lua/socket.cc
similarity index 99%
rename from src/lua/lua_socket.cc
rename to src/lua/socket.cc
index 710642eb00..8beb0d446d 100644
--- a/src/lua/lua_socket.cc
+++ b/src/lua/socket.cc
@@ -26,7 +26,7 @@
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include "lua_socket.h"
+#include "lua/socket.h"
extern "C" {
#include <lua.h>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 88f26e30f8..f26d79ce51 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,7 +10,6 @@ add_custom_target(test-force
COMMAND ${PROJECT_SOURCE_DIR}/test/test-run.py --builddir=${PROJECT_BINARY_DIR} --force --vardir=${PROJECT_BINARY_DIR}/test/var)
add_subdirectory(unit)
-add_subdirectory(box)
add_subdirectory(connector_c)
if (ENABLE_RPM)
--
GitLab