add support for liquid

greenaddress · May 2, 2019 · 3e157f0 · 3e157f0
1 parent 4f73a35
commit 3e157f0
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,11 +10,18 @@ env:
     - COMMIT=2472733a24a9364e4c6233ccd04166a26a68cc65
     - TARGETHOST=aarch64-linux-android
     - BITS=64
+    - REPONAME=bitcoin
+    - RENAME=bitcoin
+    - CONFIGURE=--disable-man
   matrix:
-    - UNUSED=true
-    - TARGETHOST=armv7a-linux-androideabi BITS=32
-    - TARGETHOST=x86_64-linux-android
-    - TARGETHOST=i686-linux-android BITS=32
+    - unused=true
+    - targethost=armv7a-linux-androideabi bits=32
+    - targethost=x86_64-linux-android
+    - targethost=i686-linux-android bits=32
+    - REPO=https://github.com/elementsproject/elements.git COMMIT=551483eae50ff2ee48ed17d6b22bb1a26284b635 REPONAME=elements RENAME=liquid CONFIGURE=--enable-liquid
+    - targethost=armv7a-linux-androideabi bits=32 REPO=https://github.com/elementsproject/elements.git COMMIT=551483eae50ff2ee48ed17d6b22bb1a26284b635 REPONAME=elements RENAME=liquid CONFIGURE=--enable-liquid
+    - targethost=x86_64-linux-android REPO=https://github.com/elementsproject/elements.git COMMIT=551483eae50ff2ee48ed17d6b22bb1a26284b635 REPONAME=elements RENAME=liquid CONFIGURE=--enable-liquid
+    - targethost=i686-linux-android bits=32 REPO=https://github.com/elementsproject/elements.git COMMIT=551483eae50ff2ee48ed17d6b22bb1a26284b635 REPONAME=elements RENAME=liquid CONFIGURE=--enable-liquid
 
 script:
-  - docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh $REPO $COMMIT $TARGETHOST $BITS"
+  - docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh $REPO $COMMIT $REPONAME $RENAME $CONFIGURE $TARGETHOST $BITS"
diff --git a/fetchbuild.sh b/fetchbuild.sh
@@ -3,11 +3,14 @@ set -e
 
 repo=$1
 commit=$2
-target_host=$3
-bits=$4
-
-git clone $repo bitcoin
-cd bitcoin
+reponame=$3
+rename=$4
+configextra=$5
+target_host=$6
+bits=$7
+
+git clone $repo $reponame
+cd $reponame
 git checkout $commit
 
 patch -p1 < /repo/0001-android-patches.patch
@@ -31,13 +34,15 @@ make HOST=${target_host/v7a/} NO_QT=1 -j $num_jobs
 cd ..
 
 ./autogen.sh
-./configure --prefix=$PWD/depends/${target_host/v7a/} ac_cv_c_bigendian=no ac_cv_sys_file_offset_bits=$bits --disable-bench --enable-experimental-asm --disable-tests --disable-man --without-utils --without-libs --with-daemon
+./configure --prefix=$PWD/depends/${target_host/v7a/} ac_cv_c_bigendian=no ac_cv_sys_file_offset_bits=$bits --disable-bench --enable-experimental-asm --disable-tests --disable-man --without-utils --without-libs --with-daemon ${configextra}
 
 make -j $num_jobs
 make install
 
-$STRIP depends/${target_host/v7a/}/bin/bitcoind
+$STRIP depends/${target_host/v7a/}/bin/${reponame}d
 
-repo_name=$(basename $(dirname ${repo}))
+if [ "${reponame}" != "${rename}" ]; then
+    mv depends/${target_host/v7a/}/bin/${reponame}d depends/${target_host/v7a/}/bin/${rename}d
+fi
 
-tar -zcf /repo/${target_host/v7a/}_${repo_name}.tar.gz -C depends/${target_host/v7a/}/bin bitcoind
+tar -zcf /repo/${target_host/v7a/}_${rename}.tar.gz -C depends/${target_host/v7a/}/bin ${rename}d
diff --git a/run.sh b/run.sh
@@ -4,22 +4,40 @@ set -e
 DOCKERBUILDER=greenaddress/core_builder_for_android
 
 REPO_CORE=https://github.com/bitcoin/bitcoin.git
+COMMIT_CORE=2472733a24a9364e4c6233ccd04166a26a68cc65
 
 DOCKERHASH=6603364284e4fe27f973e6d2e42b7eacf418baabf87b89638d46453772652d2e
-COMMIT_CORE=2472733a24a9364e4c6233ccd04166a26a68cc65
 
-repos="${REPO_CORE}_${COMMIT_CORE}"
+
+REPO_ELEMENTS=https://github.com/elementsproject/elements.git
+COMMIT_ELEMENTS=551483eae50ff2ee48ed17d6b22bb1a26284b635
+
+
 docker pull $DOCKERBUILDER@sha256:$DOCKERHASH
-for repo in ${repos}; do
-  TARGETHOST=armv7a-linux-androideabi
-  docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${repo/_/ } $TARGETHOST 32" &
-  TARGETHOST=aarch64-linux-android
-  docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${repo/_/ } $TARGETHOST 64" &
-  TARGETHOST=x86_64-linux-android
-  docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${repo/_/ } $TARGETHOST 64" &
-  TARGETHOST=i686-linux-android
-  docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${repo/_/ } $TARGETHOST 32" &
-done
+
+TARGETHOST=armv7a-linux-androideabi
+REPO=${REPO_CORE}_${COMMIT_CORE}
+
+
+docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${REPO/_/ } bitcoin bitcoin '' $TARGETHOST 32 " &
+
+TARGETHOST=aarch64-linux-android
+docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${REPO/_/ } $TARGETHOST 64" &
+TARGETHOST=x86_64-linux-android
+docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${REPO/_/ } $TARGETHOST 64" &
+TARGETHOST=i686-linux-android
+docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${REPO/_/ } $TARGETHOST 32" &
+
+
+REPO=${REPO_ELEMENTS}_${COMMIT_ELEMENTS}
+TARGETHOST=armv7a-linux-androideabi
+docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${REPO/_/ } elements liquid '--enable-liquid' $TARGETHOST 32 " &
+TARGETHOST=aarch64-linux-android
+docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${REPO/_/ } elements liquid '--enable-liquid' $TARGETHOST 64" &
+TARGETHOST=x86_64-linux-android
+docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${REPO/_/ } elements liquid '--enable-liquid' $TARGETHOST 64" &
+TARGETHOST=i686-linux-android
+docker run -v $PWD:/repo $DOCKERBUILDER@sha256:$DOCKERHASH /bin/bash -c "/repo/fetchbuild.sh ${REPO/_/ } elements liquid '--enable-liquid' $TARGETHOST 32" &
 
 
 wait