From 020eae7ad9d62b1b6625561cee60c125dfb9e47e Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Mon, 24 Mar 2014 00:13:05 +0100 Subject: [PATCH 1/3] QuickMSG: Trying to fix build... failed --- metadata/net.vreeken.quickmsg.txt | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/metadata/net.vreeken.quickmsg.txt b/metadata/net.vreeken.quickmsg.txt index 791f8c57cb..9eed3e92d6 100644 --- a/metadata/net.vreeken.quickmsg.txt +++ b/metadata/net.vreeken.quickmsg.txt @@ -15,9 +15,34 @@ Repo Type:git Repo:http://quickmsg.vreeken.net/QuickMSG.git/ Build:1.0,1 - disable=filled with jars + disable=jars commit=9df2430bedb611bbb7d9b7e8435e16267dcce39b init=rm -f build.xml + extlibs=android/android-support-v4.jar + prebuild=rm libs/* && \ + mkdir tmp && \ + pushd tmp && \ + svn checkout http://javamail-android.googlecode.com/svn/trunk/ mail && \ + pushd mail && popd && \ + git clone https://github.com/rtyley/spongycastle.git && \ + pushd spongycastle && gradle jar && popd && popd && \ + cp tmp/spongycastle/prov/build/libs/prov-1.50.0.0.jar libs/ && \ + cp tmp/spongycastle/pg/build/libs/pg-1.50.0.0.jar libs/ && \ + cp tmp/spongycastle/core/build/libs/core-1.50.0.0.jar libs/ && \ + pushd libs && wget -c http://javamail-android.googlecode.com/files/activation.jar && \ + wget -c http://javamail-android.googlecode.com/files/additionnal.jar && \ + wget -c http://javamail-android.googlecode.com/files/mail.jar && popd && rm -fR tmp + +Maintainer Notes: +prov-1.50.0.0.jar => https://github.com/rtyley/spongycastle +pg-1.50.0.0.jar => https://github.com/rtyley/spongycastle +core-1.50.0.0.jar => https://github.com/rtyley/spongycastle +mail.jar => http://code.google.com/p/javamail-android/ +activation.jar => http://code.google.com/p/javamail-android/ +additionnal.jar => http://code.google.com/p/javamail-android/ + +maybe: https://raw.githubusercontent.com/timlian/android-javamail ? +. Auto Update Mode:None Update Check Mode:RepoManifest From a69aaed3122b3ac416464030fe1496b7839dca12 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Mon, 24 Mar 2014 00:49:45 +0100 Subject: [PATCH 2/3] QuickMSG: Add srclib --- metadata/net.vreeken.quickmsg.txt | 11 +---------- srclibs/SpongyCastle.txt | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 srclibs/SpongyCastle.txt diff --git a/metadata/net.vreeken.quickmsg.txt b/metadata/net.vreeken.quickmsg.txt index 9eed3e92d6..886e9094c2 100644 --- a/metadata/net.vreeken.quickmsg.txt +++ b/metadata/net.vreeken.quickmsg.txt @@ -15,20 +15,11 @@ Repo Type:git Repo:http://quickmsg.vreeken.net/QuickMSG.git/ Build:1.0,1 - disable=jars commit=9df2430bedb611bbb7d9b7e8435e16267dcce39b init=rm -f build.xml extlibs=android/android-support-v4.jar + srclibs=1:SpongyCastle@sc-v1.50.0.0 prebuild=rm libs/* && \ - mkdir tmp && \ - pushd tmp && \ - svn checkout http://javamail-android.googlecode.com/svn/trunk/ mail && \ - pushd mail && popd && \ - git clone https://github.com/rtyley/spongycastle.git && \ - pushd spongycastle && gradle jar && popd && popd && \ - cp tmp/spongycastle/prov/build/libs/prov-1.50.0.0.jar libs/ && \ - cp tmp/spongycastle/pg/build/libs/pg-1.50.0.0.jar libs/ && \ - cp tmp/spongycastle/core/build/libs/core-1.50.0.0.jar libs/ && \ pushd libs && wget -c http://javamail-android.googlecode.com/files/activation.jar && \ wget -c http://javamail-android.googlecode.com/files/additionnal.jar && \ wget -c http://javamail-android.googlecode.com/files/mail.jar && popd && rm -fR tmp diff --git a/srclibs/SpongyCastle.txt b/srclibs/SpongyCastle.txt new file mode 100644 index 0000000000..3b455e01da --- /dev/null +++ b/srclibs/SpongyCastle.txt @@ -0,0 +1,15 @@ +# Source details (the only mandatory fields) +Repo Type:git +Repo:https://github.com/rtyley/spongycastle.git + +# Comma-separated list of subdirs to use. The first existing subdirectory +# found between those given will be used. If none is found or provided, the +# root of the repo directory will be used instead. +Subdir: + +# Any extra commands to prepare the source library +Prepare:gradle jar + +# If given "Yes", "android update project -p ." will be executed +Update Project: + From 0eca080f3e0960423d56c909dbeecd9615fd6002 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Mon, 24 Mar 2014 01:14:10 +0100 Subject: [PATCH 3/3] QuickMSG: Remove prebuild and srclibs; verify jars --- metadata/net.vreeken.quickmsg.txt | 10 ++-------- srclibs/SpongyCastle.txt | 15 --------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 srclibs/SpongyCastle.txt diff --git a/metadata/net.vreeken.quickmsg.txt b/metadata/net.vreeken.quickmsg.txt index 886e9094c2..0b4a6b9bf8 100644 --- a/metadata/net.vreeken.quickmsg.txt +++ b/metadata/net.vreeken.quickmsg.txt @@ -17,22 +17,16 @@ Repo:http://quickmsg.vreeken.net/QuickMSG.git/ Build:1.0,1 commit=9df2430bedb611bbb7d9b7e8435e16267dcce39b init=rm -f build.xml - extlibs=android/android-support-v4.jar - srclibs=1:SpongyCastle@sc-v1.50.0.0 - prebuild=rm libs/* && \ - pushd libs && wget -c http://javamail-android.googlecode.com/files/activation.jar && \ - wget -c http://javamail-android.googlecode.com/files/additionnal.jar && \ - wget -c http://javamail-android.googlecode.com/files/mail.jar && popd && rm -fR tmp Maintainer Notes: +RE-CHECK jars if libs/* changed: + prov-1.50.0.0.jar => https://github.com/rtyley/spongycastle pg-1.50.0.0.jar => https://github.com/rtyley/spongycastle core-1.50.0.0.jar => https://github.com/rtyley/spongycastle mail.jar => http://code.google.com/p/javamail-android/ activation.jar => http://code.google.com/p/javamail-android/ additionnal.jar => http://code.google.com/p/javamail-android/ - -maybe: https://raw.githubusercontent.com/timlian/android-javamail ? . Auto Update Mode:None diff --git a/srclibs/SpongyCastle.txt b/srclibs/SpongyCastle.txt deleted file mode 100644 index 3b455e01da..0000000000 --- a/srclibs/SpongyCastle.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Source details (the only mandatory fields) -Repo Type:git -Repo:https://github.com/rtyley/spongycastle.git - -# Comma-separated list of subdirs to use. The first existing subdirectory -# found between those given will be used. If none is found or provided, the -# root of the repo directory will be used instead. -Subdir: - -# Any extra commands to prepare the source library -Prepare:gradle jar - -# If given "Yes", "android update project -p ." will be executed -Update Project: -