build: rename some scripts

also, merge sdist/build.sh and sdist/make_tgz into sdist/make_sdist.sh

.travis.yml

@@ -61,7 +61,7 @@ jobs:
       install:
         - sudo docker build --no-cache -t electrum-wine-builder-img ./contrib/build-wine/
       script:
-        - sudo docker run --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 ./build.sh
+        - sudo docker run --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
       after_success: true
     - if: (branch = master) OR (tag IS present)
       name: "Android build"
@@ -103,7 +103,7 @@ jobs:
       install:
         - sudo docker build --no-cache -t electrum-appimage-builder-img ./contrib/build-linux/appimage/
       script:
-        - sudo docker run --name electrum-appimage-builder-cont -v $PWD:/opt/electrum --rm --workdir /opt/electrum/contrib/build-linux/appimage electrum-appimage-builder-img ./build.sh
+        - sudo docker run --name electrum-appimage-builder-cont -v $PWD:/opt/electrum --rm --workdir /opt/electrum/contrib/build-linux/appimage electrum-appimage-builder-img ./make_appimage.sh
       after_success: true
     - if: (branch = master) OR (tag IS present)
       name: "tarball build"
@@ -123,7 +123,7 @@ jobs:
         - sudo docker build --no-cache -t electrum-sdist-builder-img ./contrib/build-linux/sdist/
       script:
         - echo "Building sdist at $PWD"
-        - sudo docker run --name electrum-sdist-builder-cont -v $PWD:/opt/electrum --rm --workdir /opt/electrum/contrib/build-linux/sdist electrum-sdist-builder-img ./build.sh
+        - sudo docker run --name electrum-sdist-builder-cont -v $PWD:/opt/electrum --rm --workdir /opt/electrum/contrib/build-linux/sdist electrum-sdist-builder-img ./make_sdist.sh
       after_success: true
     - stage: release check
       install:

contrib/build-linux/appimage/README.md

@@ -37,7 +37,7 @@ see [issue #5159](https://github.com/spesmilo/electrum/issues/5159).
         --rm \
         --workdir /opt/electrum/contrib/build-linux/appimage \
         electrum-appimage-builder-img \
-        ./build.sh
+        ./make_appimage.sh
     ```
 
 4. The generated binary is in `./dist`.

contrib/build-linux/sdist/README.md

@@ -45,6 +45,6 @@ folder.
         --rm \
         --workdir /opt/electrum/contrib/build-linux/sdist \
         electrum-sdist-builder-img \
-        ./build.sh
+        ./make_sdist.sh
     ```
 4. The generated distributables are in `./dist`.

contrib/build-linux/sdist/build.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e
-
-PROJECT_ROOT="$(dirname "$(readlink -e "$0")")/../../.."
-CONTRIB="$PROJECT_ROOT/contrib"
-CONTRIB_SDIST="$CONTRIB/build-linux/sdist"
-DISTDIR="$PROJECT_ROOT/dist"
-
-. "$CONTRIB"/build_tools_util.sh
-
-# note that at least py3.7 is needed, to have https://bugs.python.org/issue30693
-python3 --version || fail "python interpreter not found"
-
-break_legacy_easy_install
-
-# upgrade to modern pip so that it knows the flags we need.
-# we will then install a pinned version of pip as part of requirements-build-sdist
-python3 -m pip install --upgrade pip
-
-info "Installing pinned requirements."
-python3 -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-build-sdist.txt
-
-
-"$CONTRIB"/make_packages || fail "make_packages failed"
-
-"$CONTRIB_SDIST"/make_tgz || fail "make_tgz failed"
-
-
-info "done."
-ls -la "$DISTDIR"
-sha256sum "$DISTDIR"/*

contrib/build-linux/sdist/make_sdist.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+set -e
+
+PROJECT_ROOT="$(dirname "$(readlink -e "$0")")/../../.."
+CONTRIB="$PROJECT_ROOT/contrib"
+CONTRIB_SDIST="$CONTRIB/build-linux/sdist"
+DISTDIR="$PROJECT_ROOT/dist"
+LOCALE="$PROJECT_ROOT/electrum/locale/"
+
+. "$CONTRIB"/build_tools_util.sh
+
+# note that at least py3.7 is needed, to have https://bugs.python.org/issue30693
+python3 --version || fail "python interpreter not found"
+
+break_legacy_easy_install
+
+# upgrade to modern pip so that it knows the flags we need.
+# we will then install a pinned version of pip as part of requirements-build-sdist
+python3 -m pip install --upgrade pip
+
+info "Installing pinned requirements."
+python3 -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-build-sdist.txt
+
+
+"$CONTRIB"/make_packages || fail "make_packages failed"
+
+git submodule update --init
+
+(
+    cd "$CONTRIB/deterministic-build/electrum-locale/"
+    if ! which msgfmt > /dev/null 2>&1; then
+        echo "Please install gettext"
+        exit 1
+    fi
+    # We include both source (.po) and compiled (.mo) locale files in the source dist.
+    # Maybe we should exclude the compiled locale files? see https://askubuntu.com/a/144139
+    # (also see MANIFEST.in)
+    rm -rf "$LOCALE"
+    for i in ./locale/*; do
+        dir="$PROJECT_ROOT/electrum/$i/LC_MESSAGES"
+        mkdir -p "$dir"
+        msgfmt --output-file="$dir/electrum.mo" "$i/electrum.po" || true
+        cp $i/electrum.po "$PROJECT_ROOT/electrum/$i/electrum.po"
+    done
+)
+
+(
+    cd "$PROJECT_ROOT"
+
+    find -exec touch -h -d '2000-11-11T11:11:11+00:00' {} +
+
+    # note: .zip sdists would not be reproducible due to https://bugs.python.org/issue40963
+    TZ=UTC faketime -f '2000-11-11 11:11:11' python3 setup.py --quiet sdist --format=gztar
+)
+
+
+info "done."
+ls -la "$DISTDIR"
+sha256sum "$DISTDIR"/*

contrib/build-linux/sdist/make_tgz

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-set -e
-
-CONTRIB_SDIST="$(dirname "$(readlink -e "$0")")"
-CONTRIB="$CONTRIB_SDIST"/../..
-ROOT_FOLDER="$CONTRIB"/..
-PACKAGES="$ROOT_FOLDER"/packages/
-LOCALE="$ROOT_FOLDER"/electrum/locale/
-
-if [ ! -d "$PACKAGES" ]; then
-  echo "Run make_packages first!"
-  exit 1
-fi
-
-git submodule update --init
-
-(
-    cd "$CONTRIB/deterministic-build/electrum-locale/"
-    if ! which msgfmt > /dev/null 2>&1; then
-        echo "Please install gettext"
-        exit 1
-    fi
-    # We include both source (.po) and compiled (.mo) locale files in the source dist.
-    # Maybe we should exclude the compiled locale files? see https://askubuntu.com/a/144139
-    # (also see MANIFEST.in)
-    rm -rf "$LOCALE"
-    for i in ./locale/*; do
-        dir="$ROOT_FOLDER/electrum/$i/LC_MESSAGES"
-        mkdir -p "$dir"
-        msgfmt --output-file="$dir/electrum.mo" "$i/electrum.po" || true
-        cp $i/electrum.po "$ROOT_FOLDER/electrum/$i/electrum.po"
-    done
-)
-
-(
-    cd "$ROOT_FOLDER"
-
-    find -exec touch -h -d '2000-11-11T11:11:11+00:00' {} +
-
-    # note: .zip sdists would not be reproducible due to https://bugs.python.org/issue40963
-    TZ=UTC faketime -f '2000-11-11 11:11:11' python3 setup.py --quiet sdist --format=gztar
-)

contrib/build-wine/README.md

@@ -51,7 +51,7 @@ folder.
         --rm \
         --workdir /opt/wine64/drive_c/electrum/contrib/build-wine \
         electrum-wine-builder-img \
-        ./build.sh
+        ./make_win.sh
     ```
 4. The generated binaries are in `./contrib/build-wine/dist`.
 
@@ -70,18 +70,18 @@ The release signing procedure involves a signer (the holder of the
 certificate/key) and one or multiple trusted verifiers:
 
 
-| Signer                                                    | Verifier                          |
+| Signer                                                    | Verifier                             |
-|-----------------------------------------------------------|-----------------------------------|
+|-----------------------------------------------------------|--------------------------------------|
-| Build .exe files using `build.sh`                         |                                   |
+| Build .exe files using `make_win.sh`                      |                                      |
-| Sign .exe with `./sign.sh`                                |                                   |
+| Sign .exe with `./sign.sh`                                |                                      |
-| Upload signed files to download server                    |                                   |
+| Upload signed files to download server                    |                                      |
-|                                                           | Build .exe files using `build.sh` |
+|                                                           | Build .exe files using `make_win.sh` |
-|                                                           | Compare files using `unsign.sh`   |
+|                                                           | Compare files using `unsign.sh`      |
-|                                                           | Sign .exe file using `gpg -b`     |
+|                                                           | Sign .exe file using `gpg -b`        |
 
-| Signer and verifiers:                                                                         |
+| Signer and verifiers:                                                                            |
-|-----------------------------------------------------------------------------------------------|
+|--------------------------------------------------------------------------------------------------|
-| Upload signatures to 'electrum-signatures' repo, as `$version/$filename.$builder.asc`         |
+| Upload signatures to 'electrum-signatures' repo, as `$version/$filename.$builder.asc`            |
 
 
 

contrib/build-wine/make_win.sh

@@ -53,7 +53,7 @@ else
     "$CONTRIB"/make_zbar.sh || fail "Could not build zbar"
 fi
 
-$here/prepare-wine.sh || fail "prepare-wine failed"
+"$here/prepare-wine.sh" || fail "prepare-wine failed"
 
 info "Resetting modification time in C:\Python..."
 # (Because of some bugs in pyinstaller)
@@ -62,6 +62,6 @@ find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 ls -l /opt/wine64/drive_c/python*
 
-$here/build-electrum-git.sh || fail "build-electrum-git failed"
+"$here/build-electrum-git.sh" || fail "build-electrum-git failed"
 
 info "Done."

contrib/release.sh

@@ -49,7 +49,7 @@ else
 	--rm \
 	--workdir /opt/electrum/contrib/build-linux/sdist \
 	electrum-sdist-builder-img \
-	./build.sh
+	./make_sdist.sh
    popd
    cp /opt/electrum/contrib/build-linux/sdist/fresh_clone/electrum/dist/$target dist/
 fi
@@ -66,12 +66,12 @@ if test -f dist/$target; then
 else
     sudo docker build -t electrum-appimage-builder-img contrib/build-linux/appimage
     sudo docker run -it \
-         --name electrum-appimage-builder-cont \
+        --name electrum-appimage-builder-cont \
-	 -v $PWD:/opt/electrum \
+	    -v $PWD:/opt/electrum \
-         --rm \
+        --rm \
-	 --workdir /opt/electrum/contrib/build-linux/appimage \
+	    --workdir /opt/electrum/contrib/build-linux/appimage \
-         electrum-appimage-builder-img \
+        electrum-appimage-builder-img \
-	 ./build.sh
+	    ./make_appimage.sh
 fi
 
 
@@ -93,7 +93,7 @@ else
         --rm \
         --workdir /opt/wine64/drive_c/electrum/contrib/build-wine \
         electrum-wine-builder-img \
-        ./build.sh
+        ./make_win.sh
     # do this in the fresh clone directory!
     cd contrib/build-wine/
     ./sign.sh