From 4d1def468f7b33632e3bb1fd327ed1fdf173d82f Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Sat, 26 Apr 2014 07:52:18 +0930 Subject: [PATCH 1/4] Added build troubleshooting to README (Issue #17) --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index e73703c69..c7e4c4261 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,21 @@ You can also run the tests in Eclipse. Here's how: 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 you're installed Android SDK is missing the target version specified by one of the dependencies. For example, at the time of writing this, UniversalImageLoader requires the "android-16" API, however the default install of the Android SDK will usually only install the latest version ("android-19" as of writing). 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 also cause strange bugs when the upstream library uses features of the earlier SDK. + + License ------- From cfcdfebe4e538e5686e34ed26eb0eebdb4967672 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Sat, 26 Apr 2014 07:57:14 +0930 Subject: [PATCH 2/4] Fixed typo in README troubleshooting. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7e4c4261..48c4e5ff2 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ Check the output of the ./ant-prepare.sh command. This error is often accompanie > 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 you're installed Android SDK is missing the target version specified by one of the dependencies. For example, at the time of writing this, UniversalImageLoader requires the "android-16" API, however the default install of the Android SDK will usually only install the latest version ("android-19" as of writing). 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 also cause strange bugs when the upstream library uses features of the earlier SDK. +The most likely cause of this is that your installed Android SDK is missing the target API specified by one of the dependencies. For example, at the time of writing this, UniversalImageLoader requires the "android-16" API (extern/UniversalImageLoader/library/project.properties), however the default install of the Android SDK will usually only install the latest version ("android-19" as of writing). 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 also cause strange bugs when the upstream library uses features of the earlier SDK which have changed in later versions. License From 07b79c1e068982ff3b2b95769a89dc91da4ecd37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 26 Apr 2014 00:33:21 +0200 Subject: [PATCH 3/4] Slightly better wording in the README. ant-prepare success prints. --- README.md | 14 ++++++++++++-- ant-prepare.sh | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 48c4e5ff2..84868da82 100644 --- a/README.md +++ b/README.md @@ -94,12 +94,22 @@ 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: +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 API specified by one of the dependencies. For example, at the time of writing this, UniversalImageLoader requires the "android-16" API (extern/UniversalImageLoader/library/project.properties), however the default install of the Android SDK will usually only install the latest version ("android-19" as of writing). 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 also cause strange bugs when the upstream library uses features of the earlier SDK which have changed in later versions. +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-19" as of writing). So you will have to install +the "android-16" target via the SDK manager. + +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 diff --git a/ant-prepare.sh b/ant-prepare.sh index 299d005e9..a7173b000 100755 --- a/ant-prepare.sh +++ b/ant-prepare.sh @@ -5,6 +5,10 @@ android update lib-project --path extern/AndroidPinning android update lib-project --path extern/MemorizingTrustManager 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 From e80b1e03ac58c6172a457059921e78de3ec3bbeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 27 Apr 2014 20:36:55 +0200 Subject: [PATCH 4/4] AP moved to gitlab + build.gradle typo fix --- .gitmodules | 2 +- extern/AndroidPinning | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b54d0200a..7d39cfc6f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ ignore = dirty [submodule "extern/AndroidPinning"] path = extern/AndroidPinning - url = https://github.com/binaryparadox/AndroidPinning.git + url = http://gitlab.doeg.gy/cpu/androidpinning.git ignore = dirty diff --git a/extern/AndroidPinning b/extern/AndroidPinning index ce84a19e7..a0d713c61 160000 --- a/extern/AndroidPinning +++ b/extern/AndroidPinning @@ -1 +1 @@ -Subproject commit ce84a19e753bbcc3304525f763edb7d7f3b62429 +Subproject commit a0d713c6162b7016a3c3f55bcaefcdca4acacebd