Commit ca384ca8 authored by Renato Figueiro Maia's avatar Renato Figueiro Maia
Browse files

[OPENBUS-2184] Adaptação do código para ser compatível também com Lua 5.2

- Remoção de dependência com as bibliotecas LuaCoroutine e LuaInspector

git-svn-id: https://subversion.tecgraf.puc-rio.br/engdist/openbus/core/branches/02_00_00@149801 ae0415b3-e90b-0410-900d-d0be9363c56b
parent f89974b3
......@@ -11,7 +11,6 @@
#include "luasocket.h"
#include "loop.h"
#include "luatuple.h"
#include "luacoroutine.h"
#include "luacothread.h"
#include "luaidl.h"
#include "oil.h"
......@@ -151,7 +150,6 @@ void luapreload_extralibraries(lua_State *L)
/* preload script libraries */
luapreload_loop(L);
luapreload_luatuple(L);
luapreload_luacoroutine(L);
luapreload_luacothread(L);
luapreload_luaidl(L);
luapreload_oil(L);
......
......@@ -32,42 +32,50 @@ LUASRC= \
include ${OIL_HOME}/openbus/base.mak
LIBS:= lce luuid lfs luavararg luastruct luasocket loop luatuple \
luacoroutine luacothread luainspector luaidl oil luascs luaopenbus
LIBS:= \
luastruct \
luasocket \
luatuple \
loop \
luacothread \
luaidl \
oil \
luavararg \
lfs \
luuid \
lce \
luascs \
luaopenbus
DEFINES= \
TECMAKE_APPNAME=\"$(APPNAME)\"
INCLUDES+= . $(SRCLUADIR) \
$(LCE_HOME)/include \
$(LUUID_HOME)/include \
$(LUAFILESYSTEM_HOME)/include \
$(LUASOCKET_HOME)/include \
$(LUASTRUCT_HOME)/src \
$(LUAVARARG_HOME)/src \
$(LUAINSPECTOR_HOME)/obj/$(TEC_UNAME) \
$(LUASOCKET_HOME)/include \
$(LUATUPLE_HOME)/obj/$(TEC_UNAME) \
$(LUACOROUTINE_HOME)/obj/$(TEC_UNAME) \
$(LUACOTHREAD_HOME)/obj/$(TEC_UNAME) \
$(LOOP_HOME)/obj/$(TEC_UNAME) \
$(LUACOTHREAD_HOME)/obj/$(TEC_UNAME) \
$(LUAIDL_HOME)/obj/$(TEC_UNAME) \
$(OIL_HOME)/obj/$(TEC_UNAME) \
$(LUAVARARG_HOME)/src \
$(LUAFILESYSTEM_HOME)/include \
$(LUUID_HOME)/include \
$(LCE_HOME)/include \
$(SCS_LUA_HOME)/obj/$(TEC_UNAME) \
$(OPENBUS_LUA_HOME)/obj/$(TEC_UNAME)
LDIR+= \
$(LCE_HOME)/lib/$(TEC_UNAME) \
$(LUUID_HOME)/lib/$(TEC_UNAME) \
$(LUAFILESYSTEM_HOME)/lib/$(TEC_UNAME) \
$(LUASOCKET_HOME)/lib/$(TEC_UNAME) \
$(LUASTRUCT_HOME)/lib/$(TEC_UNAME) \
$(LUAVARARG_HOME)/lib/$(TEC_UNAME) \
$(LUAINSPECTOR_HOME)/lib/$(TEC_UNAME) \
$(LUASOCKET_HOME)/lib/$(TEC_UNAME) \
$(LUATUPLE_HOME)/lib/$(TEC_UNAME) \
$(LUACOROUTINE_HOME)/lib/$(TEC_UNAME) \
$(LOOP_HOME)/lib/$(TEC_UNAME) \
$(LUACOTHREAD_HOME)/lib/$(TEC_UNAME) \
$(LUAIDL_HOME)/lib/$(TEC_UNAME) \
$(LOOP_HOME)/lib/$(TEC_UNAME) \
$(OIL_HOME)/lib/$(TEC_UNAME) \
$(LUAVARARG_HOME)/lib/$(TEC_UNAME) \
$(LUAFILESYSTEM_HOME)/lib/$(TEC_UNAME) \
$(LUUID_HOME)/lib/$(TEC_UNAME) \
$(LCE_HOME)/lib/$(TEC_UNAME) \
$(SCS_LUA_HOME)/lib/$(TEC_UNAME) \
$(OPENBUS_LUA_HOME)/lib/$(TEC_UNAME)
......
......@@ -38,42 +38,50 @@ LUASRC= \
include ${OIL_HOME}/openbus/base.mak
LIBS:= lce luuid lfs luavararg luastruct luasocket loop luatuple \
luacoroutine luacothread luainspector luaidl oil luascs luaopenbus
LIBS:= \
luastruct \
luasocket \
luatuple \
loop \
luacothread \
luaidl \
oil \
luavararg \
lfs \
luuid \
lce \
luascs \
luaopenbus
DEFINES= \
TECMAKE_APPNAME=\"$(APPNAME)\"
INCLUDES+= . $(SRCLUADIR) \
$(LCE_HOME)/include \
$(LUUID_HOME)/include \
$(LUAFILESYSTEM_HOME)/include \
$(LUASOCKET_HOME)/include \
$(LUASTRUCT_HOME)/src \
$(LUAVARARG_HOME)/src \
$(LUAINSPECTOR_HOME)/obj/$(TEC_UNAME) \
$(LUASOCKET_HOME)/include \
$(LUATUPLE_HOME)/obj/$(TEC_UNAME) \
$(LUACOROUTINE_HOME)/obj/$(TEC_UNAME) \
$(LUACOTHREAD_HOME)/obj/$(TEC_UNAME) \
$(LOOP_HOME)/obj/$(TEC_UNAME) \
$(LUACOTHREAD_HOME)/obj/$(TEC_UNAME) \
$(LUAIDL_HOME)/obj/$(TEC_UNAME) \
$(OIL_HOME)/obj/$(TEC_UNAME) \
$(LUAVARARG_HOME)/src \
$(LUAFILESYSTEM_HOME)/include \
$(LUUID_HOME)/include \
$(LCE_HOME)/include \
$(SCS_LUA_HOME)/obj/$(TEC_UNAME) \
$(OPENBUS_LUA_HOME)/obj/$(TEC_UNAME)
LDIR+= \
$(LCE_HOME)/lib/$(TEC_UNAME) \
$(LUUID_HOME)/lib/$(TEC_UNAME) \
$(LUAFILESYSTEM_HOME)/lib/$(TEC_UNAME) \
$(LUASOCKET_HOME)/lib/$(TEC_UNAME) \
$(LUASTRUCT_HOME)/lib/$(TEC_UNAME) \
$(LUAVARARG_HOME)/lib/$(TEC_UNAME) \
$(LUAINSPECTOR_HOME)/lib/$(TEC_UNAME) \
$(LUASOCKET_HOME)/lib/$(TEC_UNAME) \
$(LUATUPLE_HOME)/lib/$(TEC_UNAME) \
$(LUACOROUTINE_HOME)/lib/$(TEC_UNAME) \
$(LOOP_HOME)/lib/$(TEC_UNAME) \
$(LUACOTHREAD_HOME)/lib/$(TEC_UNAME) \
$(LUAIDL_HOME)/lib/$(TEC_UNAME) \
$(LOOP_HOME)/lib/$(TEC_UNAME) \
$(OIL_HOME)/lib/$(TEC_UNAME) \
$(LUAVARARG_HOME)/lib/$(TEC_UNAME) \
$(LUAFILESYSTEM_HOME)/lib/$(TEC_UNAME) \
$(LUUID_HOME)/lib/$(TEC_UNAME) \
$(LCE_HOME)/lib/$(TEC_UNAME) \
$(SCS_LUA_HOME)/lib/$(TEC_UNAME) \
$(OPENBUS_LUA_HOME)/lib/$(TEC_UNAME)
......
......@@ -14,7 +14,6 @@
#include "luasocket.h"
#include "loop.h"
#include "luatuple.h"
#include "luacoroutine.h"
#include "luacothread.h"
#include "luaidl.h"
#include "oil.h"
......@@ -48,7 +47,6 @@ void luapreload_extralibraries(lua_State *L)
/* preload script libraries */
luapreload_loop(L);
luapreload_luatuple(L);
luapreload_luacoroutine(L);
luapreload_luacothread(L);
luapreload_luaidl(L);
luapreload_oil(L);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment