diff options
author | <philippe colliot> | 2014-09-23 15:00:36 +0200 |
---|---|---|
committer | <philippe colliot> | 2014-09-23 15:00:36 +0200 |
commit | 8f449cdaad42c00f7bd5d7e3b81bef5f64caa4a3 (patch) | |
tree | d9b1382afe6a3a97b74f336b5cd0a1aa6e3b71eb | |
parent | e0c8437f49e4d20439fe0f961e76379e704deb13 (diff) | |
download | poi-service-8f449cdaad42c00f7bd5d7e3b81bef5f64caa4a3.tar.gz |
navigation: allow build.sh to be remotely called with parameters
-rw-r--r-- | src/navigation/script/Makefile | 72 | ||||
-rwxr-xr-x | src/navigation/script/build.sh | 146 |
2 files changed, 82 insertions, 136 deletions
diff --git a/src/navigation/script/Makefile b/src/navigation/script/Makefile deleted file mode 100644 index 5597f45..0000000 --- a/src/navigation/script/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen -# -# \file Makefile -# -# \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 -# -# 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: -# -# 4/6/2014, Philippe Colliot, complete src-clean option -# 18/6/2014, Philippe Colliot, APT_GET option for Fedora -# -# @licence end@ -SRC_DIR=$(CURDIR)/../../navigation -PATCH_DIR=$(SRC_DIR)/patches -API_DIR=$(CURDIR)/../../../api -BIN_DIR=$(CURDIR)/../bin -MAP_DIR=$(CURDIR)/../../map -CONSTANTS_BIN=$(BIN_DIR)/constants - -QMAKE=qmake -ifndef $(APT_GET) - APT_GET=apt-get -endif - -default: help - -help:: - @echo "The following targets exist" - @echo "all: Build $(ALL)" - @echo "all2: Install all necessary dependencies and build all" - @echo "clean: Clean up build dir" - @echo "src-clean: Clean up all checked out sources" - @echo "make APT_GET=yum for Fedora, by default APT_GET is set to apt-get" - -#initialize the variable ALL to an empty string -ALL= - -#include makefiles -include *.mk - -#ALL is updated in the makefiles -all: $(ALL) - -src-clean: $(SRC_CLEAN) - -deps:: - sudo $(APT_GET) install $(DEPS) - # See https://bugs.launchpad.net/ubuntu/+source/freetype/+bug/1319642 why this is necessary - [ -e /usr/include/freetype2/freetype ] || sudo ln -s . /usr/include/freetype2/freetype - - -all2: deps all - -navit-plugins: all - -clean: - rm -rf $(BIN_DIR) diff --git a/src/navigation/script/build.sh b/src/navigation/script/build.sh index eef03c2..0f8d3d1 100755 --- a/src/navigation/script/build.sh +++ b/src/navigation/script/build.sh @@ -16,84 +16,31 @@ # # @licence end@ ########################################################################### -TOP_DIR=$PWD/.. -TOP_BIN_DIR=$PWD/../bin NAVIGATION_CORE=navigation-core -NAVIGATION_CORE_SRC_DIR=$TOP_DIR/$NAVIGATION_CORE -NAVIGATION_CORE_API_DIR=$TOP_DIR/../../api/$NAVIGATION_CORE - MAP_VIEWER=map-viewer -MAP_VIEWER_SRC_DIR=$TOP_DIR/$MAP_VIEWER -MAP_VIEWER_API_DIR=$TOP_DIR/../../api/$MAP_VIEWER - POI_SERVICE=poi-service -POI_SERVICE_API_DIR=$TOP_DIR/../../api/$POI_SERVICE - POI_CAM=poi-cam -POI_CAM_SRC_DIR=$TOP_DIR/$POI_CAM -POI_CAM_BIN_DIR=$TOP_BIN_DIR/$POI_CAM - NAVIGATION_CORE_CONFIGURATION=navigationcore-configuration -NAVIGATION_CORE_CONFIGURATION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/configuration-plugin -NAVIGATION_CORE_CONFIGURATION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_CONFIGURATION - NAVIGATION_CORE_GUIDANCE=navigationcore-guidance -NAVIGATION_CORE_GUIDANCE_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/guidance-plugin -NAVIGATION_CORE_GUIDANCE_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_GUIDANCE - NAVIGATION_CORE_LOCATIONINPUT=navigationcore-locationinput -NAVIGATION_CORE_LOCATIONINPUT_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/locationinput-plugin -NAVIGATION_CORE_LOCATIONINPUT_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_LOCATIONINPUT - NAVIGATION_CORE_MAPMATCHEDPOSITION=navigationcore-mapmatchedposition -NAVIGATION_CORE_MAPMATCHEDPOSITION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/mapmatchedposition-plugin -NAVIGATION_CORE_MAPMATCHEDPOSITION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_MAPMATCHEDPOSITION - NAVIGATION_CORE_ROUTING=navigationcore-routing -NAVIGATION_CORE_ROUTING_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/routing-plugin -NAVIGATION_CORE_ROUTING_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_ROUTING - NAVIGATION_CORE_SESSION=navigationcore-session -NAVIGATION_CORE_SESSION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/session-plugin -NAVIGATION_CORE_SESSION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_SESSION - NAVIGATION_CORE_ENHANCEDPOSITION=navigationcore-enhancedposition -NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/enhancedposition-plugin -NAVIGATION_CORE_ENHANCEDPOSITION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_ENHANCEDPOSITION - MAP_VIEWER_CONFIGURATION=mapviewer-configuration -MAP_VIEWER_CONFIGURATION_SRC_DIR=$MAP_VIEWER_SRC_DIR/configuration-plugin -MAP_VIEWER_CONFIGURATION_BIN_DIR=$TOP_BIN_DIR/$MAP_VIEWER_CONFIGURATION - MAP_VIEWER_MAPVIEWERCONTROL=mapviewer-mapviewercontrol -MAP_VIEWER_MAPVIEWERCONTROL_SRC_DIR=$MAP_VIEWER_SRC_DIR/mapviewercontrol-plugin -MAP_VIEWER_MAPVIEWERCONTROL_BIN_DIR=$TOP_BIN_DIR/$MAP_VIEWER_MAPVIEWERCONTROL - MAP_VIEWER_SESSION=mapviewer-session -MAP_VIEWER_SESSION_SRC_DIR=$MAP_VIEWER_SRC_DIR/session-plugin -MAP_VIEWER_SESSION_BIN_DIR=$TOP_BIN_DIR/$MAP_VIEWER_SESSION - POSITIONING=positioning -POSITIONING_SRC_DIR=$TOP_DIR/$POSITIONING -POSITIONING_BIN_DIR=$TOP_BIN_DIR/$POSITIONING LOG_REPLAYER=log-replayer -LOG_REPLAYER_SRC_DIR=$POSITIONING_SRC_DIR/$LOG_REPLAYER -LOG_REPLAYER_BIN_DIR=$POSITIONING_BIN_DIR/$LOG_REPLAYER GNSS_SERVICE=gnss-service -GNSS_SERVICE_SRC_DIR=$POSITIONING_SRC_DIR/$GNSS_SERVICE -GNSS_SERVICE_BIN_DIR=$POSITIONING_BIN_DIR/$GNSS_SERVICE SENSORS_SERVICE=sensors-service -SENSORS_SERVICE_SRC_DIR=$POSITIONING_SRC_DIR/$SENSORS_SERVICE -SENSORS_SERVICE_BIN_DIR=$POSITIONING_BIN_DIR/$SENSORS_SERVICE ENHANCED_POSITION_SERVICE=enhanced-position-service -ENHANCED_POSITION_SERVICE_SRC_DIR=$POSITIONING_SRC_DIR/$ENHANCED_POSITION_SERVICE -ENHANCED_POSITION_SERVICE_BIN_DIR=$POSITIONING_BIN_DIR/$ENHANCED_POSITION_SERVICE -POSITIONING_API_DIR=$TOP_DIR/$POSITIONING/$ENHANCED_POSITION_SERVICE/api - NAVIT=navit -NAVIT_SRC_DIR=$TOP_DIR/$NAVIT -NAVIT_BIN_DIR=$TOP_BIN_DIR/$NAVIT + +target_root=$PWD/.. +target_bin=$PWD/../bin #by default +target_positioning=$PWD/../$POSITIONING #by default #-------------------------------------------------------------------------- # Compiler Flags @@ -102,17 +49,82 @@ NAVIT_BIN_DIR=$TOP_BIN_DIR/$NAVIT NAVIT_FLAGS='-DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0' # +set-path() +{ + TOP_DIR=$target_root + TOP_BIN_DIR=$target_bin + + NAVIGATION_CORE_SRC_DIR=$TOP_DIR/$NAVIGATION_CORE + NAVIGATION_CORE_API_DIR=$TOP_DIR/../../api/$NAVIGATION_CORE + + MAP_VIEWER_SRC_DIR=$TOP_DIR/$MAP_VIEWER + MAP_VIEWER_API_DIR=$TOP_DIR/../../api/$MAP_VIEWER + + POI_SERVICE_API_DIR=$TOP_DIR/../../api/$POI_SERVICE + + POI_CAM_SRC_DIR=$TOP_DIR/$POI_CAM + POI_CAM_BIN_DIR=$TOP_BIN_DIR/$POI_CAM + + NAVIGATION_CORE_CONFIGURATION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/configuration-plugin + NAVIGATION_CORE_CONFIGURATION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_CONFIGURATION + + NAVIGATION_CORE_GUIDANCE_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/guidance-plugin + NAVIGATION_CORE_GUIDANCE_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_GUIDANCE + + NAVIGATION_CORE_LOCATIONINPUT_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/locationinput-plugin + NAVIGATION_CORE_LOCATIONINPUT_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_LOCATIONINPUT + + NAVIGATION_CORE_MAPMATCHEDPOSITION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/mapmatchedposition-plugin + NAVIGATION_CORE_MAPMATCHEDPOSITION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_MAPMATCHEDPOSITION + + NAVIGATION_CORE_ROUTING_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/routing-plugin + NAVIGATION_CORE_ROUTING_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_ROUTING + + NAVIGATION_CORE_SESSION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/session-plugin + NAVIGATION_CORE_SESSION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_SESSION + + NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/enhancedposition-plugin + NAVIGATION_CORE_ENHANCEDPOSITION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_ENHANCEDPOSITION + + MAP_VIEWER_CONFIGURATION_SRC_DIR=$MAP_VIEWER_SRC_DIR/configuration-plugin + MAP_VIEWER_CONFIGURATION_BIN_DIR=$TOP_BIN_DIR/$MAP_VIEWER_CONFIGURATION + + MAP_VIEWER_MAPVIEWERCONTROL_SRC_DIR=$MAP_VIEWER_SRC_DIR/mapviewercontrol-plugin + MAP_VIEWER_MAPVIEWERCONTROL_BIN_DIR=$TOP_BIN_DIR/$MAP_VIEWER_MAPVIEWERCONTROL + + MAP_VIEWER_SESSION_SRC_DIR=$MAP_VIEWER_SRC_DIR/session-plugin + MAP_VIEWER_SESSION_BIN_DIR=$TOP_BIN_DIR/$MAP_VIEWER_SESSION + + POSITIONING_SRC_DIR=$target_positioning + POSITIONING_BIN_DIR=$TOP_BIN_DIR/$POSITIONING + LOG_REPLAYER_SRC_DIR=$POSITIONING_SRC_DIR/$LOG_REPLAYER + LOG_REPLAYER_BIN_DIR=$POSITIONING_BIN_DIR/$LOG_REPLAYER + GNSS_SERVICE_SRC_DIR=$POSITIONING_SRC_DIR/$GNSS_SERVICE + GNSS_SERVICE_BIN_DIR=$POSITIONING_BIN_DIR/$GNSS_SERVICE + SENSORS_SERVICE_SRC_DIR=$POSITIONING_SRC_DIR/$SENSORS_SERVICE + SENSORS_SERVICE_BIN_DIR=$POSITIONING_BIN_DIR/$SENSORS_SERVICE + ENHANCED_POSITION_SERVICE_SRC_DIR=$POSITIONING_SRC_DIR/$ENHANCED_POSITION_SERVICE + ENHANCED_POSITION_SERVICE_BIN_DIR=$POSITIONING_BIN_DIR/$ENHANCED_POSITION_SERVICE + POSITIONING_API_DIR=$TOP_DIR/$POSITIONING/$ENHANCED_POSITION_SERVICE/api + + NAVIT_SRC_DIR=$TOP_DIR/$NAVIT + NAVIT_BIN_DIR=$TOP_BIN_DIR/$NAVIT +} + + usage() { echo "Usage: ./build.sh Build navigation" - echo " or: ./build.sh [command]" + echo " or: ./build.sh [command])" + echo " or: ./build.sh [command] <target bin> <target positioning>)" echo echo "command:" - echo " make Build" - echo " clean Clean" - echo " src-clean Clean the cloned sources" - echo " help Print Help" - echo - echo + echo " make Build" + echo " make <target bin> <target positioning> Build and set targets " + echo " <target bin> Path of the binaries (full path)" + echo " <target positioning> Path of the positioning code (full path)" + echo " clean Clean" + echo " src-clean Clean the cloned sources" + echo " help Print Help" } build() { @@ -235,6 +247,12 @@ if [ $# -ge 1 ]; then if [ $1 = help ]; then usage elif [ $1 = make ]; then + if [ $# -eq 3 ]; then + #use for remote build + target_bin=$(readlink -f $2) + target_positioning=$(readlink -f $3) + fi + set-path build elif [ $1 = clean ]; then clean |