FBReader: Test update to 2.1-ics
This commit is contained in:
parent
a1f93e0901
commit
4b9840b135
|
@ -245,8 +245,8 @@ Build:1.8.2-Honeycomb+,108022
|
|||
update=third-party/AmbilWarna,.
|
||||
buildjni=yes
|
||||
|
||||
Build:2.0.6,2000610
|
||||
disable=needs testing
|
||||
Build:2.0.6-gb,2000610
|
||||
disable=missing res with android-9
|
||||
commit=2.0.6
|
||||
patch=fbreader-2.0.6.patch
|
||||
srclibs=PDFParseLib@36d7479ce85638eb4f0ff9c875ec77680177da5d,ApacheHttpClient@4.2.5,NanoHttpd@Release-2.0.5,JsonSimple@tag_release_1_1_1
|
||||
|
@ -271,18 +271,53 @@ Build:2.0.6,2000610
|
|||
target=android-14
|
||||
buildjni=yes
|
||||
|
||||
Build:2.1-ics,2010020
|
||||
disable=testing
|
||||
commit=33139e2b04ae36388956a57373ba74e8cc0ef23c
|
||||
patch=fbreader-2.0.6.patch
|
||||
srclibs=PDFParseLib@36d7479ce85638eb4f0ff9c875ec77680177da5d,ApacheHttpClient@4.2.5,NanoHttpd@Release-2.0.5,JsonSimple@tag_release_1_1_1
|
||||
forceversion=yes
|
||||
rm=libs/*jar,obsolete/lib/*.jar
|
||||
prebuild=echo -e "sdk.dir=$$SDK$$\nndk.dir=$$NDK$$\n" >> local.properties && \
|
||||
cp local.properties third-party/AmbilWarna/ && \
|
||||
cp local.properties third-party/android-filechooser/code/ && \
|
||||
cp local.properties third-party/drag-sort-listview/library/ && \
|
||||
pushd $$ApacheHttpClient$$/httpmime/ && \
|
||||
$$MVN3$$ package && \
|
||||
popd && \
|
||||
cp $$ApacheHttpClient$$/httpmime/target/httpmime-4.2.5.jar libs/ && \
|
||||
pushd $$NanoHttpd$$ && \
|
||||
$$MVN3$$ package && \
|
||||
popd && \
|
||||
cp $$NanoHttpd$$/core/target/nanohttpd-2.0.5.jar libs/ && \
|
||||
cp -fR $$JsonSimple$$/src/main/java/org src/ && \
|
||||
cp -fR $$PDFParseLib$$/pdfparse-lib/src/main/java/org src/ && \
|
||||
rm -fR src/com/paragon && \
|
||||
sed -i -e '/com.google.android.gms.version/d' -e '/google_play_services/d' AndroidManifest.xml && \
|
||||
sed -i -e '/google.services.lib.dir/d' project.properties && \
|
||||
pushd src/org/geometerplus/android/fbreader/network/auth && git checkout master -- *java
|
||||
update=third-party/AmbilWarna,third-party/android-filechooser/code,third-party/drag-sort-listview/library,.
|
||||
target=android-14
|
||||
buildjni=yes
|
||||
|
||||
Maintainer Notes:
|
||||
* LingvoIntegration_2.5.2.12.jar: can't find source
|
||||
* open-dictionary-api-1.2.1.jar: can't find source
|
||||
* UCM: We don't care for target or device specific releases.
|
||||
* build more flavors
|
||||
* 2.0.6-ics requires yotaphone-sdk
|
||||
* 2.0.6 is missing resources with android-9 target
|
||||
* 2.0.6 is meant for gingerbread (2.3.*), however it might be
|
||||
the only "free" one, since the readme states: "Version for
|
||||
old (2.*) devices does not use google services API" -- so
|
||||
if everything else uses gplay services...
|
||||
* sed -i -e '/MinicardContract/d' src/org/geometerplus/android/fbreader/DictionaryUtil.java
|
||||
* LingvoIntegration and OpenDictionary APIs are non-free. Remove jars and patch
|
||||
depending code.
|
||||
* %v tags are currently targeting gingerbread, but have ressource conflicts
|
||||
with target=android-9; they build with target=android-14
|
||||
* %v-ics tags are actually based on the yotaphone branch, so we have to
|
||||
use raw commits for the ice-cream-sandwich branch
|
||||
* ics branch uses google play, so we have to sed AM.xml and ant files, as well
|
||||
as we need src/org/geometerplus/android/fbreader/network/auth from the master
|
||||
(= gingerbread) branch, which doesn't use play services.
|
||||
* UCM is set to master branch, we don't care for target or device specific
|
||||
releases.
|
||||
|
||||
TODO:
|
||||
* make gingerbread/master available for android-9!
|
||||
* can we remove the patch with sed scripts?
|
||||
|
||||
sed -i -e '/MinicardContract/d' src/org/geometerplus/android/fbreader/DictionaryUtil.java
|
||||
.
|
||||
|
||||
Archive Policy:6 versions
|
||||
|
|
Loading…
Reference in a new issue