From 28d62794aad65e7f7ec9db3097e9aa9cba1dfdcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 30 Jan 2014 10:54:23 +0100 Subject: [PATCH] Run rewritemeta on osmand, bump CV, fix issues url, remove name --- metadata/net.osmand.plus.txt | 230 +++++++++++++++++++++-------------- 1 file changed, 138 insertions(+), 92 deletions(-) diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 2c41185771..f93985ed06 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -2,10 +2,9 @@ Categories:Navigation License:GPLv3 Web Site:http://osmand.net Source Code:https://github.com/osmandapp/Osmand -Issue Tracker:http://code.google.com/p/osmand/issues +Issue Tracker:https://github.com/osmandapp/Osmand/issues Donate:http://code.google.com/p/osmand/#Please_support_the_project -Name:OsmAnd~ Auto Name:OsmAnd~ Summary:Maps & navigation; online and off Description: @@ -25,107 +24,154 @@ for creating your own. The "~" is appended to differentiate it from the developers' builds. . - # Name srclibs in such a way as to replicate OsmAnd build tree Repo Type:srclib Repo:android -Build Version:0.6.5,34,v0.6.5,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir assets && mkdir raw -Build Version:0.6.6,36,v0.6.6_2,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw -Build Version:0.6.7,37,v0.6.7,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw,patch=code37.patch -Build Version:0.6.8,39,v0.6.8,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw -Build Version:0.6.8',41,!No corresponding source for whatever this is -Build Version:0.6.9,42,v0.6.9,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw -Build Version:0.6.9',43,!No corresponding source for whatever this is -Build Version:0.8.1,65,d62472532d8,subdir=OsmAnd,encoding=utf-8,buildjni=no,target=android-8,update=force,forceversion=yes,\ -prebuild=cd ../DataExtractionOSM && \ -ant compile build && \ -cd ../OsmAnd/ && \ -sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ -cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \ -zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \ -cp -r ../DataExtractionOSM/build/lib/ libs/ -Build Version:0.8.2,71,50a4733475cd,subdir=OsmAnd,encoding=utf-8,buildjni=yes,target=android-8,update=force,forceversion=yes,\ -forcevercode=yes,submodules=yes,prebuild=\ -sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ -cd ../DataExtractionOSM && \ -ant compile build && \ -cd ../OsmAnd/ && \ -sed -i 's/app_version">[^<]*/app_version">0.8.2-fdroid/' res/values/no_translate.xml && \ -cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \ -zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \ -cp -r ../DataExtractionOSM/build/lib/ libs/ +Build:0.6.5,34 + commit=v0.6.5 + subdir=OsmAnd + encoding=utf-8 + prebuild=mkdir assets && \ + mkdir raw + +Build:0.6.6,36 + commit=v0.6.6_2 + subdir=OsmAnd + encoding=utf-8 + prebuild=mkdir raw + +Build:0.6.7,37 + commit=v0.6.7 + subdir=OsmAnd + encoding=utf-8 + patch=code37.patch + prebuild=mkdir raw + +Build:0.6.8,39 + commit=v0.6.8 + subdir=OsmAnd + encoding=utf-8 + prebuild=mkdir raw + +Build:0.6.8',41 + disable=No corresponding source for whatever this is + commit=unknown - see disabled + +Build:0.6.9,42 + commit=v0.6.9 + subdir=OsmAnd + encoding=utf-8 + prebuild=mkdir raw + +Build:0.6.9',43 + disable=No corresponding source for whatever this is + commit=unknown - see disabled + +Build:0.8.1,65 + commit=d62472532d8 + subdir=OsmAnd + target=android-8 + update=force + encoding=utf-8 + forceversion=yes + prebuild=cd ../DataExtractionOSM && \ + ant compile build && \ + cd ../OsmAnd/ && \ + sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ + cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \ + zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \ + cp -r ../DataExtractionOSM/build/lib/ libs/ + buildjni=no + +Build:0.8.2,71 + commit=50a4733475cd + subdir=OsmAnd + submodules=yes + target=android-8 + update=force + encoding=utf-8 + forceversion=yes + forcevercode=yes + prebuild=sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ + cd ../DataExtractionOSM && \ + ant compile build && \ + cd ../OsmAnd/ && \ + sed -i 's/app_version">[^<]*/app_version">0.8.2-fdroid/' res/values/no_translate.xml && \ + cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \ + zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \ + cp -r ../DataExtractionOSM/build/lib/ libs/ + buildjni=yes # branch r1.5 -Build Version:1.5-MIPS,143,0eb598d815c,subdir=OsmAnd,\ -forcevercode=yes,\ -rm=SherlockBar/build.xml,\ -encoding=utf-8,\ -srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481,\ -extlibs=perms-osmand_145.diff,\ -patch=remove_analytics_android_145.diff,\ -prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ - sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ - $$SDK$$/tools/android update project -p ../SherlockBar && \ - sed -i 's/app_version">[^<]*/app_version">1.5-MIPS/' \ - res/values/no_translate.xml && sed -i '/keys/d' ant.properties && \ - cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff,\ -build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.sh && \ - ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ - ant build -f ../OsmAnd-java/build.xml,\ -buildjni=no +Build:1.5-MIPS,143 + commit=0eb598d815c + subdir=OsmAnd + encoding=utf-8 + forcevercode=yes + rm=SherlockBar/build.xml + extlibs=perms-osmand_145.diff + srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481 + patch=remove_analytics_android_145.diff + prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ + sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ + $$SDK$$/tools/android update project -p ../SherlockBar && \ + sed -i 's/app_version">[^<]*/app_version">1.5-MIPS/' res/values/no_translate.xml && \ + sed -i '/keys/d' ant.properties && \ + cd ../../core/ && \ + git apply ../android/OsmAnd/libs/perms-osmand_145.diff + build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.sh && \ + ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ + ant build -f ../OsmAnd-java/build.xml + buildjni=no # branch r1.5 -Build Version:1.5-X86,144,0eb598d815c,subdir=OsmAnd,\ -forcevercode=yes,\ -rm=SherlockBar/build.xml,\ -encoding=utf-8,\ -srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481,\ -extlibs=perms-osmand_145.diff,\ -patch=remove_analytics_android_145.diff,\ -prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ - sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ - $$SDK$$/tools/android update project -p ../SherlockBar && \ - sed -i 's/app_version">[^<]*/app_version">1.5-X86/' \ - res/values/no_translate.xml && sed -i '/keys/d' ant.properties && \ - cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff,\ -build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.sh && \ - ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ - ant build -f ../OsmAnd-java/build.xml,\ -buildjni=no +Build:1.5-X86,144 + commit=0eb598d815c + subdir=OsmAnd + encoding=utf-8 + forcevercode=yes + rm=SherlockBar/build.xml + extlibs=perms-osmand_145.diff + srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481 + patch=remove_analytics_android_145.diff + prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ + sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ + $$SDK$$/tools/android update project -p ../SherlockBar && \ + sed -i 's/app_version">[^<]*/app_version">1.5-X86/' res/values/no_translate.xml && \ + sed -i '/keys/d' ant.properties && \ + cd ../../core/ && \ + git apply ../android/OsmAnd/libs/perms-osmand_145.diff + build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.sh && \ + ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ + ant build -f ../OsmAnd-java/build.xml + buildjni=no # branch r1.5 -Build Version:1.5-ARM,145,0eb598d815c,subdir=OsmAnd,\ -forcevercode=yes,\ -rm=SherlockBar/build.xml,\ -encoding=utf-8,\ -srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481,\ -extlibs=perms-osmand_145.diff;osmand-zlib-url_145.patch,\ -patch=remove_analytics_android_145.diff,\ -prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ - sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ - $$SDK$$/tools/android update project -p ../SherlockBar && \ - sed -i 's/app_version">[^<]*/app_version">1.5-ARM/' \ - res/values/no_translate.xml && sed -i '/keys/d' ant.properties && \ - cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff && \ - git apply ../android/OsmAnd/libs/osmand-zlib-url_145.patch,\ -build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \ - ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ - ant build -f ../OsmAnd-java/build.xml,\ -buildjni=no +Build:1.5-ARM,145 + commit=0eb598d815c + subdir=OsmAnd + encoding=utf-8 + forcevercode=yes + rm=SherlockBar/build.xml + extlibs=perms-osmand_145.diff;osmand-zlib-url_145.patch + srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481 + patch=remove_analytics_android_145.diff + prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ + sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ + $$SDK$$/tools/android update project -p ../SherlockBar && \ + sed -i 's/app_version">[^<]*/app_version">1.5-ARM/' res/values/no_translate.xml && \ + sed -i '/keys/d' ant.properties && \ + cd ../../core/ && \ + git apply ../android/OsmAnd/libs/perms-osmand_145.diff && \ + git apply ../android/OsmAnd/libs/osmand-zlib-url_145.patch + build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \ + ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ + ant build -f ../OsmAnd-java/build.xml + buildjni=no -# do another 1.5 update when the branch settles down -# replace GPS Status with YGPS and elaborate description. see -# https://f-droid.org/forums/topic/update-osmand-and-osmand/page/3/#post-8253 -# add parking patch (already committed. - -# Could build gnu-trove via srclib -# Don't really understand what the other build.xmls do: they don't appear to put jars in classpath -# Qt in new_core branch -# see https://github.com/osmandapp/OsmAnd-manifest/blob/master/current_release.xml Auto Update Mode:None Update Check Mode:None -# New version in new branch -Current Version:1.5 -Current Version Code:145 +Current Version:1.6.5 +Current Version Code:165