ZANavi: Make lint happy

This commit is contained in:
Boris Kraut 2015-08-14 00:06:13 +02:00
parent fdcbe33d71
commit 8efb28ebd5

View file

@ -3,13 +3,14 @@ License:GPLv2
Web Site:http://zanavi.cc Web Site:http://zanavi.cc
Source Code:https://github.com/zoff99/zanavi Source Code:https://github.com/zoff99/zanavi
Issue Tracker:https://github.com/zoff99/zanavi/issues Issue Tracker:https://github.com/zoff99/zanavi/issues
Bitcoin:1ZANav18WY8ytM7bhnAEBS3bdrTohsD9p
Name:ZANavi Name:ZANavi
Summary:Car Navigation System Summary:Car Navigation System
Description: Description:
ZANavi tries to make a specific android port and to succeed where NavIT can not. ZANavi tries to make a specific android port and to succeed where NavIT can not.
Its only aimed at Android devices (Android 2.3 or higher) and should bring maximum user experience to the android device. It's only aimed at Android devices (Android 2.3 or higher) and should bring maximum user experience to the android device.
In short: it should be “install” and “start using”, but no fiddling with settings and xml files. In short: it should be "install" and "start using", but no fiddling with settings and xml files.
* Record your daily expense, income, asset and liability * Record your daily expense, income, asset and liability
* Show and count the details * Show and count the details
@ -24,14 +25,12 @@ and
[https://translations.launchpad.net/zanavi/navit-orig-import/+pots/navit Navigation Translations] [https://translations.launchpad.net/zanavi/navit-orig-import/+pots/navit Navigation Translations]
Here are some screenshots: Here are some screenshots:
[https://wiki.openstreetmap.org/wiki/ZANavi#Screenshots Screenshots] [https://wiki.openstreetmap.org/wiki/ZANavi#Screenshots Screenshots]
Features: Features:
* new drive-home widget (works only if the app is installed in phone, NOT sdcard) * new drive-home widget (works only if the app is installed in phone, NOT sdcard)
* index search * index search
* support to show GPX files * support to show GPX files
@ -52,56 +51,33 @@ Features:
* full world map download * full world map download
* free zoom level with pinch zoom * free zoom level with pinch zoom
* enter coordinates (lat,lon) manually * enter coordinates (lat,lon) manually
. .
Repo Type:git-svn Repo Type:git-svn
Repo:http://zanavi.cc/zanavi_public1/navit/ Repo:http://zanavi.cc/zanavi_public1/navit/
Build:2.0.40,240 Build:2.0.40,240
disable=broken upstream disable=broken upstream
target=21
commit=40 commit=40
prebuild=echo '<project name="ZANavi"><target name="clean"/></project>' > build.xml && \ prebuild=echo '<project name="ZANavi"><target name="clean"/></project>' > build.xml && \
mkdir -p po/lp/navit-orig-import && rm navit/maptool/poly2tri-c/001/seidel-1.0/triangulate && \ mkdir -p po/lp/navit-orig-import && \
rm pngout-static && echo '#! /bin/bash' > pngout-static && echo 'echo $*' >> pngout-static && \ rm navit/maptool/poly2tri-c/001/seidel-1.0/triangulate && \
chmod u+rx pngout-static rm pngout-static && \
echo '#! /bin/bash' > pngout-static && \
echo 'echo $*' >> pngout-static && \
chmod u+rx pngout-static
update=no update=no
target=21
build=if [ `uname -m` == 'x86_64' ] ; then SUFFIX2='_64' ; else SUFFIX2='' ; fi && \ build=if [ `uname -m` == 'x86_64' ] ; then SUFFIX2='_64' ; else SUFFIX2='' ; fi && \
export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/bin && \ export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/bin && \
rm build.xml && \ rm build.xml && \
mkdir nav2 && for i in `ls -1`; do if [ "$i" != "nav2" ]; then mv $i nav2/ ; fi ; done && \ mkdir nav2 && \
for i in `ls -1`; do if [ "$i" != "nav2" ]; then mv $i nav2/ ; fi ; done && \
mv nav2 navit && \ mv nav2 navit && \
mkdir android-build && \ mkdir android-build && \
cd android-build/ && \ cd android-build/ && \
DEBUG_="-fpic -ffunction-sections -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ \ DEBUG_="-fpic -ffunction-sections -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -Wno-psabi -march=armv5te -msoft-float -mthumb -finline-limit=64 -DHAVE_API_ANDROID -DANDROID -Wa,--noexecstack -O3 -I$$NDK$$/platforms/android-14/arch-arm/usr/include -nostdlib -Wl,-rpath-link=$$NDK$$/platforms/android-14/arch-arm/usr/lib -L$$NDK$$/platforms/android-14/arch-arm/usr/lib" && \
-D__ARM_ARCH_5TE__ -Wno-psabi -march=armv5te -msoft-float -mthumb -finline-limit=64 -DHAVE_API_ANDROID -DANDROID -Wa,--noexecstack -O3 \ ../navit/configure RANLIB=arm-linux-androideabi-ranlib AR=arm-linux-androideabi-ar CC="arm-linux-androideabi-gcc -O2 $DEBUG_ -L. -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " CXX="arm-linux-androideabi-g++ -O2 -fno-rtti -fno-exceptions -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " --host=arm-eabi-linux_android --enable-avoid-float --enable-avoid-unaligned --disable-glib --disable-gmodule --disable-vehicle-gpsd --enable-vehicle-demo --disable-binding-dbus --disable-speech-cmdline --disable-gui-gtk --disable-font-freetype --disable-fontconfig --disable-graphics-gtk-drawing-area --disable-maptool --enable-cache-size=20971520 --enable-svg2png-scaling=8,16,32,48,64,96,192,384 --enable-svg2png-scaling-nav=48,64,59,96,192,384 --enable-svg2png-scaling-flag=32 --with-xslts=android,plugin_menu --with-saxon=saxonb-xslt --enable-transformation-roll --with-android-project="android-21" && \
-I$$NDK$$/platforms/android-14/arch-arm/usr/include \
-nostdlib -Wl,-rpath-link=$$NDK$$/platforms/android-14/arch-arm/usr/lib \
-L$$NDK$$/platforms/android-14/arch-arm/usr/lib" && \
../navit/configure \
RANLIB=arm-linux-androideabi-ranlib AR=arm-linux-androideabi-ar \
CC="arm-linux-androideabi-gcc -O2 $DEBUG_ -L. -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " \
CXX="arm-linux-androideabi-g++ -O2 -fno-rtti -fno-exceptions -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " \
--host=arm-eabi-linux_android \
--enable-avoid-float --enable-avoid-unaligned \
--disable-glib \
--disable-gmodule \
--disable-vehicle-gpsd \
--enable-vehicle-demo \
--disable-binding-dbus \
--disable-speech-cmdline \
--disable-gui-gtk \
--disable-font-freetype \
--disable-fontconfig \
--disable-graphics-gtk-drawing-area \
--disable-maptool \
--enable-cache-size=20971520 --enable-svg2png-scaling=8,16,32,48,64,96,192,384 \
--enable-svg2png-scaling-nav=48,64,59,96,192,384 --enable-svg2png-scaling-flag=32 \
--with-xslts=android,plugin_menu --with-saxon=saxonb-xslt \
--enable-transformation-roll \
--with-android-project="android-21" && \
export AND_API_LEVEL_C=14 && \ export AND_API_LEVEL_C=14 && \
export NDK=$$NDK$$ && \ export NDK=$$NDK$$ && \
export DO_RELEASE_BUILD=1 && \ export DO_RELEASE_BUILD=1 && \
@ -110,8 +86,7 @@ Build:2.0.40,240
make && \ make && \
pwd && \ pwd && \
cd navit && \ cd navit && \
make apkg-release || \ make apkg-release || pwd && \
pwd && \
cd android-support-v7-appcompat && \ cd android-support-v7-appcompat && \
cat local.properties |sed -e 's#/home/navit/_navit_develop/_need/SDK/_unpack/android-sdk-linux_x86#$$SDK$$#' > l.txt && \ cat local.properties |sed -e 's#/home/navit/_navit_develop/_need/SDK/_unpack/android-sdk-linux_x86#$$SDK$$#' > l.txt && \
mv l.txt local.properties && \ mv l.txt local.properties && \
@ -120,65 +95,40 @@ Build:2.0.40,240
pwd && \ pwd && \
cd ../android && \ cd ../android && \
pwd && \ pwd && \
cat AndroidManifest.xml | \ cat AndroidManifest.xml | sed -e 's#android:debuggable="true"#android:debuggable="false"#' > l.txt && \
sed -e 's#android:debuggable="true"#android:debuggable="false"#' > l.txt && \
mv l.txt AndroidManifest.xml && \ mv l.txt AndroidManifest.xml && \
cat AndroidManifest.xml | \ cat AndroidManifest.xml | sed -e 's#android:versionName=".*"#android:versionName="2.0.40"#' > l.txt && \
sed -e 's#android:versionName=".*"#android:versionName="2.0.40"#' > l.txt && \
mv l.txt AndroidManifest.xml && \ mv l.txt AndroidManifest.xml && \
ant release && \ ant release && \
cd ../../../ && \ cd ../../../ && \
pwd && \ pwd && \
cat android-build/navit/android/project.properties | \ cat android-build/navit/android/project.properties | sed -e 's#^android.library.reference.*$#android.library.reference.1=./android-support-v7-appcompat#' > l.txt && \
sed -e 's#^android.library.reference.*$#android.library.reference.1=./android-support-v7-appcompat#' > l.txt && \
mv l.txt android-build/navit/android/project.properties && \ mv l.txt android-build/navit/android/project.properties && \
ln -s android-build/navit/android-support-v7-appcompat . && \ ln -s android-build/navit/android-support-v7-appcompat . && \
ln -s android-build/navit/android/* . ln -s android-build/navit/android/* .
novcheck=yes novcheck=yes
Build:2.0.45,245 Build:2.0.45,245
target=21
ndk=r10e
commit=43 commit=43
prebuild=echo '<project name="ZANavi"><target name="clean"/></project>' > build.xml && \ prebuild=echo '<project name="ZANavi"><target name="clean"/></project>' > build.xml && \
mkdir -p po/lp/navit-orig-import && rm navit/maptool/poly2tri-c/001/seidel-1.0/triangulate && \ mkdir -p po/lp/navit-orig-import && \
rm pngout-static && echo '#! /bin/bash' > pngout-static && echo 'echo $*' >> pngout-static && \ rm navit/maptool/poly2tri-c/001/seidel-1.0/triangulate && \
chmod u+rx pngout-static rm pngout-static && \
echo '#! /bin/bash' > pngout-static && \
echo 'echo $*' >> pngout-static && \
chmod u+rx pngout-static
update=no update=no
target=21
build=if [ `uname -m` == 'x86_64' ] ; then SUFFIX2='_64' ; else SUFFIX2='' ; fi && \ build=if [ `uname -m` == 'x86_64' ] ; then SUFFIX2='_64' ; else SUFFIX2='' ; fi && \
export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/bin && \ export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/bin && \
rm build.xml && \ rm build.xml && \
mkdir nav2 && for i in `ls -1`; do if [ "$i" != "nav2" ]; then mv $i nav2/ ; fi ; done && \ mkdir nav2 && \
for i in `ls -1`; do if [ "$i" != "nav2" ]; then mv $i nav2/ ; fi ; done && \
mv nav2 navit && \ mv nav2 navit && \
mkdir android-build && \ mkdir android-build && \
cd android-build/ && \ cd android-build/ && \
DEBUG_="-fpic -ffunction-sections -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ \ DEBUG_="-fpic -ffunction-sections -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -Wno-psabi -march=armv5te -msoft-float -mthumb -finline-limit=64 -DHAVE_API_ANDROID -DANDROID -Wa,--noexecstack -O3 -I$$NDK$$/platforms/android-14/arch-arm/usr/include -nostdlib -Wl,-rpath-link=$$NDK$$/platforms/android-14/arch-arm/usr/lib -L$$NDK$$/platforms/android-14/arch-arm/usr/lib" && \
-D__ARM_ARCH_5TE__ -Wno-psabi -march=armv5te -msoft-float -mthumb -finline-limit=64 -DHAVE_API_ANDROID -DANDROID -Wa,--noexecstack -O3 \ ../navit/configure RANLIB=arm-linux-androideabi-ranlib AR=arm-linux-androideabi-ar CC="arm-linux-androideabi-gcc -O2 $DEBUG_ -L. -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " CXX="arm-linux-androideabi-g++ -O2 -fno-rtti -fno-exceptions -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " --host=arm-eabi-linux_android --enable-avoid-float --enable-avoid-unaligned --disable-glib --disable-gmodule --disable-vehicle-gpsd --enable-vehicle-demo --disable-binding-dbus --disable-speech-cmdline --disable-gui-gtk --disable-font-freetype --disable-fontconfig --disable-graphics-gtk-drawing-area --disable-maptool --enable-cache-size=20971520 --enable-svg2png-scaling=8,16,32,48,64,96,192,384 --enable-svg2png-scaling-nav=48,64,59,96,192,384 --enable-svg2png-scaling-flag=32 --with-xslts=android,plugin_menu --with-saxon=saxonb-xslt --enable-transformation-roll --with-android-project="android-21" && \
-I$$NDK$$/platforms/android-14/arch-arm/usr/include \
-nostdlib -Wl,-rpath-link=$$NDK$$/platforms/android-14/arch-arm/usr/lib \
-L$$NDK$$/platforms/android-14/arch-arm/usr/lib" && \
../navit/configure \
RANLIB=arm-linux-androideabi-ranlib AR=arm-linux-androideabi-ar \
CC="arm-linux-androideabi-gcc -O2 $DEBUG_ -L. -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " \
CXX="arm-linux-androideabi-g++ -O2 -fno-rtti -fno-exceptions -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " \
--host=arm-eabi-linux_android \
--enable-avoid-float --enable-avoid-unaligned \
--disable-glib \
--disable-gmodule \
--disable-vehicle-gpsd \
--enable-vehicle-demo \
--disable-binding-dbus \
--disable-speech-cmdline \
--disable-gui-gtk \
--disable-font-freetype \
--disable-fontconfig \
--disable-graphics-gtk-drawing-area \
--disable-maptool \
--enable-cache-size=20971520 --enable-svg2png-scaling=8,16,32,48,64,96,192,384 \
--enable-svg2png-scaling-nav=48,64,59,96,192,384 --enable-svg2png-scaling-flag=32 \
--with-xslts=android,plugin_menu --with-saxon=saxonb-xslt \
--enable-transformation-roll \
--with-android-project="android-21" && \
export AND_API_LEVEL_C=14 && \ export AND_API_LEVEL_C=14 && \
export NDK=$$NDK$$ && \ export NDK=$$NDK$$ && \
export DO_RELEASE_BUILD=1 && \ export DO_RELEASE_BUILD=1 && \
@ -187,41 +137,36 @@ Build:2.0.45,245
make && \ make && \
pwd && \ pwd && \
cd navit && \ cd navit && \
make apkg-release || \ make apkg-release || pwd && \
pwd && \
cd android-support-v7-appcompat && \ cd android-support-v7-appcompat && \
cat local.properties |sed -e 's#/home/navit/_navit_develop/_need/SDK/_unpack/android-sdk-linux_x86#$$SDK$$#' > l.txt && \ cat local.properties |sed -e 's#/home/navit/_navit_develop/_need/SDK/_unpack/android-sdk-linux_x86#$$SDK$$#' > l.txt && \
mv l.txt local.properties && \ mv l.txt local.properties && \
cat local.properties && \ cat local.properties && \
echo android update project -t android-21 -p . && \ echo android update project -t android-21 -p . && \
cd .. && \ cd .. && \
pwd && \ pwd && \
cp -av ../../navit/trans_img/* ./android/res/ && \ cp -av ../../navit/trans_img/* ./android/res/ && \
cp -av ../../navit/trans_img/* ../../android-build/navit/android/res/ && \ cp -av ../../navit/trans_img/* ../../android-build/navit/android/res/ && \
cp -av ../../navit/trans_img/* ../../navit/navit/android/res/ && \ cp -av ../../navit/trans_img/* ../../navit/navit/android/res/ && \
cd ./android && \ cd ./android && \
pwd && \ pwd && \
cat AndroidManifest.xml | \ cat AndroidManifest.xml | sed -e 's#android:debuggable="true"#android:debuggable="false"#' > l.txt && \
sed -e 's#android:debuggable="true"#android:debuggable="false"#' > l.txt && \
mv l.txt AndroidManifest.xml && \ mv l.txt AndroidManifest.xml && \
cat src/com/zoffcc/applications/zanavi/Navit.java | \ cat src/com/zoffcc/applications/zanavi/Navit.java | sed -e 's#static final boolean FDBL = false;#static final boolean FDBL = true;#' > l.txt && \
sed -e 's#static final boolean FDBL = false;#static final boolean FDBL = true;#' > l.txt && \
mv l.txt src/com/zoffcc/applications/zanavi/Navit.java && \ mv l.txt src/com/zoffcc/applications/zanavi/Navit.java && \
cat AndroidManifest.xml | \ cat AndroidManifest.xml | sed -e 's#android:versionName=".*"#android:versionName="2.0.45"#' > l.txt && \
sed -e 's#android:versionName=".*"#android:versionName="2.0.45"#' > l.txt && \
mv l.txt AndroidManifest.xml && \ mv l.txt AndroidManifest.xml && \
ant release && \ ant release && \
cd ../../../ && \ cd ../../../ && \
pwd && \ pwd && \
cat android-build/navit/android/project.properties | \ cat android-build/navit/android/project.properties | sed -e 's#^android.library.reference.*$#android.library.reference.1=./android-support-v7-appcompat#' > l.txt && \
sed -e 's#^android.library.reference.*$#android.library.reference.1=./android-support-v7-appcompat#' > l.txt && \
mv l.txt android-build/navit/android/project.properties && \ mv l.txt android-build/navit/android/project.properties && \
ln -s android-build/navit/android-support-v7-appcompat . && \ ln -s android-build/navit/android-support-v7-appcompat . && \
ln -s android-build/navit/android/* . ln -s android-build/navit/android/* .
novcheck=yes novcheck=yes
Bitcoin:1ZANav18WY8ytM7bhnAEBS3bdrTohsD9p
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:RepoTrunk Update Check Mode:RepoTrunk
Current Version:2.0.45 Current Version:2.0.45
Current Version Code:245 Current Version Code:245