diff options
| author | <philippe.colliot> | 2014-05-26 14:42:30 +0200 |
|---|---|---|
| committer | <philippe.colliot> | 2014-05-26 14:42:30 +0200 |
| commit | b7d33c478901058371a14a396ccf7f8853ad4e4e (patch) | |
| tree | dfe5d964d755eaf7e5ac83bb81befcac42353fb3 | |
| parent | bef9ccecefbac26a1ce06c7590cdb2190a83271a (diff) | |
| download | poi-service-b7d33c478901058371a14a396ccf7f8853ad4e4e.tar.gz | |
[poi-service-poc] Update scripts and README
| -rw-r--r-- | src/poi-service/script/get-positioning.mk | 2 | ||||
| -rw-r--r-- | src/poi-service/script/poi-server.mk | 2 | ||||
| -rw-r--r-- | test/poi-service/README | 6 | ||||
| -rw-r--r-- | test/poi-service/script/Makefile | 2 | ||||
| -rw-r--r-- | test/poi-service/script/poi-supplier.mk | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/src/poi-service/script/get-positioning.mk b/src/poi-service/script/get-positioning.mk index 442ffc9..42f0206 100644 --- a/src/poi-service/script/get-positioning.mk +++ b/src/poi-service/script/get-positioning.mk @@ -27,7 +27,7 @@ positioning_SRC=$(ROOT_DIR)/positioning positioning_API=$(positioning_SRC)/enhanced-position-service/api positioning_URL=http://git.projects.genivi.org/lbs/positioning.git -positioning_VERSION=183d134e734e157c498f6cff367d104e4c5ad670 +positioning_VERSION=c97c3e10cb0f38dfed5e17b995e33173567d2dbf ALL+=positioning CLEAN+=clean-get-positioning diff --git a/src/poi-service/script/poi-server.mk b/src/poi-service/script/poi-server.mk index ffbb070..8d8103c 100644 --- a/src/poi-service/script/poi-server.mk +++ b/src/poi-service/script/poi-server.mk @@ -25,7 +25,7 @@ # @licence end@ POI_SERVER_SRC_DIR=$(ROOT_DIR)/poi-server POI_SERVER_BIN_DIR=$(BIN_DIR)/poi-server-bin -POI_SERVER_DEPS=POI_SERVER_LIBSqlite3-dev sqlite3 +POI_SERVER_DEPS=libsqlite3-dev sqlite3 POI_SERVER_INCPATH=-I$(COMMON_DIR) -I$(POI_SERVER_SRC_DIR) -I/usr/include/glibmm-2.4 -I/usr/lib/i386-linux-gnu/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/dbus-c++-1 -I/usr/include/dbus-1.0 -I/usr/lib/i386-linux-gnu/dbus-1.0/include POI_SERVER_LIBS=-lglibmm-2.4 -lglib-2.0 -lgobject-2.0 -lsqlite3 -ldbus-c++-glib-1 -ldbus-c++-1 -ldbus-1 POI_SERVER_LINK=g++ diff --git a/test/poi-service/README b/test/poi-service/README index b21107e..9753e58 100644 --- a/test/poi-service/README +++ b/test/poi-service/README @@ -1,4 +1,4 @@ -Release date of the file: 11-04-2014 +Release date of the file: 26-05-2014 Status: to be completed Project: @@ -25,6 +25,10 @@ See headers and LICENSE file (mainly MPL V2) Test target: Ubuntu 12.04.1 LTS +Ubuntu 14.04 LTS + +Qt version: +Qt4 (to get the version -> qtchooser -print-env, to set the version -> export QT-SELECT=<version>) To get the code: Code is part of the navigation-service repository, so you need to clone all: diff --git a/test/poi-service/script/Makefile b/test/poi-service/script/Makefile index 613ded3..dec1f5e 100644 --- a/test/poi-service/script/Makefile +++ b/test/poi-service/script/Makefile @@ -52,7 +52,7 @@ include poi-client.mk include poi-contentaccess-module.mk all: $(ALL) - + deps:: sudo apt-get install $(DEPS) diff --git a/test/poi-service/script/poi-supplier.mk b/test/poi-service/script/poi-supplier.mk index cabf5a3..d0f3a86 100644 --- a/test/poi-service/script/poi-supplier.mk +++ b/test/poi-service/script/poi-supplier.mk @@ -26,7 +26,7 @@ POI_SUPPLIER_SRC_DIR=$(ROOT_DIR)/poi-supplier POI_SUPPLIER_COMMON_DIR=$(ROOT_DIR)/poi-common POI_SUPPLIER_BIN_DIR=$(BIN_DIR)/poi-supplier-bin -POI_SUPPLIER_DEPS=libxml2-dev POI_SUPPLIER_LIBSqlite3-dev sqlite3 +POI_SUPPLIER_DEPS=libxml2-dev libsqlite3-dev sqlite3 libxml++2.6-dev POI_SUPPLIER_INCPATH=-I$(POI_SUPPLIER_COMMON_DIR) -I$(POI_SUPPLIER_SRC_DIR) -I/usr/include/libxml++-2.6 -I/usr/lib/libxml++-2.6/include -I/usr/include/libxml2 -I/usr/include/glibmm-2.4 -I/usr/lib/i386-linux-gnu/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include POI_SUPPLIER_LIBS=-lxml++-2.6 -lxml2 -lglibmm-2.4 -lglib-2.0 -lgobject-2.0 -lsqlite3 POI_SUPPLIER_LINK=g++ |