Commit 2a9a7e8d authored by Amadeu Andrade Barbosa Junior's avatar Amadeu Andrade Barbosa Junior
Browse files

[OPENBUS-653] Commit parcial.

Alterando os core, libs, sdk-java e sdk-lua para suportarem a nova organização
de diretórios dentro do pacote distribuído ao cliente.

Em particular, vale notar que não houve mudança na idl do core, a única
diferença entre idl/trunk e idl/branches/OB_IDL_v1_05_2010_05_13 (atualmente)
são espaços em branco nos comentários.

OBS: ainda não atualizei os campos URL dos descritores do puts de propósito,
assim esse commit pode ser levado ao trunk mais facilmente.


git-svn-id: https://subversion.tecgraf.puc-rio.br/engdist/openbus/sdk/lua/branches/OB_SDK_LUA_v1_05_03_2011_07_28@120490 ae0415b3-e90b-0410-900d-d0be9363c56b
parent 84276054
......@@ -6,16 +6,16 @@ OBJROOT= obj
TARGETROOT= lib
LUABIN= ${LUA51}/bin/${TEC_UNAME}/lua5.1
LUAPATH = '${OPENBUS_HOME}/libpath/lua/5.1/?.lua;./?.lua;../../?.lua;'
LUAPATH = '${OPENBUS_HOME}/lib/lua/5.1/?.lua;./?.lua;../../?.lua;'
OPENBUSLIB= ${OPENBUS_HOME}/libpath/${TEC_UNAME}
OPENBUSINC= ${OPENBUS_HOME}/incpath
OPENBUSLIB= ${OPENBUS_HOME}/lib
OPENBUSINC= ${OPENBUS_HOME}/include
PRECMP_DIR= obj/${TEC_UNAME}
PRECMP_LUA= ${OPENBUS_HOME}/libpath/lua/5.1/precompiler.lua
PRECMP_LUA= ${OPENBUS_HOME}/lib/lua/5.1/precompiler.lua
PRECMP_FLAGS= -p OPENBUS_API -o openbusprecompiled -l ${LUAPATH} -d ${PRECMP_DIR} -n
PRELOAD_LUA= ${OPENBUS_HOME}/libpath/lua/5.1/preloader.lua
PRELOAD_LUA= ${OPENBUS_HOME}/lib/lua/5.1/preloader.lua
PRELOAD_FLAGS= -p OPENBUS_API -o openbus -d ${PRECMP_DIR}
OPENBUS_MODULES=$(addprefix openbus.,\
......@@ -29,9 +29,9 @@ OPENBUS_MODULES=$(addprefix openbus.,\
interceptors.ClientInterceptor \
interceptors.PICurrent \
interceptors.ServerInterceptor \
interceptors.SameProcessServerInterceptor \
interceptors.SameProcessServerInterceptor \
lease.LeaseRenewer \
lease.LeaseProvider \
lease.LeaseProvider \
util.CredentialManager \
util.Log \
util.OilUtilities \
......
#!/bin/sh
${OPENBUS_HOME}/core/bin/servicelauncher server.lua&
${OPENBUS_HOME}/bin/lua5.1 server.lua&
pid=$!
#echo "PID: $pid"
......@@ -8,5 +8,5 @@ trap "kill $pid > /dev/null 2> /dev/null" 0
sleep 6
${OPENBUS_HOME}/core/bin/servicelauncher client.lua
${OPENBUS_HOME}/bin/lua5.1 client.lua
#!/bin/sh
${OPENBUS_HOME}/core/bin/servicelauncher client.lua $1
${OPENBUS_HOME}/bin/lua5.1 client.lua $1
#!/bin/sh
${OPENBUS_HOME}/core/bin/servicelauncher server.lua
${OPENBUS_HOME}/bin/lua5.1 server.lua
#!/bin/sh
${OPENBUS_HOME}/core/bin/servicelauncher server.lua&
${OPENBUS_HOME}/bin/lua5.1 server.lua&
pid=$!
#echo "PID: $pid"
......@@ -8,5 +8,5 @@ trap "kill $pid > /dev/null 2> /dev/null" 0
sleep 6
${OPENBUS_HOME}/core/bin/servicelauncher client.lua $1
${OPENBUS_HOME}/bin/lua5.1 client.lua $1
#!/bin/sh
${OPENBUS_HOME}/core/bin/servicelauncher server.lua&
${OPENBUS_HOME}/bin/lua5.1 server.lua&
pid=$!
#echo "PID: $pid"
......@@ -8,5 +8,5 @@ trap "kill $pid > /dev/null 2> /dev/null" 0
sleep 6
${OPENBUS_HOME}/core/bin/servicelauncher client.lua $1
${OPENBUS_HOME}/bin/lua5.1 client.lua $1
......@@ -11,9 +11,9 @@ descriptors = {
mf = { },
},
dev_files = {
["lua/loop"] = "libpath/lua/5.1",
["lua/precompiler.lua"] = "libpath/lua/5.1",
["lua/preloader.lua"] = "libpath/lua/5.1",
["lua/loop"] = "lib/lua/5.1",
["lua/precompiler.lua"] = "lib/lua/5.1",
["lua/preloader.lua"] = "lib/lua/5.1",
},
},
{ name = "lua5.1-source",
......@@ -29,12 +29,12 @@ descriptors = {
SunOS510_64 = { mf = {"config ".. SUNOS64_TECMAKE_FLAGS} },
},
install_files = {
["../lib/${TEC_UNAME}/liblua5.1.so"] = "libpath/${TEC_UNAME}",
["../lib/${TEC_UNAME}/liblua5.1.dylib"] = "libpath/${TEC_UNAME}",
["../lib/${TEC_UNAME}/liblua5.1.so"] = "lib",
["../lib/${TEC_UNAME}/liblua5.1.dylib"] = "lib",
},
dev_files = {
["../lib/${TEC_UNAME}/liblua5.1.*"] = "libpath/${TEC_UNAME}",
["../include/*"] = "incpath/lua5.1.3",
["../lib/${TEC_UNAME}/liblua5.1.*"] = "lib",
["../include/*"] = "include/lua5.1.3",
},
},
{ name = "lua5.1-bin",
......@@ -45,7 +45,7 @@ descriptors = {
SunOS510_64 = { mf = {"lua ".. SUNOS64_TECMAKE_FLAGS} },
},
install_files = {
["../bin/${TEC_UNAME}/lua5.1"] = "bin/${TEC_UNAME}",
["../bin/${TEC_UNAME}/lua5.1"] = "bin",
},
},
{
......@@ -57,7 +57,7 @@ descriptors = {
mf = { },
},
dev_files = {
["lua/*"] = "libpath/lua/5.1"
["lua/*"] = "lib/lua/5.1"
},
},
{ name = "openbus-api",
......@@ -68,13 +68,13 @@ descriptors = {
Darwin = { mf = { "config LUA51="..PRODAPP.."/lua5.1","config LUA51="..PRODAPP.."/lua5.1 BUILD_DYLIB=YES" }, },
},
install_files = {
["lib/${TEC_UNAME}/libluaopenbus.so"] = "libpath/${TEC_UNAME}",
["lib/${TEC_UNAME}/libluaopenbus.dylib"] = "libpath/${TEC_UNAME}",
["openbus"] = "libpath/lua/5.1",
["lib/${TEC_UNAME}/libluaopenbus.so"] = "lib",
["lib/${TEC_UNAME}/libluaopenbus.dylib"] = "lib",
["openbus"] = "lib/lua/5.1",
},
dev_files = {
["lib/${TEC_UNAME}/libluaopenbus.*"] = "libpath/${TEC_UNAME}",
["obj/${TEC_UNAME}/openbus.h"] = "incpath/openbus/lua/",
["lib/${TEC_UNAME}/libluaopenbus.*"] = "lib",
["obj/${TEC_UNAME}/openbus.h"] = "include/openbus/lua/",
},
},
{ name = "openbus-demo-hello",
......@@ -84,12 +84,12 @@ descriptors = {
mf = { },
},
dev_files = {
["client.lua"] = "demo/hello",
["server.lua"] = "demo/hello",
["run"] = "demo/hello",
["Hello.properties"] = "demo/hello",
["idl"] = "demo/hello",
["management"] = "demo/hello",
["client.lua"] = "demo/lua/hello",
["server.lua"] = "demo/lua/hello",
["run"] = "demo/lua/hello",
["Hello.properties"] = "demo/lua/hello",
["idl"] = "demo/lua/hello",
["management"] = "demo/lua/hello",
},
},
{ name = "openbus-demo-eventsink",
......@@ -99,12 +99,12 @@ descriptors = {
mf = { },
},
dev_files = {
["client.lua"] = "demo/eventSink",
["client.sh"] = "demo/eventSink",
["server.lua"] = "demo/eventSink",
["server.sh"] = "demo/eventSink",
["EventSink.properties"] = "demo/eventSink",
["management"] = "demo/eventSink",
["client.lua"] = "demo/lua/eventSink",
["client.sh"] = "demo/lua/eventSink",
["server.lua"] = "demo/lua/eventSink",
["server.sh"] = "demo/lua/eventSink",
["EventSink.properties"] = "demo/lua/eventSink",
["management"] = "demo/lua/eventSink",
},
},
{ name = "openbus-demo-delegate",
......@@ -114,12 +114,12 @@ descriptors = {
mf = { },
},
dev_files = {
["client.lua"] = "demo/delegate",
["server.lua"] = "demo/delegate",
["run"] = "demo/delegate",
["Delegate.properties"] = "demo/delegate",
["idl"] = "demo/delegate",
["management"] = "demo/delegate",
["client.lua"] = "demo/lua/delegate",
["server.lua"] = "demo/lua/delegate",
["run"] = "demo/lua/delegate",
["Delegate.properties"] = "demo/lua/delegate",
["idl"] = "demo/lua/delegate",
["management"] = "demo/lua/delegate",
},
},
}
......@@ -254,7 +254,7 @@ Suite = {
os.execute(OPENBUS_HOME.."/specs/shell/openssl-generate.ksh -n " .. self.systemId .. " -c "..OPENBUS_HOME.."/openssl/openssl.cnf <TesteBarramentoCertificado_input.txt 2> genkey-err.txt >genkeyT.txt ")
os.execute(OPENBUS_HOME.."/core/bin/run_management.sh --acs-host=" .. host ..
os.execute(OPENBUS_HOME.."/bin/run_management.sh --acs-host=" .. host ..
" --acs-port=" .. port ..
" --login=tester" ..
" --password=tester" ..
......@@ -262,7 +262,7 @@ Suite = {
" --description=Teste_do_OpenBus" ..
" 2>> management-err.txt >>management.txt ")
os.execute(OPENBUS_HOME.."/core/bin/run_management.sh --acs-host=" .. host ..
os.execute(OPENBUS_HOME.."/bin/run_management.sh --acs-host=" .. host ..
" --acs-port=" .. port ..
" --login=tester" ..
" --password=tester" ..
......@@ -278,14 +278,14 @@ Suite = {
afterTestCase = function(self)
Openbus:destroy()
local OPENBUS_HOME = os.getenv("OPENBUS_HOME")
os.execute(OPENBUS_HOME.."/core/bin/run_management.sh --acs-host=" .. host ..
os.execute(OPENBUS_HOME.."/bin/run_management.sh --acs-host=" .. host ..
" --acs-port=" .. port ..
" --login=tester" ..
" --password=tester" ..
" --del-deployment="..self.deploymentId..
" 2>> management-err.txt >>management.txt ")
os.execute(OPENBUS_HOME.."/core/bin/run_management.sh --acs-host=" .. host ..
os.execute(OPENBUS_HOME.."/bin/run_management.sh --acs-host=" .. host ..
" --acs-port=" .. port ..
" --login=tester" ..
" --password=tester" ..
......
......@@ -2,6 +2,6 @@
PARAMS=$*
LATT_HOME=${OPENBUS_HOME}/libpath/lua/5.1/latt
LATT_HOME=${OPENBUS_HOME}/lib/lua/5.1/latt
${OPENBUS_HOME}/core/bin/servicelauncher ${LATT_HOME}/extras/OiLTestRunner.lua ${PARAMS}
${OPENBUS_HOME}/bin/lua5.1 ${LATT_HOME}/extras/OiLTestRunner.lua ${PARAMS}
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