Skip to content

Commit

Permalink
Add build files. Add BUILD No. to help and konstants. Update pyinstal…
Browse files Browse the repository at this point in the history
…ler script
  • Loading branch information
freQniK committed Aug 7, 2024
1 parent ffb3247 commit 03f0c67
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 6 deletions.
3 changes: 3 additions & 0 deletions pyinstaller.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ if [[ $# -lt 1 ]]; then
fi

new_version="$1"
build_version=`date +%s%3N`

sed -i "s/VERSION = \".*\"/VERSION = \"$new_version\"/" src/typedef/konstants.py
sed -i "s/BUILD = \".*\"/BUILD = \"$build_version\"/" src/typedef/konstants.py

# Linux
pyinstaller --onefile --collect-all bip_utils --collect-all mospy_wallet --collect-all sentinel_protobuf --collect-all sentinel_sdk --collect-all stripe --collect-all kivy_garden --add-data src/fonts:../fonts --add-data src/awoc/datum/:datum --add-data src/utils/fonts/:../utils/fonts --add-data src/utils/coinimg/:../utils/coinimg --add-data src/imgs/:../imgs --add-data src/kv/:../kv --add-data src/conf/config/:config --add-data src/bin/:../bin src/main/meile_gui.py
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ kivyoav==0.42
mapview==1.0.6
mnemonic==0.21
more-itertools==10.2.0
mospy-wallet==0.5.4
mospy-wallet==0.6.0
pexpect==4.8.0
Pillow==9.2.0
protobuf==4.23.4
Expand Down Expand Up @@ -82,7 +82,7 @@ safe-pysha3==1.0.4
save-thread-result==0.0.9
screeninfo==0.8.1
SecretStorage==3.3.3
sentinel-sdk==0.0.4
sentinel-sdk==0.0.5
sentinel_protobuf==0.3.3
six==1.16.0
sniffio==1.3.1
Expand Down
11 changes: 10 additions & 1 deletion src/kv/meile.kv
Original file line number Diff line number Diff line change
Expand Up @@ -1947,7 +1947,7 @@ WindowManager:
halign: "center"
MDLabel:
font_name: "Roboto-Bold"
text: root.GetMeileVersion()
text: root.GetMeileVersion("V")
font_size: "16sp"
size_hint_y: None
height: self.texture_size[1] + dp(20)
Expand All @@ -1956,6 +1956,15 @@ WindowManager:
theme_text_color: "Custom"
text_color: get_color_from_hex(MeileColors.MEILE)
halign: "center"
MDLabel:
font_name: "Roboto-Bold"
text: "build: " + root.GetMeileVersion(spec="B")
font_size: "13sp"
size_hint_y: None
height: self.texture_size[1] + dp(20)
theme_text_color: "Custom"
text_color: get_color_from_hex(MeileColors.MEILE)
halign: "center"
ScrollView:
effect_cls: "ScrollEffect"
scroll_type: ['bars']
Expand Down
3 changes: 2 additions & 1 deletion src/typedef/konstants.py
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,8 @@ class IBCTokens():
#mu_coins = ["tsent", "udvpn", "uscrt", "uosmo", "uatom", "udec"]
class TextStrings():
dash = "-"
VERSION = "2.0.0-beta3"
VERSION = "2.0.0-beta3.1"
BUILD = "1722988800718"
RootTag = "SENTINEL"
PassedHealthCheck = "Passed Sentinel Health Check"
FailedHealthCheck = "Failed Sentinel Health Check"
Expand Down
7 changes: 5 additions & 2 deletions src/ui/screens.py
Original file line number Diff line number Diff line change
Expand Up @@ -2002,8 +2002,11 @@ def switch_window(self, country):

class HelpScreen(Screen):

def GetMeileVersion(self):
return TextStrings.VERSION
def GetMeileVersion(self, spec: str = "V"):
if spec == "V":
return TextStrings.VERSION
else:
return str(TextStrings.BUILD)

def set_previous_screen(self):

Expand Down

0 comments on commit 03f0c67

Please sign in to comment.