diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-09-29 10:27:03 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-09-29 10:27:03 +0000 |
| commit | 32ae690c425912435491c0954193d3e1ec52ba59 (patch) | |
| tree | 618ada69333ce386d80bb6a57e6a0737b78176fa | |
| parent | 9a52c8e0fa323b51f827bfc84f10e10cd917e8a5 (diff) | |
| download | poi-service-32ae690c425912435491c0954193d3e1ec52ba59.tar.gz | |
Use positioning submodule rather than doing git clone
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | src/navigation/script/0positioning.mk | 7 | ||||
| -rw-r--r-- | src/navigation/script/navigation-core.mk | 2 | ||||
| -rw-r--r-- | src/poi-service/script/get-positioning.mk | 9 | ||||
| m--------- | src/positioning | 0 |
6 files changed, 7 insertions, 18 deletions
@@ -4,13 +4,9 @@ *-release/ *-Release/ bin/ -positioning/ #files *~ *.pro.user /.project - -positioning_*/ - diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2e6c21f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/positioning"] + path = src/positioning + url = http://git.projects.genivi.org/lbs/positioning.git diff --git a/src/navigation/script/0positioning.mk b/src/navigation/script/0positioning.mk index 293a392..84dbcaf 100644 --- a/src/navigation/script/0positioning.mk +++ b/src/navigation/script/0positioning.mk @@ -36,19 +36,14 @@ enhanced-position-service_BIN=$(positioning_BIN)/enhanced-position-service positioning_URL=file:///usr/share/fsa-deps/positioning positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026 -positioning_SRC=$(SRC_DIR)/positioning_$(positioning_VERSION) +positioning_SRC=$(SRC_DIR)/../positioning positioning_API=$(positioning_SRC)/enhanced-position-service/api ALL+=positioning -SRC_CLEAN+=clean-positioning_SRC - help:: @echo "positioning: Build positioning" -clean-positioning_SRC:: - rm -rf $(SRC_DIR)/positioning_* - positioning: $(positioning_BIN)/enhanced-position-service $(positioning_BIN)/enhanced-position-service: $(positioning_BIN)/Makefile diff --git a/src/navigation/script/navigation-core.mk b/src/navigation/script/navigation-core.mk index 619f006..1148933 100644 --- a/src/navigation/script/navigation-core.mk +++ b/src/navigation/script/navigation-core.mk @@ -40,7 +40,7 @@ navigationcore-session_BIN=$(BIN_DIR)/navigationcore-session navigationcore-enhancedposition_SRC=$(navigationcore_SRC)/enhancedposition-plugin navigationcore-enhancedposition_BIN=$(BIN_DIR)/navigationcore-enhancedposition positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026 -positioning_SRC=$(SRC_DIR)/positioning_$(positioning_VERSION) +positioning_SRC=$(SRC_DIR)/../positioning positioning_API=$(positioning_SRC)/enhanced-position-service/api NAVIGATIONCORE_DEPS=cmake xsltproc libdbus-c++-dev libdbus-1-dev libdbus-c++-bin diff --git a/src/poi-service/script/get-positioning.mk b/src/poi-service/script/get-positioning.mk index 963b35c..5216180 100644 --- a/src/poi-service/script/get-positioning.mk +++ b/src/poi-service/script/get-positioning.mk @@ -25,22 +25,17 @@ # 4/6/2014, Philippe Colliot, complete src-clean option # # @licence end@ -positioning_SRC=$(ROOT_DIR)/positioning +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=09698f63ea27a24c533b4c015155ee9ebd7a3026 ALL+=positioning -SRC_CLEAN+=clean-positioning_SRC help:: @echo "positioning: Get positioning" positioning: $(positioning_API)/genivi-positioning-enhancedposition.xml -clean-positioning_SRC:: - rm -rf $(positioning_SRC) - $(positioning_API)/genivi-positioning-enhancedposition.xml: - cd $(positioning_SRC)/.. && git clone $(positioning_URL) - cd $(positioning_SRC) && git checkout $(positioning_VERSION) + true diff --git a/src/positioning b/src/positioning new file mode 160000 +Subproject c3b7720de1dcc53936149d6541299b5ccd500c0 |