Build deps automatically, further refinement of display size

o Avoid UTF-8 symbols w/ varying sizes in .txt output

Author: pjkundert

GNUmakefile

@@ -19,8 +19,8 @@ BUNDLEID	?= ca.kundert.perry.SLIP39
 APIISSUER	?= 5f3b4519-83ae-4e01-8d31-f7db26f68290
 APIKEY		?= 5H98J7LKPC
 
-# PY[3] is the target Python interpreter.  It must have pytest installed.
-PY3		?= $(shell which python3 2>/dev/null && echo python3 || echo python )
+# PY[3] is the target Python interpreter; require 3.9+.  Detect if it is named python3 or python.
+PY3		?= $(shell python3 --version >/dev/null 2>&1 && echo python3 || echo python )
 
 VERSION		= $(shell $(PY3) -c 'exec(open("slip39/version.py").read()); print( __version__ )')
 
@@ -29,8 +29,8 @@ PYTESTOPTS	= -vv # --capture=no --log-cli-level=INFO
 
 PY3TEST		= $(PY3) -m pytest $(PYTESTOPTS)
 
-# VirtualEnv: Build them in ~/src/python-slip39-1.2.3/
-LOCAL		?= ~/src/
+# VirtualEnv: Build them in eg. ~/src/python-slip39-1.2.3/
+VENV_LOCAL	?= ~/src/
 
 GHUB_NAME	= python-slip39
 GHUB_REPO	= [email protected]:pjkundert/$(GHUB_NAME)
@@ -72,18 +72,36 @@ build-check:
 	    || ( echo "\n*** Missing Python modules; run:\n\n        $(PY3) -m pip install --upgrade pip setuptools wheel build\n" \
 	        && false )
 
+deps:			deps-txt
+
 build:			clean wheel app
 
 
+# 
+# org-mode products.
+#
+#     deps-txt:  All of the .txt files needed to build
+# 
+%.txt: %.org
+	emacs $< --batch -f org-ascii-export-to-ascii --kill
+
+GUI_TXT		= $(patsubst %.org,%.txt,$(wildcard slip39/gui/*.org))
+
+deps-txt:	$(GUI_TXT) slip39/gui/SLIP-39.txt
+
+slip39/gui/SLIP-39.txt:
+	toilet --font ascii12 SLIP-39 > $@
+	@echo "        Safe & Effective (tm) Crypto Wallet Backup and Recovery" >> $@
+
 # 
 # VirtualEnv build, install and activate
 #
 
-venv:			$(LOCAL)/$(VENV_NAME)
-venv-activate:		$(LOCAL)/$(VENV_NAME)-activate
+venv:			$(VENV_LOCAL)/$(VENV_NAME)
+venv-activate:		$(VENV_LOCAL)/$(VENV_NAME)-activate
 
 
-$(LOCAL)/$(VENV_NAME):
+$(VENV_LOCAL)/$(VENV_NAME):
 	@echo; echo "*** Building $@ VirtualEnv..."
 	@rm -rf $@ && $(PY3) -m venv $(VENV_OPTS) $@ \
 	    && cd $@ && git clone $(GHUB_REPO) $(GHUB_BRCH) \
@@ -92,7 +110,7 @@ $(LOCAL)/$(VENV_NAME):
 # Activate a given VirtualEnv, and go to its python-slip39 installation
 # o Creates a custom venv-activate.sh script in the venv, and uses it start
 #   start a sub-shell in that venv, with a CWD in the contained python-slip39 installation
-$(LOCAL)/$(VENV_NAME)-activate:	$(LOCAL)/$(VENV_NAME)
+$(VENV_LOCAL)/$(VENV_NAME)-activate:	$(VENV_LOCAL)/$(VENV_NAME)
 	@echo; echo "*** Activating $@ VirtualEnv"
 	@[ -s $</venv-activate.sh ] || (	\
 	    echo "PS1='[\u@\h \W)]\\$$ '";	\
@@ -106,7 +124,7 @@ $(LOCAL)/$(VENV_NAME)-activate:	$(LOCAL)/$(VENV_NAME)
 
 wheel:			dist/slip39-$(VERSION)-py3-none-any.whl
 
-dist/slip39-$(VERSION)-py3-none-any.whl: build-check FORCE
+dist/slip39-$(VERSION)-py3-none-any.whl: build-check deps FORCE
 	$(PY3) -m build
 	@ls -last dist
 
@@ -142,7 +160,7 @@ app-pkg-upload:		dist/SLIP-39-$(VERSION).pkg.upload-package
 # 
 # Build the windows .msi installer
 # 
-dist/slip39-$(VERSION)-win64.msi:
+dist/slip39-$(VERSION)-win64.msi:	deps
 	$(PY3) setup.py bdist_msi
 
 # 
@@ -453,7 +471,8 @@ dist/SLIP-39.app-checkids:	SLIP-39.spec
 #   - Find each dependent key, and look at its SHA fingerprint, and then see if you have
 #     that one in your System keychain, downloading all the named keys from apple 'til
 #     you find the one with the matching fingerprint.  Grr...  Repeat 'til check-signature works.
-dist/SLIP-39.app: 		SLIP-39-macOS.spec	\
+dist/SLIP-39.app: 		deps \
+				SLIP-39-macOS.spec \
 				SLIP-39.metadata/entitlements.plist \
 				images/SLIP-39.icns
 	@echo "\n\n*** Rebuilding $@, version $(VERSION)..."
@@ -529,6 +548,7 @@ SLIP-39-win32.spec: SLIP-39.py
 	@echo "!!! Regenerated $@: must be manually corrected!"
 	false  # Make the build fail if we've regenerated the .spec
 
+
 # 
 # macOS Icons
 # 

requirements-dev.txt

@@ -5,3 +5,4 @@ pytest
 setuptools
 wheel
 pyinstaller	>= 4.9
+cx_Freeze	>= 6.10

slip39/gui/SLIP-39-CRYPTO.txt

@@ -6,9 +6,7 @@ displayed, for information purposes only, to illustrate *which* Wallets
 are derived from this Seed.  The cryptocurrencies supported, and the
 standard BIP-44 derivation paths (Trezor compatible) displayed are:
 
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
  BTC   m/84'/0'/0'/0/0 (Bech32) 
  ETH   m/44'/60'/0'/0/0         
  LTC   m/44'/2'/0'/0/0          
  DOGE  m/44'/3'/0'/0/0          
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

slip39/gui/SLIP-39-G-NAME.org

@@ -10,7 +10,6 @@ The default Group names and their intended usages are:
 | Second | A 1-card group stored in the First safe place |
 | Fam    | A smaller group of Family members             |
 | Fren   | A larger group of Friends; increase Needed    |
-
 #+END_ABSTRACT
 
 * 1-Card Groups

slip39/gui/SLIP-39-G-NAME.txt

@@ -2,16 +2,14 @@ Name each Group according to "who" or "where" you plan to distribute it.
 
 The default Group names and their intended usages are:
 
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
  First   A 1-card group stored in the First safe place 
  Second  A 1-card group stored in the First safe place 
  Fam     A smaller group of Family members             
  Fren    A larger group of Friends; increase Needed    
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 
 1 1-Card Groups
-═══════════════
+===============
 
   Useful for the direct owners of the Seed.  Just one Card for these
   groups must be collected; ensure that 2+ of these Groups are created,
@@ -23,27 +21,27 @@ The default Group names and their intended usages are:
 
 
 2 Multi-Card Groups
-═══════════════════
+===================
 
   If you have a group of people (or places) that may be lost or
   destroyed, or where some Mnemonics (cards) may be found and fall into
   hostile hands, use a multi-card group.
 
 
 2.1 Hostile Groups
-──────────────────
+~~~~~~~~~~~~~~~~~~
 
   The more /hostile/ (untrustworthy) the group (ie. the more likely that
-  any card(s) may be stolen by an attacker) – make the Group's
+  any card(s) may be stolen by an attacker) -- make the Group's
   Needed/#-in-Group ratio larger.  Then, the attacker must collect more
   cards to defeat the Group.
 
 
 2.2 Fragile Groups
-──────────────────
+~~~~~~~~~~~~~~~~~~
 
   The more /fragile/ (unreliable) the group (ie. the more likely that
-  any card(s) may be lost or destroyed) – make the Group's
+  any card(s) may be lost or destroyed) -- make the Group's
   Needed/#-in-Group ratio smaller.  Thus, more cards may be
   lost/destroyed before the Group can no longer be recovered (an *other*
   Group(s) must be colledted, instead, to recover the Seed).

slip39/gui/SLIP-39-G.txt

@@ -6,7 +6,7 @@ Decrease "# Needed", the less Fragile/Unreliable the Group is.
 
 
 1 1-Card Groups
-═══════════════
+===============
 
   Useful for the direct owners of the Seed.  Just one Card for these
   groups must be collected; ensure that 2+ of these Groups are created,
@@ -18,27 +18,27 @@ Decrease "# Needed", the less Fragile/Unreliable the Group is.
 
 
 2 Multi-Card Groups
-═══════════════════
+===================
 
   If you have a group of people (or places) that may be lost or
   destroyed, or where some Mnemonics (cards) may be found and fall into
   hostile hands, use a multi-card group.
 
 
 2.1 Hostile Groups
-──────────────────
+~~~~~~~~~~~~~~~~~~
 
   The more /hostile/ (untrustworthy) the group (ie. the more likely that
-  any card(s) may be stolen by an attacker) – make the Group's
+  any card(s) may be stolen by an attacker) -- make the Group's
   Needed/#-in-Group ratio larger.  Then, the attacker must collect more
   cards to defeat the Group.
 
 
 2.2 Fragile Groups
-──────────────────
+~~~~~~~~~~~~~~~~~~
 
   The more /fragile/ (unreliable) the group (ie. the more likely that
-  any card(s) may be lost or destroyed) – make the Group's
+  any card(s) may be lost or destroyed) -- make the Group's
   Needed/#-in-Group ratio smaller.  Thus, more cards may be
   lost/destroyed before the Group can no longer be recovered (an *other*
   Group(s) must be colledted, instead, to recover the Seed).

slip39/gui/SLIP-39-LO.txt

@@ -1,26 +1,24 @@
 Select an appropriate level of Controls detail.
 
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- Basic  Basic SLIP-39 Mnemonic creation           
+ Basic  SLIP-39 Mnemonic creation                 
  Extra  Enhanced SLIP-39 creation and recover     
  Pro    Conversion of BIP-39 Mnemonics to SLIP-39 
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 
 1 Basic
-═══════
+=======
 
   A basic SLIP-39 Mnemonic creation interface.
 
 
 2 Extra
-═══════
+=======
 
   Greater control over the Mnemonic creation process.
 
 
 2.1 Extra Seed Entropy
-──────────────────────
+~~~~~~~~~~~~~~~~~~~~~~
 
   Probably most importantly, Extra Entropy can be supplied.  Any data
   supplied (Dice rolls, for example, add about 2.5 bits of entropy per
@@ -36,14 +34,14 @@ Select an appropriate level of Controls detail.
 
 
 2.2 SLIP-39
-───────────
+~~~~~~~~~~~
 
   Supports input of existing SLIP-39 mnemonics to recover the original
   Seed.
 
 
 3 Pro
-═════
+=====
 
   Advanced SLIP-39 creation and recovery, and conversion of BIP-39
   Mnemonics to SLIP-39.
@@ -52,7 +50,7 @@ Select an appropriate level of Controls detail.
 
 
 3.1 BIP-39
-──────────
+~~~~~~~~~~
 
   Conversion of existing, fragile BIP-39 12- or 24-word Mnemonic phrases
   into SLIP-39 is supported.
@@ -63,7 +61,7 @@ Select an appropriate level of Controls detail.
 
 
 3.1.1 Not Trezor Compatible
-╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌
+---------------------------
 
   Unfortunately, the Trezor only implements 128-bit (20 word) and
   256-bit (33-word) Mnemonics, so the BIP-39 Seed converted to SLIP-39

slip39/gui/SLIP-39-SD.txt

@@ -1,8 +1,6 @@
-Create (or recover) Seed Data.
+Create (or recover) Seed Data for your SLIP-39 Mnemonic.
 
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
  Random   Create SLIP-39 Mnemonic creation from secure Entropy 
  SLIP-39  (Extra) Recover Seed from SLIP-39 Mnemonics          
  BIP-39   (Pro) Recover Seed from BIP-39 Mnemonics             
  Fixed    (Pro) Hex data may be supplied for the Seed          
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

slip39/gui/SLIP-39-WALLET.txt

@@ -1,8 +1,8 @@
 Supply a password to produce an encrypted Ethereum JSON wallet or
-Bitcoin, … BIP-38 Paper Wallet.
+Bitcoin, ... BIP-38 Paper Wallet.
 
 If you import these SLIP-39 Mnemonics directly into your Trezor hardware
-wallet – you do /not/ need Paper Wallets: you have access to /all/ of
+wallet -- you do /not/ need Paper Wallets: you have access to /all/ of
 the wallets, in every cryptocurrency supported by the Trezor.
 
 These are intended to support the importing of /individual/, single
@@ -13,32 +13,32 @@ recoverable "Safe Portable Crypto Accounts" (below).
 
 
 1 Password
-══════════
+==========
 
-  If you lose or forget this Paper Wallet password – you cannot import
+  If you lose or forget this Paper Wallet password -- you cannot import
   these wallets into compatible software Cryptocurrency wallets!
   Remember; the Seed can still be recovered by collecting sufficient
   numbers of Mnemonics (cards), and then new Paper Wallets can be
   issued.
 
 
 1.1 Hint
-────────
+~~~~~~~~
 
   A small (<10 character) hint about what (or where) the Paper Wallet
   Password is.
 
 
 2 Safe Portable Crypto Accounts
-═══════════════════════════════
+===============================
 
   If you want to issue temporary Paper Wallets (to carry cryptocurrency
   with you to give to someone or buy something), then Paper Wallets
   derived from your account are a good idea.
 
 
 2.1 Custom Derivation Path
-──────────────────────────
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
   Use the `SLIP-39' App to recover your Seed, select the desired
   Cryptocurrency (eg. `BTC'), and then enter a Paper Wallet Password,
@@ -50,11 +50,9 @@ recoverable "Safe Portable Crypto Accounts" (below).
   Derive", this would result in 3 paper wallets being produced, at the
   following standard BTC Bech32 derivation paths:
 
-  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
    m/84'/0'/1'/0/0  bc1q8pqnqs573vx3qdp0xp6qdqzvnvy8px24rxh9lp 
    m/84'/0'/1'/0/0  bc1qwtc58u4mmnxa29u8j07e6lmqpnrs38vefy3y24 
    m/84'/0'/1'/0/0  bc1qg9s8qzm0lcetfv6umhlm3evtca5zsqv7elqd5s 
-  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
   You could load these wallets with funds, write the amount on the
   front, and fold them over twice (to hide the PRIVATE KEY, while

slip39/gui/SLIP-39.txt

@@ -8,3 +8,4 @@
   """""    """"""""   """"""   ""                   """""      """"   
 
 
+        Safe & Effective (tm) Crypto Wallet Backup and Recovery