From 9d27e6709e9e8f4f9fab84c8689093bd0119fc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 4 Jul 2014 09:20:58 +0200 Subject: [PATCH] Build Bitcoin Wallet 3.52, switch srclibs --- metadata/de.schildbach.wallet.txt | 51 +++++++++++------------ metadata/de.schildbach.wallet_test.txt | 56 +++++++++++++------------- srclibs/BitcoinJWallet-origin.txt | 3 -- srclibs/BitcoinJWallet-schildbach.txt | 3 ++ srclibs/BitcoinJWallet.txt | 2 +- 5 files changed, 58 insertions(+), 57 deletions(-) delete mode 100644 srclibs/BitcoinJWallet-origin.txt create mode 100644 srclibs/BitcoinJWallet-schildbach.txt diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt index 7d7c309b0a..ed64f5b900 100644 --- a/metadata/de.schildbach.wallet.txt +++ b/metadata/de.schildbach.wallet.txt @@ -47,7 +47,7 @@ Build:2.01,74 init=sed -i 's/_test//' AndroidManifest.xml && \ find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \; maven=yes - srclibs=BitcoinJWallet@31953d239555 + srclibs=BitcoinJWallet-schildbach@31953d239555 prebuild=mvn install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \ mvn install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar @@ -57,7 +57,7 @@ Build:2.16,87 init=sed -i 's/_test//' AndroidManifest.xml && \ find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \; maven=2 - srclibs=BitcoinJWallet@a160dc24f38c + srclibs=BitcoinJWallet-schildbach@a160dc24f38c prebuild=cd ../integration-android && \ mvn3 install && \ cd ../wallet && \ @@ -68,17 +68,17 @@ Build:3.01,121 commit=742241f59df1 patch=pom.patch maven=yes - srclibs=BitcoinJWallet@1649520e3183 + srclibs=BitcoinJWallet-schildbach@1649520e3183 prebuild=sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \ - cp -r $$BitcoinJWallet$$/ . && \ + cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf market/ Build:3.04,124 commit=3efa5beb206e patch=pom.patch maven=yes - srclibs=BitcoinJWallet@7cb7bfc11c11 - prebuild=cp -r $$BitcoinJWallet$$/ . && \ + srclibs=BitcoinJWallet-schildbach@7cb7bfc11c11 + prebuild=cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf market/ # source plugin causes an error after building: @@ -86,9 +86,9 @@ Build:3.04,124 Build:3.14,134 commit=5ede628245a8 maven=yes - srclibs=BitcoinJWallet@67b187c4c4c4 + srclibs=BitcoinJWallet-schildbach@67b187c4c4c4 prebuild=sed -i '30,33d' pom.xml && \ - cp -r $$BitcoinJWallet$$/ . && \ + cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf market/ build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml @@ -96,19 +96,19 @@ Build:3.14,134 Build:3.15,136 commit=dd70948b66aa maven=yes - srclibs=BitcoinJWallet-origin@777e6781d + srclibs=BitcoinJWallet@777e6781d prebuild=sed -i '30,33d' pom.xml && \ sed -i 's/0.11-SNAPSHOT/0.10/g' wallet/pom.xml && \ - cp -r $$BitcoinJWallet-origin$$/ . && \ + cp -r $$BitcoinJWallet$$/ . && \ rm -rf market/ - build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml + build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml Build:3.19,140 commit=885f13e01a86 maven=yes - srclibs=BitcoinJWallet@1134572f61 + srclibs=BitcoinJWallet-schildbach@1134572f61 prebuild=sed -i '30,33d' pom.xml && \ - cp -r $$BitcoinJWallet$$/ . && \ + cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf market/ build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml @@ -116,8 +116,8 @@ Build:3.22,143 commit=8e67f8ea6e38 subdir=wallet maven=yes@.. - srclibs=BitcoinJWallet@v0.10.2 - prebuild=cp -r $$BitcoinJWallet$$/ . && \ + srclibs=BitcoinJWallet-schildbach@v0.10.2 + prebuild=cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf ../market/ && \ sed -i '/sample-integration-android/d' ../pom.xml build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml @@ -126,37 +126,38 @@ Build:3.27,148 commit=5787167f05b8 subdir=wallet maven=yes@.. - srclibs=BitcoinJWallet-origin@v0.10.3 + srclibs=BitcoinJWallet@v0.10.3 rm=market/ - prebuild=cp -r $$BitcoinJWallet-origin$$/ BitcoinJWallet + prebuild=cp -r $$BitcoinJWallet$$/ BitcoinJWallet build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml Build:3.28,149 commit=f796d9531f2d subdir=wallet maven=yes@.. - srclibs=BitcoinJWallet-origin@v0.10.3 + srclibs=BitcoinJWallet@v0.10.3 rm=market/ - prebuild=cp -r $$BitcoinJWallet-origin$$/ BitcoinJWallet + prebuild=cp -r $$BitcoinJWallet$$/ BitcoinJWallet build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml Build:3.39,160 commit=9b292a1f4ff30aefbd subdir=wallet maven=yes@.. - srclibs=BitcoinJWallet@v0.11.1 - prebuild=cp -r $$BitcoinJWallet$$/ BitcoinJWallet + srclibs=BitcoinJWallet-schildbach@v0.11.1 + prebuild=cp -r $$BitcoinJWallet-schildbach$$/ BitcoinJWallet build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml Build:3.46,167 commit=a38ec5e1d9b6569ae3 subdir=wallet maven=yes@.. - srclibs=BitcoinJWallet@v0.11.2 - build=$$MVN3$$ clean install -DskipTests -f $$BitcoinJWallet$$/pom.xml + srclibs=BitcoinJWallet-schildbach@v0.11.2 + build=$$MVN3$$ clean install -DskipTests -f $$BitcoinJWallet-schildbach$$/pom.xml -Build:3.50,171 - commit=bff2e1f560d79d6e0a + +Build:3.52,173 + commit=db1983c3564e147a1ca71d1b subdir=wallet maven=yes@.. srclibs=BitcoinJWallet@v0.11.3 diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt index c5cddb5d47..a03ba1ab31 100644 --- a/metadata/de.schildbach.wallet_test.txt +++ b/metadata/de.schildbach.wallet_test.txt @@ -29,7 +29,7 @@ Build:2.01_test,74 commit=a55ef6822c9e subdir=wallet maven=yes - srclibs=BitcoinJWallet@31953d239555 + srclibs=BitcoinJWallet-schildbach@31953d239555 prebuild=$$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \ $$MVN3$$ install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar @@ -37,8 +37,8 @@ Build:2.02_test,75 commit=d32701a4ce99 subdir=wallet maven=yes - srclibs=BitcoinJWallet@8ced139bf179 - prebuild=cd $$BitcoinJWallet$$ && \ + srclibs=BitcoinJWallet-schildbach@8ced139bf179 + prebuild=cd $$BitcoinJWallet-schildbach$$ && \ $$MVN3$$ install && \ cd - && \ $$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \ @@ -48,8 +48,8 @@ Build:2.16_test,87 commit=49c3da045e57 subdir=wallet maven=2 - srclibs=BitcoinJWallet@a160dc24f38c - prebuild=cd $$BitcoinJWallet$$ && \ + srclibs=BitcoinJWallet-schildbach@a160dc24f38c + prebuild=cd $$BitcoinJWallet-schildbach$$ && \ $$MVN3$$ install && \ cd - && \ cd ../integration-android && \ @@ -61,44 +61,44 @@ Build:2.16_test,87 Build:3.01-test,121 commit=v3.01 maven=yes - srclibs=BitcoinJWallet@1649520e3183 + srclibs=BitcoinJWallet-schildbach@1649520e3183 patch=pom.patch prebuild=sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \ - cp -r $$BitcoinJWallet$$/ . && \ + cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf market/ Build:3.04-test,124 commit=v3.04 maven=yes - srclibs=BitcoinJWallet@7cb7bfc11c11 + srclibs=BitcoinJWallet-schildbach@7cb7bfc11c11 patch=pom.patch - prebuild=cp -r $$BitcoinJWallet$$/ . && \ + prebuild=cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf market/ Build:3.14-test,134 commit=v3.14 maven=yes - srclibs=BitcoinJWallet@v0.9 + srclibs=BitcoinJWallet-schildbach@v0.9 prebuild=sed -i '30,33d' pom.xml && \ - cp -r $$BitcoinJWallet$$/ . && \ + cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf market/ build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml Build:3.15-test,135 commit=3dbf4ba44ff8 maven=yes - srclibs=BitcoinJWallet-origin@777e6781d7 + srclibs=BitcoinJWallet@777e6781d7 prebuild=sed -i '30,33d' pom.xml && \ - cp -r $$BitcoinJWallet-origin$$/ . && \ + cp -r $$BitcoinJWallet$$/ . && \ rm -rf market/ - build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml + build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml Build:3.18-test,139 commit=v3.18 maven=yes - srclibs=BitcoinJWallet@v0.10.1 + srclibs=BitcoinJWallet-schildbach@v0.10.1 prebuild=sed -i '30,33d' pom.xml && \ - cp -r $$BitcoinJWallet$$/ . && \ + cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf market/ build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml @@ -106,8 +106,8 @@ Build:3.23-test,144 commit=b75b225c7289 subdir=wallet maven=yes@.. - srclibs=BitcoinJWallet@v0.10.2 - prebuild=cp -r $$BitcoinJWallet$$/ . && \ + srclibs=BitcoinJWallet-schildbach@v0.10.2 + prebuild=cp -r $$BitcoinJWallet-schildbach$$/ . && \ rm -rf ../market/ && sed -i '/sample-integration-android/d' ../pom.xml build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml @@ -116,8 +116,8 @@ Build:3.27-test,148 subdir=wallet maven=yes@.. rm=market/ - srclibs=BitcoinJWallet-origin@v0.10.3 - prebuild=cp -r $$BitcoinJWallet-origin$$/ BitcoinJWallet + srclibs=BitcoinJWallet@v0.10.3 + prebuild=cp -r $$BitcoinJWallet$$/ BitcoinJWallet build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml Build:3.28-test,149 @@ -125,27 +125,27 @@ Build:3.28-test,149 subdir=wallet maven=yes@.. rm=market/ - srclibs=BitcoinJWallet-origin@v0.10.3 - prebuild=cp -r $$BitcoinJWallet-origin$$/ BitcoinJWallet + srclibs=BitcoinJWallet@v0.10.3 + prebuild=cp -r $$BitcoinJWallet$$/ BitcoinJWallet build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml Build:3.39-test,160 commit=v3.39 subdir=wallet maven=yes@.. - srclibs=BitcoinJWallet@v0.11.1 - prebuild=cp -r $$BitcoinJWallet$$/ BitcoinJWallet + srclibs=BitcoinJWallet-schildbach@v0.11.1 + prebuild=cp -r $$BitcoinJWallet-schildbach$$/ BitcoinJWallet build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml Build:3.46-test,167 commit=v3.46 subdir=wallet maven=yes@.. - srclibs=BitcoinJWallet@v0.11.2 - build=$$MVN3$$ clean install -DskipTests -f $$BitcoinJWallet$$/pom.xml + srclibs=BitcoinJWallet-schildbach@v0.11.2 + build=$$MVN3$$ clean install -DskipTests -f $$BitcoinJWallet-schildbach$$/pom.xml -Build:3.50-test,171 - commit=v3.50 +Build:3.52-test,173 + commit=v3.52 subdir=wallet maven=yes@.. srclibs=BitcoinJWallet@v0.11.3 diff --git a/srclibs/BitcoinJWallet-origin.txt b/srclibs/BitcoinJWallet-origin.txt deleted file mode 100644 index c632202eaf..0000000000 --- a/srclibs/BitcoinJWallet-origin.txt +++ /dev/null @@ -1,3 +0,0 @@ -Repo Type:git -Repo:https://code.google.com/p/bitcoinj - diff --git a/srclibs/BitcoinJWallet-schildbach.txt b/srclibs/BitcoinJWallet-schildbach.txt new file mode 100644 index 0000000000..6445ec815e --- /dev/null +++ b/srclibs/BitcoinJWallet-schildbach.txt @@ -0,0 +1,3 @@ +Repo Type:git +Repo:https://github.com/schildbach/bitcoinj.git + diff --git a/srclibs/BitcoinJWallet.txt b/srclibs/BitcoinJWallet.txt index 6445ec815e..3a65575e73 100644 --- a/srclibs/BitcoinJWallet.txt +++ b/srclibs/BitcoinJWallet.txt @@ -1,3 +1,3 @@ Repo Type:git -Repo:https://github.com/schildbach/bitcoinj.git +Repo:https://github.com/bitcoinj/bitcoinj