Drop ant support

It broke with a recent support lib update that made the binary library be an
.aar instead of a .jar. Besides, the ant plugin has been buggy and unsupported
for a very long time.

Also dropping support for eclipse in the process, which lets us get rid of the
nasty symlinks.
This commit is contained in:
Daniel Martí 2015-06-24 00:01:51 +02:00
parent 44127c563d
commit e7912359eb
117 changed files with 8 additions and 309 deletions

View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="../extern/symlinks-for-ant-and-eclipse">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="gen"/>
<classpathentry combineaccessrules="false" kind="src" path="/AndroidPinning"/>
<classpathentry combineaccessrules="false" kind="src" path="/MemorizingActivity"/>
<classpathentry combineaccessrules="false" kind="src" path="/library"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

View File

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>fdroid</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

View File

@ -1,53 +0,0 @@
#!/bin/bash -ex
if ! which android > /dev/null; then
if [ -z $ANDROID_HOME ]; then
if [ -e ~/.android/bashrc ]; then
. ~/.android/bashrc
else
echo "'android' not found, ANDROID_HOME must be set!"
exit
fi
else
export PATH="${ANDROID_HOME}/tools:$PATH"
fi
fi
# set up test signing keys for any `ant release` runs
if [ -e ~/.android/ant.properties ]; then
cp ~/.android/ant.properties ./
else
echo "skipping release ant.properties"
fi
EXTERN=../extern
place_support_v4() {
mkdir -p $1/libs
cp libs/android-support-v4.jar $1/libs/
}
android update lib-project --path $EXTERN/UniversalImageLoader/library
android update lib-project --path $EXTERN/AndroidPinning
android update lib-project --path $EXTERN/libsuperuser/libsuperuser
android update lib-project --path $EXTERN/zxing-core
android update lib-project --path $EXTERN/support-v4-preferencefragment
place_support_v4 $EXTERN/support-v4-preferencefragment
android update lib-project --path $EXTERN/Support/v7/appcompat --target android-19
place_support_v4 $EXTERN/Support/v7/appcompat
android update project --path . --name F-Droid
{ echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null
# technically optional, needed for the tests
cd test
android update test-project --path . --main ..
{ echo -e "\nSuccessfully updated the test project.\n"; } 2>/dev/null

View File

@ -1,18 +0,0 @@
target=android-21
android.library.reference.1=../extern/UniversalImageLoader/library
android.library.reference.2=../extern/AndroidPinning
android.library.reference.3=../extern/libsuperuser/libsuperuser
android.library.reference.4=../extern/zxing-core
android.library.reference.5=../extern/support-v4-preferencefragment
android.library.reference.6=../extern/Support/v7/appcompat
# For java libraries, place symlinks in ../extern/symlinks-for-ant-and-eclipse/
source.dir=src;../extern/symlinks-for-ant-and-eclipse
# With a target SDK of android-21 (5.0/Lollipop) and a Java 1.7 compiler, you
# can use Java 1.7 features like the <> diamond operator, multi-catch, strings
# in switches, etc. zxing uses the <> operator, so Java 1.7 is required.
java.encoding=UTF-8
java.source=1.7
java.target=1.7

View File

@ -7,11 +7,17 @@ for Android.
Building from source with Gradle Building from source with Gradle
-------------------------------- --------------------------------
Once you have checked out the version you wish to build, install gradle on your system and run: The only required tools are the [Android SDK](http://developer.android.com/sdk/index.html) and Gradle.
You should use a relatively new version of Gradle, such as 2.4, or use the
gradle wrapper.
Once you have checked out the version you wish to build, run:
``` ```
git submodule update --init git submodule update --init
gradle build cd F-Droid
gradle clean assembleRelease
``` ```
Android Studio Android Studio
@ -19,19 +25,6 @@ Android Studio
From Android Studio: File -> Import Project -> Select the cloned top folder From Android Studio: File -> Import Project -> Select the cloned top folder
Building from source with Ant
-----------------------------
The only required tools are the [Android SDK](http://developer.android.com/sdk/index.html) and Apache Ant.
Once you have checked out the version you wish to build, run:
```
git submodule update --init
cd F-Droid
./ant-prepare.sh # This runs 'android update' on the libs and the main project
ant clean release
```
Direct download Direct download
--------------- ---------------
@ -63,67 +56,6 @@ would like to contribute.
Running the test suite Running the test suite
---------------------- ----------------------
FDroid client includes a embedded Android Test Project for running tests. It
is in the `test/` subfolder. To run the tests from the command line, do:
```
git submodule update --init
./ant-prepare.sh # This runs 'android update' on the libs and the main project
ant clean emma debug install test
```
You can also run the tests in Eclipse. Here's how:
1. Choose *File* -> *Import* -> *Android* -> *Existing Android Code Into Workspace* for the `fdroidclient/` directory.
2. Choose *File* -> *Import* -> *Android* -> *Existing Android Code Into Workspace* for the `fdroidclient/test/` directory
3. If **fdroid-test** has errors, right-click on it, select *Properties*, the
*Java Build Path*, then click on the *Projects* tab.
4. Click on the *Add...* button and select `fdroidclient/`
5. Right-click on the **fdroid-test** project, then *Run As...* -> *Android JUnit Test*
Troubleshooting
---------------
When building F-Droid, the following error may occur:
> Invalid file: extern/UniversalImageLoader/library/build.xml
Check the output of the ./ant-prepare.sh command. This error is often
accompanied by the following message:
> Error: The project either has no target set or the target is invalid.
> Please provide a --target to the 'android update' command.
The most likely cause of this is that your installed Android SDK is missing
the target version specified by one of the dependencies. For example, at the
time of writing this, UniversalImageLoader uses the "android-16" target API,
however the default install of the Android SDK will usually only install the
latest version ("android-20" as of writing). So you will have to install
missings "android-xx" targets via the SDK manager. To get a list of already
installed SDK targets, run:
```
$ android list targets
```
To get a list of targets used by fdroidclient libs, run:
```
$ for i in $(grep "android.library.reference" project.properties | cut -f2 -d'='); do
grep ^target $i/project.properties | cut -f2 -d'=';
done | sort | uniq | paste -s -d',' -
```
to install missing or all needed targets, for example "android-16" and "android-7" run:
```
$ android update sdk -u -t "android-16,android-7"
```
NOTE: While it may be tempting to add "--target=android-19" to the
ant-prepare.sh script, it is not the correct solution. Although it may work,
it can cause strange bugs at runtime.
License License
------- -------

View File

@ -1 +0,0 @@
../nanohttpd/core/src/main/java/fi

View File

@ -1 +0,0 @@
../jmdns/src/main/java/javax

View File

@ -1 +0,0 @@
../zipsigner/src/main/java/kellinwood

View File

@ -1 +0,0 @@
../../../../extern/spongycastle/core/src/main/java/org/spongycastle/asn1

View File

@ -1 +0,0 @@
../../../spongycastle/pkix/src/main/java/org/spongycastle/cert

View File

@ -1 +0,0 @@
../../../spongycastle/pkix/src/main/java/org/spongycastle/cms

View File

@ -1 +0,0 @@
../../../spongycastle/core/src/main/java/org/spongycastle/crypto

View File

@ -1 +0,0 @@
../../../spongycastle/core/src/main/java/org/spongycastle/i18n

View File

@ -1 +0,0 @@
../../../spongycastle/prov/src/main/java/org/spongycastle/jcajce

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/ECGOST3410NamedCurveTable.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/ECKeyUtil.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/ECNamedCurveTable.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/ECPointUtil.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/MultiCertStoreParameters.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/PKCS10CertificationRequest.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/PKCS12Util.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/PrincipalUtil.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/X509KeyUsage.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/X509LDAPCertStoreParameters.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/X509Principal.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/exception

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/interfaces

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/AnnotatedException.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProvider.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProviderConfiguration.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BrokenJCEBlockCipher.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BrokenKDF2BytesGenerator.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BrokenPBE.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/CertPathValidatorUtilities.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/CertStatus.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/CertStoreCollectionSpi.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/DHUtil.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/ExtCRLException.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEDHPrivateKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEDHPublicKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEECPrivateKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEECPublicKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPrivateKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPublicKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateCrtKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPublicKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEStreamCipher.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPrivateKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPublicKey.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JDKPKCS12StoreParameter.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/MultiCertStoreSpi.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PEMUtil.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXCRLUtil.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathBuilderSpi.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathValidatorSpi.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidator.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidatorException.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXPolicyNode.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/RFC3280CertPathUtilities.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/RFC3281CertPathUtilities.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/ReasonsMask.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509AttrCertParser.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CRLEntryObject.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CRLObject.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CRLParser.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CertPairParser.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CertParser.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CertificateObject.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509SignatureUtil.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509StoreAttrCertCollection.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCRLCollection.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertCollection.java

View File

@ -1 +0,0 @@
../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertPairCollection.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/spec

View File

@ -1 +0,0 @@
../../../spongycastle/core/src/main/java/org/spongycastle/math

View File

@ -1 +0,0 @@
../../../spongycastle/pkix/src/main/java/org/spongycastle/mozilla

View File

@ -1 +0,0 @@
../../../spongycastle/pkix/src/main/java/org/spongycastle/operator

View File

@ -1 +0,0 @@
../../../spongycastle/pkix/src/main/java/org/spongycastle/pkcs

View File

@ -1 +0,0 @@
../../../../spongycastle/core/src/main/java/org/spongycastle/pqc/asn1

View File

@ -1 +0,0 @@
../../../../spongycastle/core/src/main/java/org/spongycastle/pqc/crypto

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/pqc/jcajce

View File

@ -1 +0,0 @@
../../../../spongycastle/core/src/main/java/org/spongycastle/pqc/math

View File

@ -1 +0,0 @@
../../../spongycastle/core/src/main/java/org/spongycastle/util

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/AttributeCertificateHolder.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/AttributeCertificateIssuer.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/CertPathReviewerException.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/ExtCertificateEncodingException.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/ExtendedPKIXBuilderParameters.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/ExtendedPKIXParameters.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/NoSuchParserException.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/NoSuchStoreException.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/PKIXAttrCertChecker.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/PKIXCertPathReviewer.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509Attribute.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509AttributeCertStoreSelector.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509AttributeCertificate.java

View File

@ -1 +0,0 @@
../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509CRLStoreSelector.java

Some files were not shown because too many files have changed in this diff Show More