diff --git a/.idea/revpicommander.iml b/.idea/revpicommander.iml index b3ece99..bcd0f63 100644 --- a/.idea/revpicommander.iml +++ b/.idea/revpicommander.iml @@ -10,6 +10,5 @@ \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in index 5527407..979d6ef 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,7 @@ recursive-include data * recursive-include src/revpicommander *.py *.qm recursive-include ui_dev * include LICENSE.txt +include make_installer_win.bat include Makefile include MANIFEST.in include README.md diff --git a/Makefile b/Makefile index 60e3278..6594815 100644 --- a/Makefile +++ b/Makefile @@ -72,15 +72,7 @@ installer_mac: all src/$(PACKAGE)/__main__.py installer_win: all - $(PYTHON) -m PyInstaller -n "RevPi Commander" \ - --add-data="src\\$(PACKAGE)\\locale;.\\locale" \ - --add-data="data\\$(PACKAGE).ico;." \ - --icon=data\\$(PACKAGE).ico \ - --noconfirm \ - --clean \ - --onedir \ - --windowed \ - src/$(PACKAGE)\__main__.py + make_installer_win.bat .PHONY: installer_mac installer_win diff --git a/make_installer_win.bat b/make_installer_win.bat new file mode 100644 index 0000000..1f2bcc3 --- /dev/null +++ b/make_installer_win.bat @@ -0,0 +1,18 @@ +@echo off +set PACKAGE=revpicommander + +rem python -m venv venv +rem venv\\Scripts\\activate.bat +rem pip install -r requirements.txt + +pyinstaller -n "RevPi Commander" ^ + --add-data="src\%PACKAGE%\locale;.\revpicommander\locale" ^ + --add-data="data\%PACKAGE%.ico;." ^ + --icon=data\\%PACKAGE%.ico ^ + --noconfirm ^ + --clean ^ + --onedir ^ + --windowed ^ + src\\%PACKAGE%\\__main__.py + +rem deactivate \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 893ef3b..85c2556 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,5 @@ Pyinstaller PyQt5>=5.14.1 revpimodio2>=2.5.6 zeroconf>=0.24.4 +setuptools>=65.6.3 +wheel \ No newline at end of file