tkivy build: test and document that make_locale is to be run first - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ba08b2279ddbdbe9bdd8fec349fa159e0b8cd147
DIR parent 6fb974227ba924c877e50defc36d7a3006660ef4
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Thu, 7 Feb 2019 16:45:09 +0100
kivy build: test and document that make_locale is to be run first
Diffstat:
M contrib/make_apk | 17 +++++++++++++++++
M contrib/make_packages | 8 ++++----
M contrib/make_tgz | 20 ++++++++++----------
M electrum/gui/kivy/Readme.md | 12 +++++++++---
4 files changed, 40 insertions(+), 17 deletions(-)
---
DIR diff --git a/contrib/make_apk b/contrib/make_apk
t@@ -1,5 +1,22 @@
#!/bin/bash
+set -e
+
+CONTRIB="$(dirname "$(readlink -e "$0")")"
+ROOT_FOLDER="$CONTRIB"/..
+PACKAGES="$ROOT_FOLDER"/packages/
+LOCALE="$ROOT_FOLDER"/electrum/locale/
+
+if [ ! -d "$LOCALE" ]; then
+ echo "Run make_locale first!"
+ exit 1
+fi
+
+if [ ! -d "$PACKAGES" ]; then
+ echo "Run make_packages first!"
+ exit 1
+fi
+
pushd ./electrum/gui/kivy/
make theming
DIR diff --git a/contrib/make_packages b/contrib/make_packages
t@@ -1,10 +1,10 @@
#!/bin/bash
-contrib=$(dirname "$0")
-test -n "$contrib" -a -d "$contrib" || exit
+CONTRIB="$(dirname "$0")"
+test -n "$CONTRIB" -a -d "$CONTRIB" || exit
-rm "$contrib"/../packages/ -r
+rm "$CONTRIB"/../packages/ -r
#Install pure python modules in electrum directory
-python3 -m pip install -r $contrib/deterministic-build/requirements.txt -t $contrib/../packages
+python3 -m pip install -r "$CONTRIB"/deterministic-build/requirements.txt -t "$CONTRIB"/../packages
DIR diff --git a/contrib/make_tgz b/contrib/make_tgz
t@@ -7,18 +7,18 @@ ROOT_FOLDER="$CONTRIB"/..
PACKAGES="$ROOT_FOLDER"/packages/
LOCALE="$ROOT_FOLDER"/electrum/locale/
-(
- cd "$ROOT_FOLDER"
+if [ ! -d "$LOCALE" ]; then
+ echo "Run make_locale first!"
+ exit 1
+fi
- if [ ! -d "$LOCALE" ]; then
- echo "Run make_locale first!"
- exit 1
- fi
+if [ ! -d "$PACKAGES" ]; then
+ echo "Run make_packages first!"
+ exit 1
+fi
- if [ ! -d "$PACKAGES" ]; then
- echo "Run make_packages first!"
- exit 1
- fi
+(
+ cd "$ROOT_FOLDER"
echo "'git clean -fx' would delete the following files: >>>"
git clean -fx --dry-run
DIR diff --git a/electrum/gui/kivy/Readme.md b/electrum/gui/kivy/Readme.md
t@@ -24,13 +24,19 @@ folder.
$ sudo docker build -t electrum-android-builder-img electrum/gui/kivy/tools
```
-3. Prepare pure python dependencies
+3. Build locale files
```
- $ sudo ./contrib/make_packages
+ $ ./contrib/make_locale
```
-4. Build binaries
+4. Prepare pure python dependencies
+
+ ```
+ $ ./contrib/make_packages
+ ```
+
+5. Build binaries
```
$ sudo docker run -it --rm \