Skip to content

Commit 21c41de

Browse files
author
arch
committed
improve build/install instructions
1 parent d0dd478 commit 21c41de

File tree

4 files changed

+31
-13
lines changed

4 files changed

+31
-13
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ A Python program that use Computer Vision to predict the funscript actions. Most
88

99
The application documentation is located in [`./docs/app/docs`](https://github.com/michael-mueller-git/Python-Funscript-Editor/blob/main/docs/app/docs)
1010

11+
## Contribute
12+
13+
If you want to contribute to the project and make it better, your help is very welcome. Currently i don’t have project specific contribution instructions. But as long as the code is clean and the function is useful for the project, I will be very willing to merge your pull requests.
14+
1115
## License
1216

1317
Distributed under the MIT License. See `LICENSE` for more information.

docs/app/docs/user-guide/build.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,29 @@ For Windows user i recommend to use the release version from [github release pag
44

55
## Windows
66

7-
Use `pyinstaller` in anaconda environment with all packages from `requirements.txt` set up. Then run:
7+
We use [pyinstaller](https://pypi.org/project/pyinstaller/) in [miniconda](https://docs.conda.io/en/latest/miniconda.html) environment to create an Windows executable.
8+
9+
First download and install [miniconda](https://docs.conda.io/en/latest/miniconda.html) (If you have already [anaconda](https://www.anaconda.com/) installed on your computer you can skip this step). Then run the following commands in the project root directory:
810

911
```
10-
pip install pyinstaller
12+
conda env create -f environment.yaml
13+
conda activate build
1114
build.bat
1215
```
1316

14-
This create the Windows Package in `./dist`
17+
This create the Windows executable in `./dist`.
1518

16-
## Pip-Package (Recommend for Linux)
19+
Finally you can remove the build environment with `conda env remove -n build`
1720

18-
Generate distribution package of this project. These are archives that can be uploaded to an local Package Index and can be installed by pip.
21+
## Ubuntu
1922

2023
```bash
21-
make docs package
24+
sudo apt update
25+
sudo add-apt-repository ppa:savoury1/ffmpeg4
26+
sudo apt install git python3 python3-pip python3-sphinx python3-opencv mkdocs python3-pyqt5 ffmpeg libmpv-dev
27+
git clone https://github.com/michael-mueller-git/Python-Funscript-Editor.git
28+
cd Python-Funscript-Editor
29+
pip install -r requirements.txt
30+
make all
31+
python3 funscript-editor.py
2232
```
23-
24-
This create the distribution package in `./dist`. Or simply type `make all` to build and install the package.

docs/code/generate_doc.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,17 @@ NAME="funscript_editor"
55
IGNORE=( )
66

77
if ! command -v sphinx-apidoc ; then
8-
pip3 install sphinx sphinx-rtd-theme
8+
if command -v pacman ; then
9+
# Arch based
10+
sudo pacman -Sy python3-sphinx python-sphinx_rtd_theme
11+
elif command -v apt ; then
12+
# Debian based
13+
sudo apt update
14+
sudo apt install python3-sphinx
15+
pip3 install sphinx-rtd-theme
16+
else
17+
pip3 install sphinx sphinx-rtd-theme
18+
fi
919
fi
1020

1121
WDIR=$PWD

requirements.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@ humanfriendly
55
kiwisolver
66
matplotlib
77
numpy
8-
opencv-contrib-python
98
Pillow
109
pynput
1110
pyparsing
12-
PyQt5
13-
PyQt5-Qt5
14-
PyQt5-sip
1511
pyreadline
1612
python-dateutil
1713
python-mpv

0 commit comments

Comments
 (0)