From 73d5b44a7f66b02a29a324d4c2a806554d065b5c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 5 Jul 2018 16:29:39 +0000 Subject: [PATCH] Added generated files to SDK. --- src/sdk/CMakeLists.txt | 4 ++-- src/sdk/build_example.sh | 11 ----------- src/sdk/example/build_example.sh | 11 +++++++++++ src/sdk/{ => example}/example.cpp | 2 +- src/sdk/make_sdk.sh | 17 +++++++++++------ 5 files changed, 25 insertions(+), 20 deletions(-) delete mode 100755 src/sdk/build_example.sh create mode 100755 src/sdk/example/build_example.sh rename src/sdk/{ => example}/example.cpp (93%) diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt index 9a22592b0..1fd28cc5f 100644 --- a/src/sdk/CMakeLists.txt +++ b/src/sdk/CMakeLists.txt @@ -7,8 +7,8 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/sdk COMMENT "Building SDK" DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/make_sdk.sh - ${CMAKE_CURRENT_SOURCE_DIR}/build_example.sh - ${CMAKE_CURRENT_SOURCE_DIR}/example.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/example/build_example.sh + ${CMAKE_CURRENT_SOURCE_DIR}/example/example.cpp server_layout) add_custom_target(sdk_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/sdk) diff --git a/src/sdk/build_example.sh b/src/sdk/build_example.sh deleted file mode 100755 index 38d2a115c..000000000 --- a/src/sdk/build_example.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -g++ -isystem include/externals/linux/include \ - -I include \ - -I include/spark \ - -o example \ - example.cpp \ - -Wl,-rpath,lib \ - -L lib \ - -l spark - diff --git a/src/sdk/example/build_example.sh b/src/sdk/example/build_example.sh new file mode 100755 index 000000000..21c6a9ce9 --- /dev/null +++ b/src/sdk/example/build_example.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +g++ -isystem ../include/externals/linux/include \ + -I ../include \ + -I ../include/spark \ + -o example \ + example.cpp \ + -Wl,-rpath,../lib \ + -L ../lib \ + -l spark + diff --git a/src/sdk/example.cpp b/src/sdk/example/example.cpp similarity index 93% rename from src/sdk/example.cpp rename to src/sdk/example/example.cpp index 427bb0dea..631354da4 100644 --- a/src/sdk/example.cpp +++ b/src/sdk/example/example.cpp @@ -9,7 +9,7 @@ int main() utils::init_spark_lib(); LOG(md, Info, "Hello world"); - sleep_for(5s); + sleep_for(1s); utils::finit_spark_lib(); return 0; } diff --git a/src/sdk/make_sdk.sh b/src/sdk/make_sdk.sh index 289ae90e2..be1e273ba 100755 --- a/src/sdk/make_sdk.sh +++ b/src/sdk/make_sdk.sh @@ -10,14 +10,19 @@ rm -rf $1/sdk/* mkdir -p $1/sdk/include/spark mkdir -p $1/sdk/include/externals/linux/ -(cd $2/.. && find lib -type f -name "*.h" -exec cp --parents \{\} $1/sdk/include/spark \;) + +# lib headers +(cd $2/.. && find lib -type f -name "*.h" -exec cp --parents \{\} $1/sdk/include/spark/ \;) + +# generated headers +(cd $1/src && find lib -type f -name "*.h" -or -name "*.cc" -exec cp --parents \{\} $1/sdk/include/spark/ \;) ln -sf $2/../../externals/linux/include $1/sdk/include/externals/linux ln -sf $1/server $1/sdk/lib -ln -sf $2/example.cpp $1/sdk/ -ln -sf $2/build_example.sh $1/sdk/ -ln -sf $1/sdk/lib/defaults $1/sdk/defaults -chmod +x $1/sdk/build_example.sh -(cd $1/sdk/ && ./build_example.sh && rm example) +mkdir $1/sdk/example +cp $2/example/* $1/sdk/example +ln -sf $1/sdk/lib/defaults $1/sdk/example/defaults +chmod +x $1/sdk/example/build_example.sh +(cd $1/sdk/example && ./build_example.sh && ./example >/dev/null && rm example)