Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
openbus
openbus-sdk-lua
Commits
1e975048
Commit
1e975048
authored
Dec 22, 2017
by
Amadeu Andrade Barbosa Junior
Browse files
OPENBUS-3112 Biblioteca do OiL passou a depender da luaiconv
parent
f8eb7e44
Changes
5
Hide whitespace changes
Inline
Side-by-side
lua/openbus/console.lua
View file @
1e975048
...
...
@@ -65,7 +65,7 @@ Available options are:
OPENBUS_CODEREV
,
},
"."
)
print
(
"OpenBus "
..
version
..
" for "
..
_VERSION
..
" Copyright (C) 2006-201
5
Tecgraf, PUC-Rio"
)
" Copyright (C) 2006-201
7
Tecgraf, PUC-Rio"
)
end
OPENBUS_EXITCODE
=
processargs
(
_ENV
,
args
.
E
,
args
.
i
,
executables
,
select
(
start
,
...
))
...
...
src/busconsole.mak
View file @
1e975048
...
...
@@ -26,6 +26,7 @@ LIBS:= \
luacothread
\
luaidl
\
oil
\
luaiconv
\
luavararg
\
lfs
\
luuid
\
...
...
@@ -44,6 +45,7 @@ INCLUDES+= . \
$(LUACOTHREAD_HOME)
/obj/
$(TEC_UNAME)
\
$(LUAIDL_HOME)
/obj/
$(TEC_UNAME)
\
$(OIL_HOME)
/obj/
$(TEC_UNAME)
\
$(LUAICONV_HOME)
/include
\
$(LUAVARARG_HOME)
/src
\
$(LUAFILESYSTEM_HOME)
/include
\
$(LUUID_HOME)
/include
\
...
...
@@ -62,6 +64,7 @@ LDIR+= \
$(LUACOTHREAD_HOME)
/lib/
$(TEC_UNAME)
\
$(LUAIDL_HOME)
/lib/
$(TEC_UNAME)
\
$(OIL_HOME)
/lib/
$(TEC_UNAME)
\
$(LUAICONV_HOME)
/lib/
$(TEC_UNAME)
\
$(LUAVARARG_HOME)
/lib/
$(TEC_UNAME)
\
$(LUAFILESYSTEM_HOME)
/lib/
$(TEC_UNAME)
\
$(LUUID_HOME)
/lib/
$(TEC_UNAME)
\
...
...
@@ -99,12 +102,16 @@ ifeq ($(findstring $(TEC_SYSNAME), Win32 Win64), )
LIBS
:=
endif
else
if
n
eq
"
$(TEC_SYSNAME)
" "
Darwin
"
ifeq
($(findstring
$(TEC_SYSNAME)
, MacOS,
Darwin
), )
LIBS
+=
uuid
endif
endif
endif
ifneq
($(findstring $(TEC_SYSNAME), MacOS, Darwin), )
LIBS
+=
iconv
endif
ifneq
($(findstring $(TEC_SYSNAME), Win32 Win64), )
APPTYPE
=
console
LIBS
+=
wsock32 rpcrt4
...
...
src/console.c
View file @
1e975048
...
...
@@ -17,6 +17,7 @@
#include "lauxlib.h"
#include "lualib.h"
#include "luaiconv.h"
#include "luuid.h"
#include "lfs.h"
#include "lce.h"
...
...
@@ -495,6 +496,7 @@ static int pmain (lua_State *L) {
/* preload binded C libraries */
luaL_getsubtable
(
L
,
LUA_REGISTRYINDEX
,
"_PRELOAD"
);
lua_pushcfunction
(
L
,
luaopen_iconv
);
lua_setfield
(
L
,
-
2
,
"iconv"
);
lua_pushcfunction
(
L
,
luaopen_uuid
);
lua_setfield
(
L
,
-
2
,
"uuid"
);
lua_pushcfunction
(
L
,
luaopen_lfs
);
lua_setfield
(
L
,
-
2
,
"lfs"
);
lua_pushcfunction
(
L
,
luaopen_vararg
);
lua_setfield
(
L
,
-
2
,
"vararg"
);
...
...
src/openbus.mak
View file @
1e975048
...
...
@@ -84,6 +84,7 @@ LIBS:= \
luacothread
\
luaidl
\
oil
\
luaiconv
\
luavararg
\
lfs
\
luuid
\
...
...
@@ -103,6 +104,7 @@ INCLUDES+= . \
$(LUACOTHREAD_HOME)
/obj/
$(TEC_UNAME)
\
$(LUAIDL_HOME)
/obj/
$(TEC_UNAME)
\
$(OIL_HOME)
/obj/
$(TEC_UNAME)
\
$(LUAICONV_HOME)
/include
\
$(LUAVARARG_HOME)
/src
\
$(LUAFILESYSTEM_HOME)
/include
\
$(LUUID_HOME)
/include
\
...
...
@@ -120,6 +122,7 @@ LDIR+= \
$(LUACOTHREAD_HOME)
/lib/
$(TEC_UNAME)
\
$(LUAIDL_HOME)
/lib/
$(TEC_UNAME)
\
$(OIL_HOME)
/lib/
$(TEC_UNAME)
\
$(LUAICONV_HOME)
/lib/
$(TEC_UNAME)
\
$(LUAVARARG_HOME)
/lib/
$(TEC_UNAME)
\
$(LUAFILESYSTEM_HOME)
/lib/
$(TEC_UNAME)
\
$(LUUID_HOME)
/lib/
$(TEC_UNAME)
\
...
...
src/openbuslua.c
View file @
1e975048
...
...
@@ -19,6 +19,7 @@
#include <luacompat52.h>
#endif
#include <luaiconv.h>
#include <luuid.h>
#include <lce.h>
#include <luasec.h>
...
...
@@ -201,6 +202,7 @@ LUALIB_API int openbuslua_init (lua_State *L, int interactive, int debugmode) {
#else
luaL_findtable
(
L
,
LUA_GLOBALSINDEX
,
"package.preload"
,
1
);
#endif
lua_pushcfunction
(
L
,
luaopen_iconv
);
lua_setfield
(
L
,
-
2
,
"iconv"
);
lua_pushcfunction
(
L
,
luaopen_uuid
);
lua_setfield
(
L
,
-
2
,
"uuid"
);
lua_pushcfunction
(
L
,
luaopen_lfs
);
lua_setfield
(
L
,
-
2
,
"lfs"
);
lua_pushcfunction
(
L
,
luaopen_vararg
);
lua_setfield
(
L
,
-
2
,
"vararg"
);
...
...
Amadeu Andrade Barbosa Junior
@amadeu
mentioned in commit
7d58c145
·
Feb 09, 2018
mentioned in commit
7d58c145
mentioned in commit 7d58c145966026e3f670b596aecb93c1188c43bf
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment