build: try to consolidate instructions and decr codedupe in release.sh

contrib/release.sh

@@ -24,6 +24,9 @@ REV=`git describe --tags`
 echo "REV: $REV"
 COMMIT=$(git rev-parse HEAD)
 
+export ELECBUILD_COMMIT="${COMMIT}^{commit}"
+#export ELECBUILD_NOCACHE=1
+
 
 git_status=$(git status --porcelain)
 if [ ! -z "$git_status" ]; then
@@ -39,23 +42,7 @@ target=Electrum-$VERSION.tar.gz
 if test -f dist/$target; then
     echo "file exists: $target"
 else
-   pushd .
-   sudo docker build -t electrum-sdist-builder-img contrib/build-linux/sdist
-   FRESH_CLONE="contrib/build-linux/sdist/fresh_clone/electrum" && \
-        sudo rm -rf "$FRESH_CLONE" && \
-        umask 0022 && \
-        git clone . "$FRESH_CLONE" && \
-        cd "$FRESH_CLONE"
-   git checkout "${COMMIT}^{commit}"
-   sudo docker run -it \
-        --name electrum-sdist-builder-cont \
-        -v $PWD:/opt/electrum \
-        --rm \
-        --workdir /opt/electrum/contrib/build-linux/sdist \
-        electrum-sdist-builder-img \
-        ./make_sdist.sh
-   popd
-   cp /opt/electrum/contrib/build-linux/sdist/fresh_clone/electrum/dist/$target dist/
+   ./contrib/build-linux/sdist/build.sh
 fi
 
 # appimage
@@ -68,14 +55,7 @@ fi
 if test -f dist/$target; then
     echo "file exists: $target"
 else
-    sudo docker build -t electrum-appimage-builder-img contrib/build-linux/appimage
-    sudo docker run -it \
-        --name electrum-appimage-builder-cont \
-        -v $PWD:/opt/electrum \
-        --rm \
-        --workdir /opt/electrum/contrib/build-linux/appimage \
-        electrum-appimage-builder-img \
-        ./make_appimage.sh
+    ./contrib/build-linux/appimage/build.sh
 fi
 
 
@@ -85,20 +65,7 @@ if test -f dist/$target; then
     echo "file exists: $target"
 else
     pushd .
-    FRESH_CLONE="contrib/build-wine/fresh_clone/electrum" && \
-        sudo rm -rf "$FRESH_CLONE" && \
-        umask 0022 && \
-        git clone . "$FRESH_CLONE" && \
-        cd "$FRESH_CLONE"
-    git checkout "${COMMIT}^{commit}"
-    sudo docker run -it \
-        --name electrum-wine-builder-cont \
-        -v $PWD:/opt/wine64/drive_c/electrum \
-        --rm \
-        --workdir /opt/wine64/drive_c/electrum/contrib/build-wine \
-        electrum-wine-builder-img \
-        ./make_win.sh
-    # do this in the fresh clone directory!
+    ./contrib/build-wine/build.sh
     cd contrib/build-wine/
     ./sign.sh
     cp ./signed/*.exe /opt/electrum/dist/
@@ -112,28 +79,7 @@ target2=Electrum-$VERSION.0-arm64-v8a-release.apk
 if test -f dist/$target1; then
     echo "file exists: $target1"
 else
-    pushd .
-    ./contrib/android/build_docker_image.sh
-    FRESH_CLONE="contrib/android/fresh_clone/electrum" && \
-        sudo rm -rf "$FRESH_CLONE" && \
-        umask 0022 && \
-        git clone . "$FRESH_CLONE" && \
-        cd "$FRESH_CLONE"
-    git checkout "${COMMIT}^{commit}"
-    mkdir --parents $PWD/.buildozer/.gradle
-    sudo docker run -it --rm \
-         --name electrum-android-builder-cont \
-         -v $PWD:/home/user/wspace/electrum \
-         -v $PWD/.buildozer/.gradle:/home/user/.gradle \
-         -v ~/.keystore:/home/user/.keystore \
-         --workdir /home/user/wspace/electrum \
-         electrum-android-builder-img \
-         ./contrib/android/make_apk release
-    popd
-
-    cp contrib/android/fresh_clone/electrum/dist/$target1 dist/
-    cp contrib/android/fresh_clone/electrum/dist/$target2 dist/
-
+    ./contrib/android/build.sh release
 fi
 
 
@@ -153,7 +99,7 @@ fi
 echo "build complete"
 sha256sum dist/*.tar.gz
 sha256sum dist/*.AppImage
-sha256sum contrib/build-wine/fresh_clone/electrum/contrib/build-wine/dist/*.exe
+sha256sum contrib/build-wine/dist/*.exe
 
 echo -n "proceed (y/n)? "
 read answer