Skip to content
Snippets Groups Projects
Commit 744d490a authored by Ramin Yaghoubzadeh's avatar Ramin Yaghoubzadeh
Browse files

Fixed build on netboot Linux machines

parent 4891ca75
No related branches found
No related tags found
No related merge requests found
.DS_Store
*/generatedsrc
*/*/generatedsrc
*/build
*/*/build
*/lib
......@@ -18,4 +19,6 @@ Session.vim
**/manifest.mf
**/**/manifest.mf
**/*.*~
deps
dist
......@@ -25,6 +25,10 @@ set(RSBLIBS rsc rsbcore)
#set(LIBS ${LIBS} ${PROTOLIBS} ${RSBLIBS})
set(LIBS ${LIBS} ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${RSBLIBS})
if (NOT DEFINED APPLE)
set(LIBS ${LIBS} uuid)
endif(NOT DEFINED APPLE)
# enhance the default search paths (headers, libs ...)
set(CMAKE_PREFIX_PATH ${PROJECT_SOURCE_DIR}:/opt/local:${CMAKE_PREFIX_PATH})
......
......@@ -43,10 +43,16 @@ void Initializer::initialize_ipaaca_rsb_if_needed()
std::string generate_uuid_string()
{
uuid_t uuidt;
uuid_string_t uuidstr;
uuid_generate(uuidt);
#ifdef __MACOSX__
uuid_string_t uuidstr;
uuid_unparse_lower(uuidt, uuidstr);
return uuidstr;
#else
char result_c[37];
uuid_unparse_lower(uuidt, result_c);
return result_c;
#endif
}
/*
......
......@@ -6,4 +6,5 @@ pyzip.excludes=
run.py=run.py
publish.resolver=soa.core.repository
dist.dir=../../dist
extra.python.path=/vol/soa/opt64/python-spread/current/lib/python2.7/site-packages
#!/bin/bash
echo "Starting local-only spread daemon for ipaaca ..."
spread -n localhost &
if [ -d /vol/soa/opt64/spread ]; then
echo "Starting local-only spread daemon for ipaaca (from soa volume) ..."
LD_LIBRARY_PATH=/vol/soa/opt64/spread/current/lib
/vol/soa/opt64/spread/current/sbin/spread -n localhost &
else
echo "Starting local-only spread daemon for ipaaca ..."
spread -n localhost &
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment