diff options
author | jkoan <jkoan@users.noreply.github.com> | 2017-09-01 18:23:33 +0200 |
---|---|---|
committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2017-09-01 09:23:33 -0700 |
commit | 4c89accc118cfc5b6dfe4f8913d2d8c3dc189b99 (patch) | |
tree | 82162f1770a8d4ebeab4570c16d217225608d0d1 | |
parent | f5abdd317e10d56226300d001469595658a605e4 (diff) | |
download | navit-Robotaxi.tar.gz |
Removed deprecated files and fixed a configuration exampleRobotaxi
* baud to baudrate
* We dont need empty files which cause confusion
* Remove README because its an old and not uptodate one
* Useless file
* as its dummy we probably dont need it
* Remove files from onld build system.
* Fix Cpack build
-rwxr-xr-x | CMakeLists.txt | 2 | ||||
-rw-r--r-- | NEWS | 0 | ||||
-rw-r--r-- | README | 74 | ||||
-rw-r--r-- | contrib/android_build.sh | 115 | ||||
-rw-r--r-- | intl/VERSION | 1 | ||||
-rw-r--r-- | navit/android/Android_Market_Version_int.txt | 8 | ||||
-rw-r--r-- | navit/android/dummy.txt | 0 | ||||
-rw-r--r-- | navit/navit_shipped.xml | 2 |
8 files changed, 2 insertions, 200 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c7ac46b24..e7a6f6418 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,7 +120,7 @@ set(CPACK_PACKAGE_VENDOR "Navit team") set(CPACK_PACKAGE_VERSION_MAJOR ${NAVIT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${NAVIT_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH "${NAVIT_VERSION_PATCH}") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/GPL-2") set(CPACK_NSIS_PACKAGE_NAME "Navit ${PACKAGE_VERSION}") set(CPACK_PACKAGE_FILE_NAME ${PACKAGE}) diff --git a/README b/README deleted file mode 100644 index 9fa5f80de..000000000 --- a/README +++ /dev/null @@ -1,74 +0,0 @@ -NavIT -===== - -Navit is a open source (GPL) car navigation system with routing engine. - -It's modular design is capable of using vector maps of various formats -for routing and rendering of the displayed map. It's even possible to -use multiple maps at a time. - -The GTK+ or SDL user interfaces are designed to work well with touch -screen displays. Points of Interest of various formats are displayed -on the map. - -The current vehicle position is either read from gpsd or directly from -NMEA GPS sensors. - -The routing engine not only calculates an optimal route to your -destination, but also generates directions and even speaks to you. - -Navit currently speaks over 70 languages! - -You can help translating via our web based translation page : - http://translations.launchpad.net/navit/trunk/+pots/navit - - -For help or more information, please refer to the wiki : - http://wiki.navit-project.org - -If you don't know where to start, we recommend you to read the -Interactive Help : http://wiki.navit-project.org/index.php/Interactive_help - - -Maps: -===== - -The best navigation system is useless without maps. Those three maps -are known to work: - -- OpenStreetMaps : display, routing, but street name search isn't complete - (see http://wiki.navit-project.org/index.php/OpenStreetMaps ) - -- Grosser Reiseplaner and compliant maps : full support - (see http://wiki.navit-project.org/index.php/European_maps ) - -- Garmin maps : display, routing, search is being worked on - (see http://wiki.navit-project.org/index.php/Garmin_maps ) - - -GPS Support: -============ - -Navit read the current vehicle position : -- directly from a file -- from gpsd (local or remote) -- from udp server (friends tracking) (experimental) - - -Routing algorithm -================= - -NavIt uses a Dijkstra algorithm for routing. The routing starts at the -destination by assigning a value to each point directly connected to -destination point. The value represents the estimated time needed to -pass this distance. - -Now the point with the lowest value is choosen using the Fibonacci -heap and a value is assigned to connected points whos are -unevaluated or whos current value ist greater than the new one. - -The search is repeated until the origin is found. - -Once the origin is reached, all that needs to be done is to follow the -points with the lowest values to the destination. - diff --git a/contrib/android_build.sh b/contrib/android_build.sh deleted file mode 100644 index 68b8110fb..000000000 --- a/contrib/android_build.sh +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/sh - -# (C)opyright 2011 Lutz Möhrmann -# License: GPL v2 - -show_api_lvl () { - case $1 in - 1) ver='Android 1.0' ;; - 2) ver='Android 1.1' ;; - 3) ver='Android 1.5 "Cupcake"' ;; - 4) ver='Android 1.6 "Donut"' ;; - 5) ver='Android 2.0 "Eclair"' ;; - 6) ver='Android 2.0.1 "Eclair"' ;; - 7) ver='Android 2.1 "Eclair"' ;; - 8) ver='Android 2.2 "Froyo"' ;; - 9) ver='Android 2.3 "Gingerbread"' ;; - 10) ver='Android 2.3.3+ "Gingerbread"' ;; - 11) ver='Android 3.0 "Honeycomb"' ;; - 12) ver='Android 3.1 "Ice Cream Sandwich"' ;; - esac - echo "$1 $ver" -} - -if [ -z $ANDROID_NDK ]; then - echo "The environment variable ANDROID_NDK must be set!" - exit -fi - -platforms=$ANDROID_NDK/platforms -if [ ! -d $platforms ]; then - platforms=$ANDROID_NDK/build/platforms -fi - -if [ ! -d $platforms ]; then - echo "The environment variable ANDROID_NDK must be pointing to the android NDK!" - exit -fi - -if [ ! -d navit -o ! -f autogen.sh ]; then - echo "This script must be called from the navit main directory (where autogen.sh is in)" - exit -fi - -api_lvl=${1-$ANDROID_API_LVL} - -while [ -z $api_lvl ]; do - echo "The environment variable ANDROID_API_LVL is not set and the API level was also not given on the commandline." - echo "Possible API levels for your NDK are:" - cd $platforms - for p in android-*; do - [ -d $p/arch-arm ] || continue - show_api_lvl ${p#android-} - done - cd - > /dev/null - echo "Enter the desired API level (4 is recommended)" - read api_lvl - if [ ! -d $platforms/android-$api_lvl/arch-arm ]; then - echo "Bad choice, retrying..."; echo "" - unset api_lvl - fi -done - -ANDROID_API_LVL=$api_lvl -export ANDROID_API_LVL -ANDROID_PLATFORM=$platforms/android-$ANDROID_API_LVL/arch-arm -export ANDROID_PLATFORM -PATH=`echo $ANDROID_NDK/toolchains/arm-eabi-*/prebuilt/linux-x86/bin`:$PATH -export PATH - -if [ ! -f Makefile.in ]; then - echo ""; echo "*** Running autogen.sh ***"; echo "" - ./autogen.sh -fi - -if [ ! -f Makefile ]; then - echo ""; echo "*** Running configure ***"; echo "" - ./configure \ - PKG_CONFIG=arm-eabi-pkgconfig \ - RANLIB=arm-eabi-ranlib \ - AR=arm-eabi-ar \ - CC="arm-eabi-gcc -L$ANDROID_PLATFORM/usr/lib -L. -I$ANDROID_PLATFORM/usr/include" \ - CXX=arm-eabi-g++ \ - --host=arm-eabi-linux_android \ - --enable-avoid-float \ - --enable-avoid-unaligned \ - --enable-cache-size=20971520 \ - --enable-svg2png-scaling=8,16,32,48,64,96 \ - --enable-svg2png-scaling-nav=59 \ - --enable-svg2png-scaling-flag=32 \ - --with-xslts=android,plugin_menu,pedestrian_button,pedestrian \ - --with-saxon=saxonb-xslt \ - --enable-transformation-roll \ - --enable-plugin-pedestrian \ - --with-android-permissions=CAMERA \ - --with-android-project=android-$ANDROID_API_LVL -fi - -set -e - -echo ""; echo "*** Running make ***"; echo "" -make - -echo ""; echo "*** Running make apkg ***"; echo "" -cd navit -make apkg -cd - > /dev/null - -apk=`pwd`/navit/android/bin/Navit-debug.apk -if [ -f $apk ]; then - echo "Great - looks like it worked! The result is"; echo "" - ls -l $apk - echo "" -else - echo "This shouldn't happen! Something went terribly wrong..." -fi diff --git a/intl/VERSION b/intl/VERSION deleted file mode 100644 index b4b846ca7..000000000 --- a/intl/VERSION +++ /dev/null @@ -1 +0,0 @@ -GNU gettext library from gettext-0.14.1 diff --git a/navit/android/Android_Market_Version_int.txt b/navit/android/Android_Market_Version_int.txt deleted file mode 100644 index 7c9f73e61..000000000 --- a/navit/android/Android_Market_Version_int.txt +++ /dev/null @@ -1,8 +0,0 @@ -# DO NOT edit this file!!! -# -# Android Market: Int Version Number of Navit Release for the Android Market -# -# only "cp15" or "zoff" should edit this file! -# -# -v_int:2 diff --git a/navit/android/dummy.txt b/navit/android/dummy.txt deleted file mode 100644 index e69de29bb..000000000 --- a/navit/android/dummy.txt +++ /dev/null diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml index 0e0072d35..680308df0 100644 --- a/navit/navit_shipped.xml +++ b/navit/navit_shipped.xml @@ -184,7 +184,7 @@ Waypoint</text></img> <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> <!-- Vehicle with GPS enabled for direct communication on windows. Remove the line above if you use this. --> <!-- <vehicle name="Local GPS" profilename="car" follow="1" enabled="yes" active="1" - source="serial:COM4 baud=4800 parity=N data=8 stop=1" > --> + source="serial:COM4 baudrate=4800 parity=N data=8 stop=1" > --> <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): --> <log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%%i.gpx" flush_size="1000" flush_time="30"/> |