summaryrefslogtreecommitdiff
path: root/test/poi-service/rebuild_all.sh
diff options
context:
space:
mode:
Diffstat (limited to 'test/poi-service/rebuild_all.sh')
-rwxr-xr-xtest/poi-service/rebuild_all.sh18
1 files changed, 11 insertions, 7 deletions
diff --git a/test/poi-service/rebuild_all.sh b/test/poi-service/rebuild_all.sh
index b115d32..ac20e38 100755
--- a/test/poi-service/rebuild_all.sh
+++ b/test/poi-service/rebuild_all.sh
@@ -1,10 +1,16 @@
#!/bin/bash
-if [ ! $COMMON_API_ROOT_DIR ]
+if [ ! $COMMONAPI_TOOL_DIR ]
then
- echo 'Set the root dir of the common api tools'
- echo 'You are supposed to build common-api-dbus-tools and common-api-tools under the same root dir'
- echo 'export COMMON_API_ROOT_DIR=<path>'
+ echo 'Set the dir of the common api tools'
+ echo 'export COMMONAPI_TOOL_DIR=<path>'
+ exit 1
+fi
+
+if [ ! $COMMONAPI_DBUS_TOOL_DIR ]
+then
+ echo 'Set the dir of the common api dbus tools'
+ echo 'export COMMONAPI_DBUS_TOOL_DIR=<path>'
exit 1
fi
@@ -21,10 +27,8 @@ rm -rf build
mkdir build
cd build
-OS_VERSION=$(uname -i)
-
echo 'build with CommonAPI'
-cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DWITH_DATABASE_SUPPLIER=ON -DCOMMONAPI_DBUS_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-dbus-tools/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/$OS_VERSION/commonapi-dbus-generator-linux-$OS_VERSION -DCOMMONAPI_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/$OS_VERSION/commonapi-generator-linux-$OS_VERSION -DWITH_DEBUG=ON . ../
+cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DWITH_DATABASE_SUPPLIER=ON -DCOMMONAPI_DBUS_TOOL_DIR=$COMMONAPI_DBUS_TOOL_DIR -DCOMMONAPI_TOOL_DIR=$COMMONAPI_TOOL_DIR -DWITH_DEBUG=ON . ../
make