From 25f25de3df66329bfa27c2925434951c32f1d570 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sun, 19 Oct 2014 23:49:34 +0200 Subject: [PATCH] c:geo: Switch repo. --- metadata/cgeo.geocaching.txt | 203 ++++++----------------------------- srclibs/LocusAPI.txt | 2 + srclibs/LocusAPIAndroid.txt | 2 + 3 files changed, 38 insertions(+), 169 deletions(-) create mode 100644 srclibs/LocusAPI.txt create mode 100644 srclibs/LocusAPIAndroid.txt diff --git a/metadata/cgeo.geocaching.txt b/metadata/cgeo.geocaching.txt index 5a6b7fe26b..c4692622df 100644 --- a/metadata/cgeo.geocaching.txt +++ b/metadata/cgeo.geocaching.txt @@ -1,3 +1,4 @@ +Disabled:Wait for g-free build AntiFeatures:UpstreamNonFree Categories:Navigation License:Apache2 @@ -20,179 +21,43 @@ from the source code. . Repo Type:git -Repo:https://github.com/cgeo/c-geo-opensource.git +#Repo:https://github.com/cgeo/c-geo-opensource.git +Repo:https://github.com/wiewo/cgeo -Build:2012.06.18,20120618 - disable=No longer works due to 3rd party service changes - commit=388a5a3b1c0885a - subdir=main - forceversion=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:15 - -Build:2012.08.15,20120815 - disable=No corresponding source - commit=unknown - see disabled - -Build:2012.12.03,20121203 - disable=No longer works due to 3rd party service changes - commit=market_20121203 - subdir=main +Build:1,1 + disable=wip forceversion=yes forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:16 - -Build:2013.01.10-fdroid,20130110 - disable=No longer works due to 3rd party service changes - commit=market_20130110 + commit=e6a5c04aee4d3efff9eccbe98ed9734a57dfef1d subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:16 - -Build:2013.02.07-fdroid,20130207 - disable=No longer works due to 3rd party service changes - commit=market_20130207 - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:16 - -Build:2013.02.21-fdroid,20130221 - disable=No longer works due to 3rd party service changes - commit=market_20130221 - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:16 - -Build:2013.04.03-fdroid,20130403 - disable=No longer works due to 3rd party service changes - commit=market_20130403 - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:16 - -Build:2013.05.13-fdroid,20130513 - disable=No longer works due to 3rd party service changes - commit=market_20130513 - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:16 - -Build:2013.05.16-fdroid,20130516 - disable=No longer works due to 3rd party service changes - commit=market_20130516 - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:16 - -Build:2013.05.18-fdroid,20130518 - disable=No such tag market_20130518 - commit=unknown - see disabled - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:16 - -Build:2013.05.22-fdroid,20130522 - disable=No longer works due to 3rd party service changes - commit=market_20130522 - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - target=Google Inc.:Google APIs:16 - -Build:2013.05.31a-fdroid,20130532 - disable=No longer works due to 3rd party service changes - commit=market_20130532 - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - -Build:2013.06.05-fdroid,20130605 - disable=No longer works due to 3rd party service changes - commit=market_20130605 - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml - -Build:2013.07.25-fdroid,20130725 - disable=No longer works due to 3rd party service changes - commit=market_20130725 - subdir=main - forceversion=yes - forcevercode=yes - prebuild=cp templates/private.properties . && \ - cp templates/mapsapikey.xml res/values/ && \ - sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \ - sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml + gradle=yes + srclibs=LocusAPI@40cade8,LocusAPIAndroid@6c77cf0,ApacheHttpCore@4.3.2,ApacheHttpClient@4.3.2,HttpClientAndroid@f7c5537aa724 + rm=main/libs/*.jar,main/libs/*.properties,main/libs/src/* + prebuild=mv $$ApacheHttpCore$$/httpcore $$HttpClientAndroid$$/script/httpcore && \ + mv $$ApacheHttpClient$$/httpclient $$HttpClientAndroid$$/script/httpclient && \ + mv $$ApacheHttpClient$$/httpclient-cache $$HttpClientAndroid$$/script/httpclient-cache && \ + mv $$ApacheHttpClient$$/httpmime $$HttpClientAndroid$$/script/httpmime && \ + pushd $$HttpClientAndroid$$/script && \ + sed -i -e '/checkout/d' convert_stock_httpclient && \ + bash convert_stock_httpclient && \ + popd && \ + cp $$HttpClientAndroid$$/script/httpclientandroidlib-1.2.1.jar libs/ && \ + echo "==== HttpClientAndroid done ====" && \ + sed -i -e '/mavenCentral/amavenLocal()\n' ../build.gradle && \ + sed -i -e '/mapsforge-map/d' build.gradle && \ + sed -i -e '/appcompat/acompile "org.mapsforge:svg-android:0.4.3"' build.gradle && \ + sed -i -e '/appcompat/acompile "org.mapsforge:mapsforge:0.4.3"' build.gradle && \ + sed -i -e '/appcompat/acompile "org.mapsforge:mapsforge-map:0.4.3"' build.gradle && \ + sed -i -e '/appcompat/acompile "org.mapsforge:mapsforge-map-android:0.4.3"' build.gradle && \ + sed -i -e '/appcompat/acompile "org.mapsforge:mapsforge-core:0.4.3"' build.gradle && \ + sed -i -e '/appcompat/acompile "org.mapsforge:mapsforge-map-writer:0.4.3"' build.gradle && \ + sed -i -e '/appcompat/acompile "org.mapsforge:mapsforge-map-reader:0.4.3"' build.gradle && \ + sed -i -e 's/httpclientandroidlib-1.1.2.jar/httpclientandroidlib-1.2.1.jar/g' build.gradle && \ + sed -i -e '/locus-api/d' build.gradle && \ + cp -fR $$LocusAPI$$ ../locusAPI && \ + cp -fR $$LocusAPIAndroid$$ ../locusAPIAndroid && \ + echo "include ':locusAPIAndroid'" >> ../settings.gradle && \ + echo "include ':locusAPI'" >> ../settings.gradle Auto Update Mode:None Update Check Mode:Static -Current Version:2013.07.25-fdroid -Current Version Code:20130725 - diff --git a/srclibs/LocusAPI.txt b/srclibs/LocusAPI.txt new file mode 100644 index 0000000000..8d909f2315 --- /dev/null +++ b/srclibs/LocusAPI.txt @@ -0,0 +1,2 @@ +Repo Type:hg +Repo:https://bitbucket.org/asamm/locus-api diff --git a/srclibs/LocusAPIAndroid.txt b/srclibs/LocusAPIAndroid.txt new file mode 100644 index 0000000000..7657440d3f --- /dev/null +++ b/srclibs/LocusAPIAndroid.txt @@ -0,0 +1,2 @@ +Repo Type:hg +Repo:https://bitbucket.org/asamm/locus-api-android