6FPS/tidal-dl
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🛠️ Release GUI fix Windows poetry. Makefile APP_NAME as command arg possible.

Browse Source
This commit is contained in:
Robert Honz
2023-12-20 13:30:32 +01:00
parent 587e046746
commit c62433870b
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/on-release-master.yml
+5 -5
View File
@@ -110,7 +110,7 @@ jobs:
CMD_BUILD: >
brew install create-dmg &&
source $VENV &&
poetry run make gui-macos &&
poetry run make gui-macos APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
cd dist &&
zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_MACOS_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store" &&
cd ..
@@ -129,7 +129,7 @@ jobs:
OS_ARCH: ${{needs.compute.outputs.ARCH_LINUX_X64}}
CMD_BUILD: >
source $VENV &&
poetry run make gui &&
poetry run make gui APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
cd dist &&
zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_LINUX_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
cd ..
@@ -137,9 +137,10 @@ jobs:
TARGET: "windows-2019"
OS_ARCH: ${{needs.compute.outputs.ARCH_WINDOWS_X64}}
CMD_BUILD: >
choco install zip make -y
choco install zip make -y &&
ls &&
source $VENV &&
C:\Users\runneradmin\.local\bin\poetry run make gui &&
poetry run make gui APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
cd dist &&
zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_WINDOWS_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.exe &&
cd ..
@@ -174,7 +175,6 @@ jobs:
name: ${{env.RELEASE_UPLOAD_URL}}
- name: Get Release File Name & Upload URL
id: get_release_info
shell: bash
run: |
VALUE=`cat ${{env.RELEASE_UPLOAD_URL}}/${{env.RELEASE_UPLOAD_URL}}.txt`
echo "upload_url=$VALUE" >> $GITHUB_OUTPUT
Makefile
+7 -7
View File
@@ -1,4 +1,4 @@
app_name = "TIDAL-Downloader-NG"
APP_NAME = "TIDAL-Downloader-NG"
app_path_dist = "dist"
path_asset = "tidal_dl_ng/ui"
@@ -61,7 +61,7 @@ help:
gui: ## Build GUI app with PyInstaller
@poetry run pyinstaller --noconfirm \
--windowed --onefile \
--name "$(app_name)" \
--name "$(APP_NAME)" \
--noupx \
--icon $(path_asset)/icon.png \
tidal_dl_ng/gui.py
@@ -70,17 +70,17 @@ gui: ## Build GUI app with PyInstaller
.PHONY: gui-macos
gui-macos: gui ## Package GUI in a *.dmg file
@poetry run mkdir -p $(app_path_dist)/dmg
@poetry run mv "$(app_path_dist)/$(app_name).app" $(app_path_dist)/dmg
@poetry run mv "$(app_path_dist)/$(APP_NAME).app" $(app_path_dist)/dmg
@poetry run create-dmg \
--volname "$(app_name)" \
--volname "$(APP_NAME)" \
--volicon "$(path_asset)/icon.icns" \
--window-pos 200 120 \
--window-size 800 600 \
--icon-size 100 \
--icon "$(app_name).app" 175 120 \
--hide-extension "$(app_name).app" \
--icon "$(APP_NAME).app" 175 120 \
--hide-extension "$(APP_NAME).app" \
--app-drop-link 425 120 \
"$(app_path_dist)/$(app_name).dmg" \
"$(app_path_dist)/$(APP_NAME).dmg" \
"$(app_path_dist)/dmg/"
.DEFAULT_GOAL := help
pyproject.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[project]
name = "tidal-dl-ng"
version = "0.4.29"
version = "0.4.30"
description = "TIDAL Medial Downloader Next Generation!"
authors = ["Robert Honz <cen.sored@gmail.com>"]
repository = "https://github.com/exislow/tidal-dl-ng"
@@ -13,7 +13,7 @@ packages = [
[tool.poetry]
name = "tidal-dl-ng"
authors = ["Robert Honz <cen.sored@gmail.com>"]
version = "0.4.29"
version = "0.4.30"
description = "TIDAL Medial Downloader Next Generation!"
repository = "https://github.com/exislow/tidal-dl-ng"
documentation = "https://exislow.github.io/tidal-dl-ng/"