poi-service: update scripts

8 files changed, 110 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 0730a5b..c322685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *-debug/
 *-release/
 bin/
+positioning/
 
 #files
 *~
diff --git a/src/poi-service/script/Makefile b/src/poi-service/script/Makefile
index b5246ab..5ee66bf 100644
--- a/src/poi-service/script/Makefile
+++ b/src/poi-service/script/Makefile
@@ -42,7 +42,8 @@ help::
 	@echo "all: Build $(ALL)"
 	@echo "clean: Clean up build dir"
 
-#Generate the proxies and adaptors for the DBus APIs first
+#Clone the positioning repository for getting the API, generate the proxies and adaptors for the DBus APIs firstly
+include get-positioning.mk
 include generate-api.mk
 
 include poi-server.mk
diff --git a/src/poi-service/script/generate-api.mk b/src/poi-service/script/generate-api.mk
index 82dcea7..5176acd 100644
--- a/src/poi-service/script/generate-api.mk
+++ b/src/poi-service/script/generate-api.mk
@@ -76,17 +76,18 @@ ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h: ${API_DIR}/
 ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h: ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
 	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h
 
-${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h: ${API_DIR}/enhanced-position-service/genivi-positioning-enhancedposition.xml
-	dbusxx-xml2cpp ${API_DIR}/enhanced-position-service/genivi-positioning-enhancedposition.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h
+${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h: ${positioning_API}/genivi-positioning-enhancedposition.xml
+	dbusxx-xml2cpp ${positioning_API}/genivi-positioning-enhancedposition.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h
 
-${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h: ${API_DIR}/enhanced-position-service/genivi-positioning-enhancedposition.xml
-	dbusxx-xml2cpp ${API_DIR}/enhanced-position-service/genivi-positioning-enhancedposition.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h
+${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h: ${positioning_API}/genivi-positioning-enhancedposition.xml
+	dbusxx-xml2cpp ${positioning_API}/genivi-positioning-enhancedposition.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h
 
 ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h: ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml
 	xsltproc ${API_DIR}/navigation-core/enum.xsl ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h
 
-${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h: ${API_DIR}/enhanced-position-service/genivi-positioning-constants.xml
-	xsltproc ${API_DIR}/enhanced-position-service/enum.xsl ${API_DIR}/enhanced-position-service/genivi-positioning-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h
+#use the enum.xsl of navigation-core to generate the positioning constants
+${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h: ${positioning_API}/genivi-positioning-constants.xml
+	xsltproc ${API_DIR}/navigation-core/enum.xsl ${positioning_API}/genivi-positioning-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h
 
 ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h: ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml
 	xsltproc ${API_DIR}/map-viewer/enum.xsl ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h
diff --git a/src/poi-service/script/get-positioning.mk b/src/poi-service/script/get-positioning.mk
new file mode 100644
index 0000000..9f3a350
--- /dev/null
+++ b/src/poi-service/script/get-positioning.mk
@@ -0,0 +1,42 @@
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
+#
+# \file get-positioning.mk
+#
+# \brief This file is part of the Build System.
+#
+# \author Martin Schaller <martin.schaller@it-schaller.de>
+#
+# \version 1.0
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+#
+# List of changes:
+# 
+# <date>, <name>, <description of change>
+#
+# @licence end@
+positioning_SRC=$(ROOT_DIR)/positioning
+positioning_API=$(positioning_SRC)/enhanced-position-service/api
+positioning_URL=https://git.genivi.org/srv/git/positioning
+positioning_VERSION=7cd257d8fdfcd35ca4d0757cc269c2f9925009a0
+
+ALL+=positioning
+
+help::
+	@echo "positioning: Get positioning"
+
+
+positioning: $(positioning_API)/genivi-positioning-enhancedposition.xml
+
+
+$(positioning_API)/genivi-positioning-enhancedposition.xml:
+	cd $(positioning_SRC)/.. && git clone $(positioning_URL)
+	cd $(positioning_SRC) && git checkout $(positioning_VERSION)
diff --git a/test/poi-service/script/Makefile b/test/poi-service/script/Makefile
index 366f779..613ded3 100644
--- a/test/poi-service/script/Makefile
+++ b/test/poi-service/script/Makefile
@@ -43,7 +43,8 @@ help::
 	@echo "all: Build $(ALL)"
 	@echo "clean: Clean up build dir"
 
-#Generate the proxies and adaptors for the DBus APIs first
+#Clone the positioning repository for getting the API, generate the proxies and adaptors for the DBus APIs firstly
+include get-positioning.mk
 include generate-api.mk
 
 include poi-supplier.mk
diff --git a/test/poi-service/script/generate-api.mk b/test/poi-service/script/generate-api.mk
index 7e2fca6..5176acd 100644
--- a/test/poi-service/script/generate-api.mk
+++ b/test/poi-service/script/generate-api.mk
@@ -39,7 +39,7 @@ clean-generate-api::
 	rm -rf ${TARGET_GENERATED_API_DIR}/*_proxy.h
 	rm -rf ${TARGET_GENERATED_API_DIR}/*_constants.h
 
-generate-api-poi: ${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h
+generate-api-poi:: ${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h
 
 ${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h: ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml 
 	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h
@@ -62,7 +62,7 @@ ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_proxy.h: ${API_DIR}/poi-
 ${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h: ${API_DIR}/poi-service/genivi-poiservice-constants.xml 
 	xsltproc ${API_DIR}/poi-service/enum.xsl ${API_DIR}/poi-service/genivi-poiservice-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h
 
-generate-api-other: ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h
+generate-api-other:: ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h
 
 ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h: ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml
 	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h
@@ -76,17 +76,18 @@ ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h: ${API_DIR}/
 ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h: ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
 	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h
 
-${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h: ${API_DIR}/enhanced-position-service/genivi-positioning-enhancedposition.xml
-	dbusxx-xml2cpp ${API_DIR}/enhanced-position-service/genivi-positioning-enhancedposition.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h
+${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h: ${positioning_API}/genivi-positioning-enhancedposition.xml
+	dbusxx-xml2cpp ${positioning_API}/genivi-positioning-enhancedposition.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h
 
-${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h: ${API_DIR}/enhanced-position-service/genivi-positioning-enhancedposition.xml
-	dbusxx-xml2cpp ${API_DIR}/enhanced-position-service/genivi-positioning-enhancedposition.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h
+${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h: ${positioning_API}/genivi-positioning-enhancedposition.xml
+	dbusxx-xml2cpp ${positioning_API}/genivi-positioning-enhancedposition.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h
 
 ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h: ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml
 	xsltproc ${API_DIR}/navigation-core/enum.xsl ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h
 
-${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h: ${API_DIR}/enhanced-position-service/genivi-positioning-constants.xml
-	xsltproc ${API_DIR}/enhanced-position-service/enum.xsl ${API_DIR}/enhanced-position-service/genivi-positioning-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h
+#use the enum.xsl of navigation-core to generate the positioning constants
+${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h: ${positioning_API}/genivi-positioning-constants.xml
+	xsltproc ${API_DIR}/navigation-core/enum.xsl ${positioning_API}/genivi-positioning-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h
 
 ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h: ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml
 	xsltproc ${API_DIR}/map-viewer/enum.xsl ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h
diff --git a/test/poi-service/script/get-positioning.mk b/test/poi-service/script/get-positioning.mk
new file mode 100644
index 0000000..9f3a350
--- /dev/null
+++ b/test/poi-service/script/get-positioning.mk
@@ -0,0 +1,42 @@
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
+#
+# \file get-positioning.mk
+#
+# \brief This file is part of the Build System.
+#
+# \author Martin Schaller <martin.schaller@it-schaller.de>
+#
+# \version 1.0
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+#
+# List of changes:
+# 
+# <date>, <name>, <description of change>
+#
+# @licence end@
+positioning_SRC=$(ROOT_DIR)/positioning
+positioning_API=$(positioning_SRC)/enhanced-position-service/api
+positioning_URL=https://git.genivi.org/srv/git/positioning
+positioning_VERSION=7cd257d8fdfcd35ca4d0757cc269c2f9925009a0
+
+ALL+=positioning
+
+help::
+	@echo "positioning: Get positioning"
+
+
+positioning: $(positioning_API)/genivi-positioning-enhancedposition.xml
+
+
+$(positioning_API)/genivi-positioning-enhancedposition.xml:
+	cd $(positioning_SRC)/.. && git clone $(positioning_URL)
+	cd $(positioning_SRC) && git checkout $(positioning_VERSION)
diff --git a/test/poi-service/script/run b/test/poi-service/script/run
index a236a09..fad6697 100755
--- a/test/poi-service/script/run
+++ b/test/poi-service/script/run
@@ -49,6 +49,11 @@ then
 	cd $CURDIR
 fi
 
+if [ ! -f $MAIN_DATABASE ]
+then
+	echo 'no database available, do ./prepare <name of city> first'
+	exit
+fi
 
 read language <$EXE_DIR/language.txt
 echo $language