diff options
| author | Martin Schaller <martin.schaller@it-schaller.de> | 2014-05-04 14:25:10 -0700 |
|---|---|---|
| committer | Martin Schaller <martin.schaller@it-schaller.de> | 2014-05-04 14:25:10 -0700 |
| commit | 971bc1f646161a7f6d974b0ae986b0c1e9e197be (patch) | |
| tree | 359085fb32eb0bd0c29c2ad26a64f43301fbe0d9 | |
| parent | fc7c9dd42f98a6afee2d9cdee11b005a421da6f3 (diff) | |
| download | poi-service-971bc1f646161a7f6d974b0ae986b0c1e9e197be.tar.gz | |
Adapted positioning to open source version
| -rw-r--r-- | src/navigation/script/0positioning.mk | 23 | ||||
| -rwxr-xr-x | src/navigation/script/run | 2 |
2 files changed, 16 insertions, 9 deletions
diff --git a/src/navigation/script/0positioning.mk b/src/navigation/script/0positioning.mk index efb626b..51b3817 100644 --- a/src/navigation/script/0positioning.mk +++ b/src/navigation/script/0positioning.mk @@ -24,10 +24,12 @@ # # @licence end@ positioning_BIN=$(BIN_DIR)/positioning -positioning_URL=https://git.genivi.org/srv/git/positioning -positioning_VERSION=daaf1b10766b04f5b1b6fa7fb7fc465bc48debb2 +gnss-service_BIN=$(BIN_DIR)/gnss-service +sensors-service_BIN=$(BIN_DIR)/sensors-service +positioning_URL=http://git.projects.genivi.org/lbs/positioning.git +positioning_VERSION=HEAD positioning_SRC=$(SRC_DIR)/positioning_$(positioning_VERSION) -positioning_API=$(positioning_SRC)/EnhancedPositionService/api +positioning_API=$(positioning_SRC)/enhanced-position-service/api ALL+=positioning @@ -35,13 +37,18 @@ help:: @echo "positioning: Build positioning" -positioning: $(positioning_BIN)/EnhancedPositionService/src/server/position-daemon +positioning: $(positioning_BIN)/enhanced-position-service/src/server/position-daemon -$(positioning_BIN)/Makefile: $(positioning_SRC)/CMakeLists.txt - mkdir -p $(positioning_BIN) - cd $(positioning_BIN) && cmake -DWITH_GPSD=OFF -DWITH_DLT=OFF -DWITH_REPLAYER=ON -DWITH_TESTS=OFF $(positioning_SRC) +$(positioning_BIN)/Makefile: $(positioning_SRC)/enhanced-position-service/CMakeLists.txt + mkdir -p $(positioning_BIN) $(gnss-service_BIN) $(sensors-service_BIN) + cd $(gnss-service_BIN) && cmake $(positioning_SRC)/gnss-service + cd $(sensors-service_BIN) && cmake $(positioning_SRC)/sensors-service + cd $(positioning_BIN) && cmake -DWITH_GPSD=OFF -DWITH_DLT=OFF -DWITH_REPLAYER=ON -DWITH_TESTS=OFF $(positioning_SRC)/enhanced-position-service -$(positioning_BIN)/EnhancedPositionService/src/server/position-daemon: $(positioning_BIN)/Makefile + +$(positioning_BIN)/enhanced-position-service/src/server/position-daemon: $(positioning_BIN)/Makefile + cd $(gnss-service_BIN) && make + cd $(sensors-service_BIN) && make cd $(positioning_BIN) && make $(positioning_SRC)/CMakeLists.txt: diff --git a/src/navigation/script/run b/src/navigation/script/run index 15b0165..d456020 100755 --- a/src/navigation/script/run +++ b/src/navigation/script/run @@ -117,7 +117,7 @@ then REPLAYER_LOG_FILE=$SRC_DIR/positioning/provider/rest/geneve-cologny.gvsl fi export REPLAYER_LOG_FILE - run EnhancedPositionService $BIN_DIR/positioning/EnhancedPositionService/src/server/position-daemon + run EnhancedPositionService $BIN_DIR/positioning/src/position-daemon fi cd $BIN_DIR/navit/navit >bookmark.txt |