Commit dc5605a7 authored by Ricardo Cosme's avatar Ricardo Cosme

Merge branch '02_00_01' into idl2lua_interop-idls_02_00

parents 950a4542 b0bd49a6
......@@ -4,50 +4,111 @@ import os ;
import modules ;
path-constant here : . ;
path-constant root : $(here)/.. ;
path-constant deps : $(root)/.. ;
lua-install-path = [ os.environ LUA_INSTALL_PATH ] ;
if ! $(lua-install-path)
local lua-jam-path = [ os.environ LUA_JAM_PATH ] ;
if ! $(lua-jam-path)
{
lua-install-path = "$(here)/../../install/lua" ;
lua-jam-path = "$(deps)/lua.jam" ;
}
use-project lua : $(lua-jam-path) ;
loop-root-path = [ os.environ LOOP_ROOT_PATH ] ;
local luuid-root-path = [ os.environ LUUID_ROOT_PATH ] ;
if ! $(luuid-root-path)
{
luuid-root-path = "$(deps)/luuid" ;
}
use-project luuid : $(luuid-root-path)/bbuild ;
local openssl-jam-path = [ os.environ OPENSSL_JAM_PATH ] ;
if ! $(openssl-jam-path)
{
openssl-jam-path = "$(deps)/openssl.jam" ;
}
use-project openssl : $(openssl-jam-path) ;
local lce-root-path = [ os.environ LCE_ROOT_PATH ] ;
if ! $(lce-root-path)
{
lce-root-path = "$(deps)/lce" ;
}
use-project lce : $(lce-root-path)/bbuild ;
local lfs-root-path = [ os.environ LFS_ROOT_PATH ] ;
if ! $(lfs-root-path)
{
lfs-root-path = "$(deps)/luafilesystem" ;
}
use-project lfs : $(lfs-root-path)/bbuild ;
local luavararg-root-path = [ os.environ LUAVARARG_ROOT_PATH ] ;
if ! $(luavararg-root-path)
{
luavararg-root-path = "$(deps)/luavararg" ;
}
use-project luavararg : $(luavararg-root-path)/bbuild ;
local luastruct-root-path = [ os.environ LUASTRUCT_ROOT_PATH ] ;
if ! $(luastruct-root-path)
{
luastruct-root-path = "$(deps)/luastruct" ;
}
use-project luastruct : $(luastruct-root-path)/bbuild ;
local luasocket-root-path = [ os.environ LUASOCKET_ROOT_PATH ] ;
if ! $(luasocket-root-path)
{
luasocket-root-path = "$(deps)/luasocket" ;
}
use-project luasocket : $(luasocket-root-path)/bbuild ;
local loop-root-path = [ os.environ LOOP_ROOT_PATH ] ;
if ! $(loop-root-path)
{
loop-root-path = "$(here)/../loop" ;
loop-root-path = "$(deps)/loop" ;
}
use-project loop : $(loop-root-path)/bbuild ;
oil-root-path = [ os.environ OIL_ROOT_PATH ] ;
local oil-root-path = [ os.environ OIL_ROOT_PATH ] ;
if ! $(oil-root-path)
{
oil-root-path = "$(here)/../oil" ;
oil-root-path = "$(deps)/oil" ;
}
use-project oil : $(oil-root-path)/bbuild ;
local luascs-root-path = [ os.environ LUASCS_ROOT_PATH ] ;
if ! $(luascs-root-path)
{
luascs-root-path = "$(deps)/scs-lua" ;
}
use-project luascs : $(luascs-root-path)/bbuild ;
scs-idl-path = [ os.environ SCS_IDL_PATH ] ;
if ! $(scs-idl-path)
{
scs-idl-path = "$(here)/../scs-idl" ;
scs-idl-path = "$(deps)/scs-idl" ;
}
openbus-idl-path = [ os.environ OPENBUS_IDL_PATH ] ;
if ! $(openbus-idl-path)
{
openbus-idl-path = "$(here)/../openbus-idl" ;
openbus-idl-path = "$(deps)/openbus-idl" ;
}
openbus-legacy-idl-path = [ os.environ OPENBUS_LEGACY_IDL_PATH ] ;
if ! $(openbus-legacy-idl-path)
{
openbus-legacy-idl-path = "$(here)/../openbus-legacy-idl" ;
openbus-legacy-idl-path = "$(deps)/openbus-legacy-idl" ;
}
openbus-lib-idl-path = [ os.environ OPENBUS_LIB_IDL_PATH ] ;
if ! $(openbus-lib-idl-path)
{
openbus-lib-idl-path = "$(here)/../openbus-lib-idl" ;
openbus-lib-idl-path = "$(deps)/openbus-lib-idl" ;
}
modules.load preloader : : $(loop-root-path) ;
modules.load preloader : : $(loop-root-path)/bbuild ;
import preloader ;
using preloader ;
......@@ -60,41 +121,45 @@ project luaopenbus
<target-os>windows:<define>_CRT_SECURE_NO_WARNINGS
<toolset>msvc-12.0:<cxxflags>/FS
<debug-symbols>on
: default-build
<variant>release
<link>static
;
make luaopenbus.c
: lua/openbus/assistant.lua
lua/openbus/assistant2.lua
lua/openbus/core/Access.lua
lua/openbus/core/idl/makeaux.lua
lua/openbus/core/idl/parsed.lua
lua/openbus/core/idl.lua
lua/openbus/core/legacy/idl.lua
lua/openbus/core/legacy/parsed.lua
lua/openbus/core/messages.lua
lua/openbus/idl/parsed.lua
lua/openbus/idl.lua
lua/openbus/util/argcheck.lua
lua/openbus/util/autotable.lua
lua/openbus/util/database.lua
lua/openbus/util/except.lua
lua/openbus/util/logger.lua
lua/openbus/util/messages.lua
lua/openbus/util/oo.lua
lua/openbus/util/sandbox.lua
lua/openbus/util/server.lua
lua/openbus/util/sysex.lua
lua/openbus/util/tickets.lua
lua/openbus.lua
: $(root)/lua/openbus/assistant.lua
$(root)/lua/openbus/assistant2.lua
$(root)/lua/openbus/core/Access.lua
$(root)/lua/openbus/core/idl/makeaux.lua
$(root)/lua/openbus/core/idl/parsed.lua
$(root)/lua/openbus/core/idl.lua
$(root)/lua/openbus/core/legacy/idl.lua
$(root)/lua/openbus/core/legacy/parsed.lua
$(root)/lua/openbus/core/messages.lua
$(root)/lua/openbus/idl/parsed.lua
$(root)/lua/openbus/idl.lua
$(root)/lua/openbus/util/argcheck.lua
$(root)/lua/openbus/util/autotable.lua
$(root)/lua/openbus/util/database.lua
$(root)/lua/openbus/util/except.lua
$(root)/lua/openbus/util/logger.lua
$(root)/lua/openbus/util/messages.lua
$(root)/lua/openbus/util/oo.lua
$(root)/lua/openbus/util/sandbox.lua
$(root)/lua/openbus/util/server.lua
$(root)/lua/openbus/util/sysex.lua
$(root)/lua/openbus/util/tickets.lua
$(root)/lua/openbus.lua
: preloader.pre-compile
: <search>$(here)
: <search>$(root)
<location>$(here)
;
modules.load idl2lua : : $(oil-root-path) ;
modules.load idl2lua : : $(oil-root-path)/bbuild ;
import idl2lua ;
using idl2lua ;
make lua/openbus/idl/parsed.lua
make $(root)/lua/openbus/idl/parsed.lua
: $(openbus-lib-idl-path)/src/openbus.idl
: idl2lua.compile
: <include>$(openbus-lib-idl-path)/src
......@@ -102,7 +167,7 @@ make lua/openbus/idl/parsed.lua
<include>$(scs-idl-path)/src
;
make lua/openbus/core/idl/parsed.lua
make $(root)/lua/openbus/core/idl/parsed.lua
: $(openbus-idl-path)/src/access_control.idl
$(openbus-idl-path)/src/offer_registry.idl
$(openbus-idl-path)/src/data_export.idl
......@@ -112,9 +177,10 @@ make lua/openbus/core/idl/parsed.lua
: idl2lua.compile
: <include>$(openbus-idl-path)/src
<include>$(scs-idl-path)/src
<location>$(here)
;
make lua/openbus/core/legacy/parsed.lua
make $(root)/lua/openbus/core/legacy/parsed.lua
: $(openbus-legacy-idl-path)/src/access_control_service.idl
$(openbus-legacy-idl-path)/src/registry_service.idl
$(openbus-legacy-idl-path)/src/fault_tolerance.idl
......@@ -123,41 +189,52 @@ make lua/openbus/core/legacy/parsed.lua
: idl2lua.compile
: <include>$(openbus-legacy-idl-path)/src
<include>$(scs-idl-path)/src
<location>$(here)
;
local common-requirements =
<library>/lua//lua
<library>/luuid//luuid
<library>/lce//lce
<library>/luafilesystem//lfs
<library>/luavararg//luavararg
<library>/luastruct//luastruct
<library>/luasocket//luasocket
<library>/loop//loop
<library>/loop//luatuple
<library>/loop//luacothread
<library>/oil//oil
<library>/oil//luaidl
<library>/luascs//luascs
<dependency>/lce//lce
<dependency>/loop//loop
<dependency>/loop//luacothread
<dependency>/loop//luatuple
<dependency>/oil//oil
<dependency>/oil//luaidl
<dependency>/luascs//luascs
<dependency>/luasocket//luasocket
<dependency>/luastruct//luastruct
<dependency>/luavararg//luavararg
;
lib luaopenbus
: luaopenbus.c
/lua//lua
: <include>src
: $(common-requirements)
<dependency>luaopenbus.c
<include>$(root)/src
<include>$(here)
<target-os>windows,<link>shared:<linkflags>"/def:$(here)/luaopenbus.def"
:
: <include>.
: <include>$(here)
<include>$(root)/src
;
explicit luaopenbus ;
exe busconsole
: src/console.c
/lua//lua
/luuid//luuid
/lce//lce
/luafilesystem//lfs
/luavararg//luavararg
/luastruct//luastruct
/luasocket//luasocket
/loop//loop
/loop//luatuple
/loop//luacothread
/oil//oil
/oil//luaidl
/luascs//luascs
/luaopenbus//luaopenbus
: <dependency>/loop//loop
<dependency>/loop//luatuple
<dependency>/loop//luacothread
<dependency>/oil//oil
<dependency>/oil//luaidl
<dependency>/lce//lce
<dependency>/luascs//luascs
: $(root)/src/console.c
: $(common-requirements)
<library>/luaopenbus//luaopenbus
<dependency>/luaopenbus//luaopenbus
;
explicit busconsole ;
......@@ -167,4 +244,3 @@ install stage
busconsole
: <location>install
;
\ No newline at end of file
# -*- coding: iso-8859-1-unix -*-
import os ;
project win ;
lib wsock32
:
: <search>c:/Windows/System32
;
lib rpcrt4
:
: <search>c:/Windows/System32
;
project unix ;
lib dl
:
: <link>shared
;
lib uuid
:
: <link>shared
;
lib pthread
:
: <link>shared
;
path-constant here : . ;
local lua-install-path = [ os.environ LUA_INSTALL_PATH ] ;
if ! $(lua-install-path)
{
lua-install-path = "$(here)/../../install/lua" ;
}
project lua
: requirements <include>$(lua-install-path)/include ;
lib lua
:
: <search>$(lua-install-path)/lib
;
lib lua
:
: <name>lua52
<target-os>windows
<search>$(lua-install-path)/lib
;
local luuid-root-path = [ os.environ LUUID_ROOT_PATH ] ;
if ! $(luuid-root-path)
{
luuid-root-path = "$(here)/../luuid" ;
}
use-project luuid : $(luuid-root-path) ;
openssl-debug-shared-include-path = [ os.environ OPENSSL_DEBUG_SHARED_INCLUDE_PATH ] ;
if ! $(openssl-debug-shared-include-path)
{
openssl-debug-shared-include-path = $(here)/../../install/openssl-mt-d/include ;
}
openssl-debug-shared-lib-path = [ os.environ OPENSSL_DEBUG_SHARED_LIB_PATH ] ;
if ! $(openssl-debug-shared-lib-path)
{
openssl-debug-shared-lib-path = $(here)/../../install/openssl-mt-d/lib ;
}
openssl-debug-static-include-path = [ os.environ OPENSSL_DEBUG_STATIC_INCLUDE_PATH ] ;
if ! $(openssl-debug-static-include-path)
{
openssl-debug-static-include-path = $(here)/../../install/openssl-mt-s-d/include ;
}
openssl-debug-static-lib-path = [ os.environ OPENSSL_DEBUG_STATIC_LIB_PATH ] ;
if ! $(openssl-debug-static-lib-path)
{
openssl-debug-static-lib-path = $(here)/../../install/openssl-mt-s-d/lib ;
}
openssl-release-shared-include-path = [ os.environ OPENSSL_RELEASE_SHARED_INCLUDE_PATH ] ;
if ! $(openssl-release-shared-include-path)
{
openssl-release-shared-include-path = $(here)/../../install/openssl-mt/include ;
}
openssl-release-shared-lib-path = [ os.environ OPENSSL_RELEASE_SHARED_LIB_PATH ] ;
if ! $(openssl-release-shared-lib-path)
{
openssl-release-shared-lib-path = $(here)/../../install/openssl-mt/lib ;
}
openssl-release-static-include-path = [ os.environ OPENSSL_RELEASE_STATIC_INCLUDE_PATH ] ;
if ! $(openssl-release-static-include-path)
{
openssl-release-static-include-path = $(here)/../../install/openssl-mt-s/include ;
}
openssl-release-static-lib-path = [ os.environ OPENSSL_RELEASE_STATIC_LIB_PATH ] ;
if ! $(openssl-release-static-lib-path)
{
openssl-release-static-lib-path = $(here)/../../install/openssl-mt-s/lib ;
}
openssl-include-path = [ os.environ OPENSSL_INCLUDE_PATH ] ;
if $(openssl-include-path)
{
openssl-debug-shared-include-path = $(openssl-include-path) ;
openssl-debug-static-include-path = $(openssl-include-path) ;
openssl-release-shared-include-path = $(openssl-include-path) ;
openssl-release-static-include-path = $(openssl-include-path) ;
}
openssl-lib-path = [ os.environ OPENSSL_LIB_PATH ] ;
if $(openssl-lib-path)
{
openssl-debug-shared-lib-path = $(openssl-lib-path) ;
openssl-debug-static-lib-path = $(openssl-lib-path) ;
openssl-release-shared-lib-path = $(openssl-lib-path) ;
openssl-release-static-lib-path = $(openssl-lib-path) ;
}
project openssl ;
#Unix
lib crypto
:
: <variant>debug
<link>shared
<search>$(openssl-debug-shared-lib-path)
:
: <include>$(openssl-debug-shared-include-path)
;
lib crypto
:
: <variant>debug
<link>static
<search>$(openssl-debug-static-lib-path)
:
: <include>$(openssl-debug-static-include-path)
;
lib crypto
:
: <variant>debug
<link>static
<target-os>darwin
<file>$(openssl-debug-static-lib-path)/libcrypto.a
:
: <include>$(openssl-debug-static-include-path)
;
lib crypto
:
: <variant>release
<link>shared
<search>$(openssl-release-shared-lib-path)
:
: <include>$(openssl-release-shared-include-path)
;
lib crypto
:
: <variant>release
<link>static
<search>$(openssl-release-static-lib-path)
:
: <include>$(openssl-release-static-include-path)
;
lib crypto
:
: <variant>release
<link>static
<target-os>darwin
<file>$(openssl-release-static-lib-path)/libcrypto.a
:
: <include>$(openssl-release-static-include-path)
;
#Windows
lib crypto
:
: <name>libeay32
<variant>debug
<link>shared
<target-os>windows
<search>$(openssl-debug-shared-lib-path)
:
: <linkflags>"gdi32.lib user32.lib advapi32.lib"
<include>$(openssl-debug-shared-include-path)
;
lib crypto
:
: <name>libeay32
<variant>debug
<link>static
<target-os>windows
<search>$(openssl-debug-static-lib-path)
:
: <linkflags>"gdi32.lib user32.lib advapi32.lib"
<include>$(openssl-debug-static-include-path)
;
lib crypto
:
: <name>libeay32
<variant>release
<link>shared
<target-os>windows
<search>$(openssl-release-shared-lib-path)
:
: <linkflags>"gdi32.lib user32.lib advapi32.lib"
<include>$(openssl-release-shared-include-path)
;
lib crypto
:
: <name>libeay32
<variant>release
<link>static
<target-os>windows
<search>$(openssl-release-static-lib-path)
:
: <linkflags>"gdi32.lib user32.lib advapi32.lib"
<include>$(openssl-release-static-include-path)
;
#Unix
lib openssl
: crypto
: <name>ssl
<variant>debug
<link>shared
<search>$(openssl-debug-shared-lib-path)
:
: <include>$(openssl-debug-shared-include-path)
;
lib openssl
: crypto
: <name>ssl
<variant>debug
<link>static
<search>$(openssl-debug-static-lib-path)
<target-os>darwin:<file>$(openssl-debug-static-lib-path)/libssl.a
:
: <include>$(openssl-debug-static-include-path)
;
lib openssl
: crypto
: <name>ssl
<variant>debug
<link>static
<target-os>darwin
<file>$(openssl-debug-static-lib-path)/libssl.a
:
: <include>$(openssl-debug-static-include-path)
;
lib openssl
: crypto
: <name>ssl
<variant>release
<link>shared
<search>$(openssl-release-shared-lib-path)
:
: <include>$(openssl-release-shared-include-path)
;
lib openssl
: crypto
: <name>ssl
<variant>release
<link>static
<search>$(openssl-release-static-lib-path)
:
: <include>$(openssl-release-static-include-path)
;
lib openssl
: crypto
: <name>ssl
<variant>release
<link>static
<target-os>darwin
<file>$(openssl-release-static-lib-path)/libssl.a
:
: <include>$(openssl-release-static-include-path)
;
#Windows
lib openssl
: crypto
: <name>ssleay32
<variant>debug
<link>shared
<target-os>windows
<search>$(openssl-debug-shared-lib-path)
:
: <include>$(openssl-debug-shared-include-path)
;
lib openssl
: crypto
: <name>ssleay32
<variant>debug
<link>static
<target-os>windows
<search>$(openssl-debug-static-lib-path)
:
: <include>$(openssl-debug-static-include-path)
;
lib openssl
: crypto
: <name>ssleay32
<variant>release
<link>shared
<target-os>windows
<search>$(openssl-release-shared-lib-path)
:
: <include>$(openssl-release-shared-include-path)
;
lib openssl
: crypto
: <name>ssleay32
<variant>release
<link>static
<target-os>windows
<search>$(openssl-release-static-lib-path)
:
: <include>$(openssl-release-static-include-path)p
;
local lce-root-path = [ os.environ LCE_ROOT_PATH ] ;
if ! $(lce-root-path)
{
lce-root-path = "$(here)/../lce" ;
}
use-project lce : $(lce-root-path) ;
local lfs-root-path = [ os.environ LFS_ROOT_PATH ] ;
if ! $(lfs-root-path)
{
lfs-root-path = "$(here)/../luafilesystem" ;
}
use-project lfs : $(lfs-root-path) ;
local luavararg-root-path = [ os.environ LUAVARARG_ROOT_PATH ] ;
if ! $(luavararg-root-path)
{
luavararg-root-path = "$(here)/../luavararg" ;
}
use-project luavararg : $(luavararg-root-path) ;
local luastruct-root-path = [ os.environ LUASTRUCT_ROOT_PATH ] ;
if ! $(luastruct-root-path)
{
luastruct-root-path = "$(here)/../luastruct" ;
}
use-project luastruct : $(luastruct-root-path) ;
local luasocket-root-path = [ os.environ LUASOCKET_ROOT_PATH ] ;
if ! $(luasocket-root-path)
{
luasocket-root-path = "$(here)/../luasocket" ;
}
use-project luasocket : $(luasocket-root-path) ;
local loop-root-path = [ os.environ LOOP_ROOT_PATH ] ;
if ! $(loop-root-path)
{
loop-root-path = "$(here)/../loop" ;
}
use-project loop : $(loop-root-path) ;
local oil-root-path = [ os.environ OIL_ROOT_PATH ] ;
if ! $(oil-root-path)
{
oil-root-path = "$(here)/../oil" ;
}
use-project oil : $(oil-root-path) ;
local luascs-root-path = [ os.environ LUASCS_ROOT_PATH ] ;
if ! $(luascs-root-path)
{
luascs-root-path = "$(here)/../scs-lua" ;
}