diff options
| author | philippe colliot <philippe.colliot@mpsa.com> | 2014-04-28 11:55:59 +0200 |
|---|---|---|
| committer | philippe colliot <philippe.colliot@mpsa.com> | 2014-04-28 11:55:59 +0200 |
| commit | aad2583ef5a374185857680d7b0479f5b8039223 (patch) | |
| tree | 86d7aa62cf230e447bc9730b95cbc530c6a31e83 | |
| parent | f4451562af6cfccfac4752cc551a3fd22d98f07b (diff) | |
| download | poi-service-aad2583ef5a374185857680d7b0479f5b8039223.tar.gz | |
poi-service: update license, get positioning from the public repos, add
clean feature
| -rw-r--r-- | doc/poi-service/LICENSE | 2 | ||||
| -rw-r--r-- | doc/poi-service/POIServiceAPI.pdf | bin | 846934 -> 849405 bytes | |||
| -rw-r--r-- | src/poi-service/LICENSE | 1 | ||||
| -rw-r--r-- | src/poi-service/script/get-positioning.mk | 13 | ||||
| -rw-r--r-- | test/poi-service/script/get-positioning.mk | 13 |
5 files changed, 18 insertions, 11 deletions
diff --git a/doc/poi-service/LICENSE b/doc/poi-service/LICENSE index 2ece8e3..094e4c2 100644 --- a/doc/poi-service/LICENSE +++ b/doc/poi-service/LICENSE @@ -1,2 +1,2 @@ -The documentation is published under the terms of the Creative Commons Attribution Share-Alike 3.0 License +The documentation is published under the terms of the Creative Commons Attribution Share-Alike 4.0 License See here for more details: http://creativecommons.org/ diff --git a/doc/poi-service/POIServiceAPI.pdf b/doc/poi-service/POIServiceAPI.pdf Binary files differindex 02125ac..ad5a1a6 100644 --- a/doc/poi-service/POIServiceAPI.pdf +++ b/doc/poi-service/POIServiceAPI.pdf diff --git a/src/poi-service/LICENSE b/src/poi-service/LICENSE index 5eb5f4f..35f0781 100644 --- a/src/poi-service/LICENSE +++ b/src/poi-service/LICENSE @@ -11,6 +11,7 @@ * Some part of the code is subject of the terms of other licenses: * Apache License Version 2.0 * Creative Commons Attribution Share-Alike 3.0 License + * Creative Commons Attribution Share-Alike 4.0 License * Nokia Qt LGPL 2.1 Exception 1.0 License * Nokia Qt LGPL 2.1 Exception 1.1 License * Data used for populating the POI database is downloaded from this site diff --git a/src/poi-service/script/get-positioning.mk b/src/poi-service/script/get-positioning.mk index 9f3a350..442ffc9 100644 --- a/src/poi-service/script/get-positioning.mk +++ b/src/poi-service/script/get-positioning.mk @@ -8,6 +8,7 @@ # \brief This file is part of the Build System. # # \author Martin Schaller <martin.schaller@it-schaller.de> +# \author Philippe Colliot <philippe.colliot@mpsa.com> # # \version 1.0 # @@ -20,22 +21,24 @@ # # List of changes: # -# <date>, <name>, <description of change> -# +# 28-04-2014, Philippe Colliot, link to the public repos of positioning, add clean feature +# # @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 +positioning_URL=http://git.projects.genivi.org/lbs/positioning.git +positioning_VERSION=183d134e734e157c498f6cff367d104e4c5ad670 ALL+=positioning +CLEAN+=clean-get-positioning help:: @echo "positioning: Get positioning" - positioning: $(positioning_API)/genivi-positioning-enhancedposition.xml +clean-get-positioning:: + rm -rf $(positioning_SRC) $(positioning_API)/genivi-positioning-enhancedposition.xml: cd $(positioning_SRC)/.. && git clone $(positioning_URL) diff --git a/test/poi-service/script/get-positioning.mk b/test/poi-service/script/get-positioning.mk index 9f3a350..442ffc9 100644 --- a/test/poi-service/script/get-positioning.mk +++ b/test/poi-service/script/get-positioning.mk @@ -8,6 +8,7 @@ # \brief This file is part of the Build System. # # \author Martin Schaller <martin.schaller@it-schaller.de> +# \author Philippe Colliot <philippe.colliot@mpsa.com> # # \version 1.0 # @@ -20,22 +21,24 @@ # # List of changes: # -# <date>, <name>, <description of change> -# +# 28-04-2014, Philippe Colliot, link to the public repos of positioning, add clean feature +# # @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 +positioning_URL=http://git.projects.genivi.org/lbs/positioning.git +positioning_VERSION=183d134e734e157c498f6cff367d104e4c5ad670 ALL+=positioning +CLEAN+=clean-get-positioning help:: @echo "positioning: Get positioning" - positioning: $(positioning_API)/genivi-positioning-enhancedposition.xml +clean-get-positioning:: + rm -rf $(positioning_SRC) $(positioning_API)/genivi-positioning-enhancedposition.xml: cd $(positioning_SRC)/.. && git clone $(positioning_URL) |