Merge pull request #96 from vesellov/master

prepare Android release
bitdust-io · Dec 29, 2024 · 89868da · 89868da
2 parents ddcd3c7 + bb371f7
commit 89868da
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -26,12 +26,10 @@
 
 REQUIREMENTS_TXT:=requirements.txt
 
-REQUIREMENTS_ANDROID:="kivy==2.1.0,kivymd==1.0.2,PIL,sdl,plyer,pyjnius,service_identity,pyparsing,appdirs,cffi,six,pycryptodome,attrs,hyperlink,idna,cryptography,automat,android,toml,incremental,twisted,python3"
-
 OS=$(shell lsb_release -si 2>/dev/null || uname)
 PIP:="venv/bin/pip"
 PYTHON="venv/bin/python"
-PYTHON_VERSION=python3.9
+PYTHON_VERSION=python3
 
 .PHONY: clean pyclean
 

diff --git a/installer/android/Makefile b/installer/android/Makefile
@@ -59,7 +59,7 @@ REQUIREMENTS_ANDROID:=$(shell python3 -c "import sys;l=open('src/requirements.tx
 build: .spec
 	@rm -rfv ./workspace/bin/*.aab
 	@rm -rfv ./workspace/bin/*.apk
-	@cd ./workspace/app/bitdust/ && find . -type f -name "*.py" -exec sed -i -e 's/_Debug = True/_Debug = False/g' {} +
+	@# cd ./workspace/app/bitdust/ && find . -type f -name "*.py" -exec sed -i -e 's/_Debug = True/_Debug = False/g' {} +
 	cd ./workspace/ && PYTHONIOENCODING=utf-8 VIRTUAL_ENV=1 ./venv/bin/buildozer -v android release 1>buildozer.log 2>buildozer.err
 	@cp -f -T -v ./workspace/bin/bitdust*arm64-v8a_armeabi-v7a_x86_64-release.aab ./workspace/bin/BitDustAndroid_unsigned.aab
 	@cd ./workspace/ && zipalign -v 4 ./bin/BitDustAndroid_unsigned.aab ./bin/BitDustAndroid.aab
@@ -107,7 +107,7 @@ debug: .spec
 
 build_arm64_v8a:
 	~/.gradle/wrapper/dists/gradle-8.0.2-all/14bt34ptcsg1ikmfn78tdh1keu/gradle-8.0.2/bin/gradle --stop || echo "gradle daemon was not stopped"
-	@cd ./workspace/app/bitdust/ && find . -type f -name "*.py" -exec sed -i -e 's/_Debug = True/_Debug = False/g' {} +
+	@# cd ./workspace/app/bitdust/ && find . -type f -name "*.py" -exec sed -i -e 's/_Debug = True/_Debug = False/g' {} +
 	cd ./workspace/ && PYTHONIOENCODING=utf-8 VIRTUAL_ENV=1 ./venv/bin/buildozer -v --profile arm64_v8a android release 1>buildozer.arm64_v8a.log 2>buildozer.arm64_v8a.err
 	@cp -v -T -f ./workspace/bin/bitdust*.apk ./workspace/bin/BitDustAndroid_unsigned.apk
 	@cd ./workspace/ && zipalign -v 4 ./bin/BitDustAndroid_unsigned.apk  ./bin/BitDustAndroid.apk
@@ -119,7 +119,7 @@ build_arm64_v8a:
 
 build_armeabi_v7a:
 	~/.gradle/wrapper/dists/gradle-8.0.2-all/14bt34ptcsg1ikmfn78tdh1keu/gradle-8.0.2/bin/gradle --stop || echo "gradle daemon was not stopped"
-	@cd ./workspace/app/bitdust/ && find . -type f -name "*.py" -exec sed -i -e 's/_Debug = True/_Debug = False/g' {} +
+	@# cd ./workspace/app/bitdust/ && find . -type f -name "*.py" -exec sed -i -e 's/_Debug = True/_Debug = False/g' {} +
 	cd ./workspace/ && PYTHONIOENCODING=utf-8 VIRTUAL_ENV=1 ./venv/bin/buildozer -v --profile armeabi_v7a android release 1>buildozer.armeabi_v7a.log 2>buildozer.armeabi_v7a.err
 	@cp -v -T -f ./workspace/bin/bitdust*.apk ./workspace/bin/BitDustAndroid_unsigned.apk
 	@cd ./workspace/ && zipalign -v 4 ./bin/BitDustAndroid_unsigned.apk  ./bin/BitDustAndroid.apk
@@ -131,7 +131,7 @@ build_armeabi_v7a:
 
 build_x86_64:
 	~/.gradle/wrapper/dists/gradle-8.0.2-all/14bt34ptcsg1ikmfn78tdh1keu/gradle-8.0.2/bin/gradle --stop || echo "gradle daemon was not stopped"
-	@cd ./workspace/app/bitdust/ && find . -type f -name "*.py" -exec sed -i -e 's/_Debug = True/_Debug = False/g' {} +
+	@# cd ./workspace/app/bitdust/ && find . -type f -name "*.py" -exec sed -i -e 's/_Debug = True/_Debug = False/g' {} +
 	cd ./workspace/ && PYTHONIOENCODING=utf-8 VIRTUAL_ENV=1 ./venv/bin/buildozer -v --profile x86_64 android release 1>buildozer.x86_64.log 2>buildozer.x86_64.err
 	@cp -v -T -f ./workspace/bin/bitdust*.apk ./workspace/bin/BitDustAndroid_unsigned.apk
 	@cd ./workspace/ && zipalign -v 4 ./bin/BitDustAndroid_unsigned.apk  ./bin/BitDustAndroid.apk

diff --git a/src/components/dialogs.py b/src/components/dialogs.py
@@ -13,7 +13,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------
 

diff --git a/src/components/main_win.py b/src/components/main_win.py
@@ -26,7 +26,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------
 

diff --git a/src/lib/web_sock_remote.py b/src/lib/web_sock_remote.py
@@ -25,7 +25,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 _DebugAPIResponses = _Debug
 
 #------------------------------------------------------------------------------

diff --git a/src/lib/web_socket/_app.py b/src/lib/web_socket/_app.py
@@ -38,7 +38,7 @@
 from . import _logging
 
 
-_Debug = True
+_Debug = False
 
 
 __all__ = ["WebSocketApp"]

diff --git a/src/main.py b/src/main.py
@@ -12,7 +12,7 @@
 
 #------------------------------------------------------------------------------ 
 
-_Debug = True
+_Debug = False
 _DebugProfilingEnabled = False
 _DebugKivyOutputEnabled = True
 

diff --git a/src/screens/controller.py b/src/screens/controller.py
@@ -19,7 +19,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 _DebugModelUpdates = False
 
 #------------------------------------------------------------------------------

diff --git a/src/screens/screen_device_add.py b/src/screens/screen_device_add.py
@@ -6,7 +6,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------
 

diff --git a/src/screens/screen_device_connect.py b/src/screens/screen_device_connect.py
@@ -14,7 +14,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------
 

diff --git a/src/screens/screen_device_disconnected.py b/src/screens/screen_device_disconnected.py
@@ -8,7 +8,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------
 

diff --git a/src/screens/screen_device_info.py b/src/screens/screen_device_info.py
@@ -9,7 +9,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------
 

diff --git a/src/screens/screen_new_identity.py b/src/screens/screen_new_identity.py
@@ -8,7 +8,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------
 

diff --git a/src/screens/screen_scan_qr.py b/src/screens/screen_scan_qr.py
@@ -15,7 +15,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------
 

diff --git a/src/screens/screen_settings.py b/src/screens/screen_settings.py
@@ -22,7 +22,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------
 

diff --git a/src/screens/screen_welcome.py b/src/screens/screen_welcome.py
@@ -11,7 +11,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 
 #------------------------------------------------------------------------------