zebra.lucky
/
electrum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

version.py: rm APK_VERSION 

related: https://github.com/spesmilo/electrum/issues/9210#issuecomment-2376572832
master
SomberNight 1 year ago
parent
2c6e768c8d
commit
c96ac892c3
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
6 changed files with 14 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      contrib/add_cosigner
  2. 2
      contrib/android/buildozer_qml.spec
  3. 9
      contrib/make_download
  4. 2
      contrib/print_electrum_version.py
  5. 12
      contrib/release.sh
  6. 1
      electrum/version.py

9
contrib/add_cosigner
Unescape View File

@ -37,13 +37,12 @@ version_module = importlib.util.module_from_spec(version_spec)
version_spec.loader.exec_module(version_module) version_spec.loader.exec_module(version_module)
ELECTRUM_VERSION = version_module.ELECTRUM_VERSION ELECTRUM_VERSION = version_module.ELECTRUM_VERSION
APK_VERSION = version_module.APK_VERSION
print("version", ELECTRUM_VERSION) print("version", ELECTRUM_VERSION)
# GPG name of cosigner # GPG name of cosigner
cosigner = sys.argv[1] cosigner = sys.argv[1]
version = version_win = version_mac = ELECTRUM_VERSION version = version_win = version_mac = version_android = ELECTRUM_VERSION
files = { files = {
"tgz": f"Electrum-{version}.tar.gz", "tgz": f"Electrum-{version}.tar.gz",
@ -53,9 +52,9 @@ files = {
"win": f"electrum-{version_win}.exe", "win": f"electrum-{version_win}.exe",
"win_setup": f"electrum-{version_win}-setup.exe", "win_setup": f"electrum-{version_win}-setup.exe",
"win_portable": f"electrum-{version_win}-portable.exe", "win_portable": f"electrum-{version_win}-portable.exe",
"apk_arm64": f"Electrum-{APK_VERSION}-arm64-v8a-release.apk", "apk_arm64": f"Electrum-{version_android}-arm64-v8a-release.apk",
"apk_armeabi": f"Electrum-{APK_VERSION}-armeabi-v7a-release.apk", "apk_armeabi": f"Electrum-{version_android}-armeabi-v7a-release.apk",
"apk_x86_64": f"Electrum-{APK_VERSION}-x86_64-release.apk", "apk_x86_64": f"Electrum-{version_android}-x86_64-release.apk",
} }

2
contrib/android/buildozer_qml.spec
Unescape View File

@ -40,7 +40,7 @@ source.exclude_patterns = Makefile,setup*,
packages/frozenlist-*.dist-info/* packages/frozenlist-*.dist-info/*
# (str) Application versioning (method 1) # (str) Application versioning (method 1)
version.regex = APK_VERSION = '(.*)' version.regex = ELECTRUM_VERSION = '(.*)'
version.filename = %(source.dir)s/electrum/version.py version.filename = %(source.dir)s/electrum/version.py
# (str) Application versioning (method 2) # (str) Application versioning (method 2)

9
contrib/make_download
Unescape View File

@ -19,7 +19,6 @@ version_module = importlib.util.module_from_spec(version_spec)
version_spec.loader.exec_module(version_module) version_spec.loader.exec_module(version_module)
ELECTRUM_VERSION = version_module.ELECTRUM_VERSION ELECTRUM_VERSION = version_module.ELECTRUM_VERSION
APK_VERSION = version_module.APK_VERSION
print(f"version: {ELECTRUM_VERSION}", file=sys.stderr) print(f"version: {ELECTRUM_VERSION}", file=sys.stderr)
dirname = sys.argv[1] dirname = sys.argv[1]
@ -37,7 +36,7 @@ download_page_str = download_page_str.replace("##VERSION##", version)
download_page_str = download_page_str.replace("##VERSION_WIN##", version_win) download_page_str = download_page_str.replace("##VERSION_WIN##", version_win)
download_page_str = download_page_str.replace("##VERSION_MAC##", version_mac) download_page_str = download_page_str.replace("##VERSION_MAC##", version_mac)
download_page_str = download_page_str.replace("##VERSION_ANDROID##", version_android) download_page_str = download_page_str.replace("##VERSION_ANDROID##", version_android)
download_page_str = download_page_str.replace("##VERSION_APK##", APK_VERSION) download_page_str = download_page_str.replace("##VERSION_APK##", version_android)
# note: all dist files need to be listed here that we expect sigs for, # note: all dist files need to be listed here that we expect sigs for,
# even if they are not linked to from the website # even if they are not linked to from the website
@ -49,9 +48,9 @@ files = {
"win": f"electrum-{version_win}.exe", "win": f"electrum-{version_win}.exe",
"win_setup": f"electrum-{version_win}-setup.exe", "win_setup": f"electrum-{version_win}-setup.exe",
"win_portable": f"electrum-{version_win}-portable.exe", "win_portable": f"electrum-{version_win}-portable.exe",
"apk_arm64": f"Electrum-{APK_VERSION}-arm64-v8a-release.apk", "apk_arm64": f"Electrum-{version_android}-arm64-v8a-release.apk",
"apk_armeabi": f"Electrum-{APK_VERSION}-armeabi-v7a-release.apk", "apk_armeabi": f"Electrum-{version_android}-armeabi-v7a-release.apk",
"apk_x86_64": f"Electrum-{APK_VERSION}-x86_64-release.apk", "apk_x86_64": f"Electrum-{version_android}-x86_64-release.apk",
} }
# default signers # default signers

2
contrib/print_electrum_version.py
Unescape View File

@ -4,10 +4,8 @@
# #
# For example: # For example:
# $ VERSION=$("$CONTRIB"/print_electrum_version.py) # $ VERSION=$("$CONTRIB"/print_electrum_version.py)
# $ VERSION=$("$CONTRIB"/print_electrum_version.py APK_VERSION)
# instead of # instead of
# $ VERSION=$(python3 -c "import electrum; print(electrum.version.ELECTRUM_VERSION)") # $ VERSION=$(python3 -c "import electrum; print(electrum.version.ELECTRUM_VERSION)")
# $ VERSION=$(python3 -c "import electrum; print(electrum.version.APK_VERSION)")
import importlib.util import importlib.util
import os import os

12
contrib/release.sh
Unescape View File

@ -82,9 +82,7 @@ fi
VERSION=$("$CONTRIB"/print_electrum_version.py) VERSION=$("$CONTRIB"/print_electrum_version.py)
APK_VERSION=$("$CONTRIB"/print_electrum_version.py APK_VERSION)
info "VERSION: $VERSION" info "VERSION: $VERSION"
info "APK_VERSION: $APK_VERSION"
REV=$(git describe --tags) REV=$(git describe --tags)
info "REV: $REV" info "REV: $REV"
COMMIT=$(git rev-parse HEAD) COMMIT=$(git rev-parse HEAD)
@ -149,13 +147,13 @@ else
fi fi
# android # android
apk1="Electrum-$APK_VERSION-armeabi-v7a-release.apk" apk1="Electrum-$VERSION-armeabi-v7a-release.apk"
apk2="Electrum-$APK_VERSION-arm64-v8a-release.apk" apk2="Electrum-$VERSION-arm64-v8a-release.apk"
apk3="Electrum-$APK_VERSION-x86_64-release.apk" apk3="Electrum-$VERSION-x86_64-release.apk"
for arch in armeabi-v7a arm64-v8a x86_64 for arch in armeabi-v7a arm64-v8a x86_64
do do
apk="Electrum-$APK_VERSION-$arch-release.apk" apk="Electrum-$VERSION-$arch-release.apk"
apk_unsigned="Electrum-$APK_VERSION-$arch-release-unsigned.apk" apk_unsigned="Electrum-$VERSION-$arch-release-unsigned.apk"
if test -f "dist/$apk"; then if test -f "dist/$apk"; then
info "file exists: $apk" info "file exists: $apk"
else else

1
electrum/version.py
Unescape View File

@ -1,5 +1,4 @@
ELECTRUM_VERSION = '4.5.5' # version of the client package ELECTRUM_VERSION = '4.5.5' # version of the client package
APK_VERSION = '4.5.5.0' # read by buildozer.spec
PROTOCOL_VERSION = '1.4' # protocol version requested PROTOCOL_VERSION = '1.4' # protocol version requested

Write Preview
Loading…
Cancel
Save