Skip to content

Commit ae6fa3b

Browse files
committed
docs
1 parent c748c27 commit ae6fa3b

File tree

4 files changed

+43
-24
lines changed

4 files changed

+43
-24
lines changed

docs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
> [!warning|iconVisibility:hidden|labelVisibility:hidden] Supported build platforms are: `Debian Buster|Bullseye` - `Ubuntu Bionic|Focal|hirsute` - `Alpine 3.10 +` - native or via `docker` images
1+
> [!warning|iconVisibility:hidden|labelVisibility:hidden] Supported build platforms are: `Debian Buster|Bullseye` - `Ubuntu Bionic|Focal|Jammy` - `Alpine 3.10 +` - native or via `docker` images
22
33
> [!TIP|iconVisibility:hidden|labelVisibility:hidden] The preferred and recommended build platform is Alpine Linux and the recommended method is via docker.
44
5-
`qbittorrent-nox` is a build of qbittorrent that does not include the desktop components. Instead it is used via the Linux command line and comes with a built in Qt web interface. The web interface is accessed via a browser.
5+
`qbittorrent-nox` is a build of qBittorrent that does not include the desktop components. Instead it is used via the Linux command line and comes with a built in Qt web interface. The web interface is accessed via a browser.
66

7-
The build process has many independently complex dependencies involved. This build script helps lower the difficulty and makes building `qbittorrent-nox` statically as easy as it can be whilst also supporting multiple architectures, operating systems, optional optimisations and patching options to tune the build.
7+
The build process has many independently complex dependencies involved. This build script helps lower the difficulty and makes building `qbittorrent-nox` statically as easy as it can be whilst also supporting multiple architectures, operating systems, dependency variations, optional optimizations and patching options to tune the build.
88

99
These are the main dependencies we need to work with in order to build a fully functional and portable static binary for `qbittorrent-nox`.
1010

docs/build-help.md

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,21 @@ bash ~/qbittorrent-nox-static.sh -h
88

99
> [!warning|iconVisibility:hidden|labelVisibility:hidden] `export` the variables listed below when you use them in your local env.
1010
11-
The script has some `env` settings that can trigger certain behaviours.
12-
13-
| Build variable | Default if unset | Options | example usage |
14-
| -------------------- | ----------------------------------- | ---------------------------------- | -------------------------------------------------------- |
15-
| `libtorrent_version` | `2.0` | `1.2` `2.0` | `export libtorrent_version=2.0` |
16-
| `qbt_qt_version` | `6.3` | `5.12` `5.15` `6.3` `6.3.1` | `export qbt_qt_version=6.3` |
17-
| `qbt_build_tool` | `qmake` | `cmake` | `export qbt_build_tool=cmake` |
18-
| `qbt_cross_name` | empty = `unset` (default to OS gcc) | `x86_64` `aarch64` `armv7` `armhf` | `export qbt_cross_name=aarch64` |
19-
| `qbt_patches_url` | `userdocs/qbittorrent-nox-static` | `username/repo` | `export qbt_patches_url=userdocs/qbittorrent-nox-static` |
20-
| `qbt_workflow_files` | empty = `unset` | `yes` `no` | `export qbt_workflow_files=yes` |
11+
The script has some `env` settings that can trigger certain behaviour.
12+
13+
| Build variable | Default if unset | Options | example usage |
14+
| ------------------------------- | ----------------------------------- | ---------------------------------- | -------------------------------------------------------- |
15+
| `libtorrent_version` | `2.0` | `1.2` `2.0` | `export libtorrent_version=2.0` |
16+
| `qbt_qt_version` | `6.3` | `5.12` `5.15` `6.3` `6.3.1` | `export qbt_qt_version=6.3` |
17+
| `qbt_build_tool` | `qmake` | `cmake` | `export qbt_build_tool=cmake` |
18+
| `qbt_cross_name` | empty = `unset` (default to OS gcc) | `x86_64` `aarch64` `armv7` `armhf` | `export qbt_cross_name=aarch64` |
19+
| `qbt_patches_url` | `userdocs/qbittorrent-nox-static` | `username/repo` | `export qbt_patches_url=userdocs/qbittorrent-nox-static` |
20+
| `qbt_workflow_files` | empty = `unset` (defaults to no) | `yes` `no` | `export qbt_workflow_files=yes` |
21+
| `qbt_libtorrent_master_jamfile` | empty = `unset` (defaults to no) | `yes` `no` | `export qbt_libtorrent_master_jamfile=yes` |
22+
| `qbt_optimise_strip` | empty = `unset` (defaults to no) | `yes` `no` | `export qbt_optimise_strip=yes` |
23+
| `qbt_build_debug` | empty = `unset` (defaults to no) | `yes` `no` | `export qbt_build_debug=yes` |
24+
25+
> [!tip|iconVisibility:hidden|labelVisibility:hidden] If you see more variables in the script but they are not listed here they are Github Action specific configured by workflows.
2126
2227
> [!note|iconVisibility:hidden|labelVisibility:hidden] If you set `qbt_build_tool=cmake` and `qt_version=6.2` with the switch `-qm` you can build against QT6.
2328
@@ -75,11 +80,25 @@ All switches and flags have a supporting help option that will provide dynamic c
7580
env help - supported exportable evironment variables
7681
7782
export qbt_libtorrent_version="" - options 1.2 2.0
78-
export qbt_qt_version="" --------- options 5.15 6.3, 6.3 and so on
83+
export qbt_qt_version="" --------- options 5,5.15,6,6.2,6.3 and so on
7984
export qbt_build_tool="" --------- options qmake cmake
80-
export qbt_cross_name="" --------- options x86_64 aarch64 armv7 armhf
81-
export qbt_patches_url="" -------- options userdocs/qbittorrent-nox-static or use your full/shorthand github repo
82-
export qbt_workflow_files="" ----- options yes no - qbt-workflow-files repo - custom tags will override
85+
export qbt_cross_name="" --------- options aarch64 armv7 armhf
86+
export qbt_patches_url="" -------- options userdocs/qbittorrent-nox-static or usee your full/shorthand github repo
87+
export qbt_workflow_files="" ----- options yes no - use qbt-workflow-files repo for dependencies - custom tags will override
88+
export qbt_optimise_strip="" ----- options yes no - strip binaries to reduce file size - cannot be used with debug
89+
export qbt_build_debug="" -------- options yes no - create a full debug build for use with gdb - cannot be used with strip
90+
91+
Currrent settings
92+
93+
qbt_libtorrent_version="2.0"
94+
qbt_qt_version="5"
95+
qbt_build_tool="qmake"
96+
qbt_cross_name=""
97+
qbt_patches_url="userdocs/qbittorrent-nox-static"
98+
qbt_workflow_files="no"
99+
qbt_libtorrent_master_jamfile="no"
100+
qbt_optimise_strip="no"
101+
qbt_build_debug="no"
83102
```
84103

85104
For example, taking the `-h-bs` switch as an example, it will show different results based on the preceding switches provided:

docs/introduction.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ On supported platforms the `qbittorrent-nox-static.sh` will perform these three
99
Here is an example successful build profile:
1010

1111
```none
12-
qBittorrent 4.4.3.1 was built with the following libraries:
12+
qBittorrent 4.4.5 was built with the following libraries:
1313
14-
Qt: 6.3.1
15-
Libtorrent: 2.0.6
16-
Boost: 1.79.0
17-
OpenSSL: 3.0.5
14+
Qt: 6.4.0
15+
Libtorrent: 2.0.8
16+
Boost: 1.80.0
17+
OpenSSL: 3.0.7
1818
zlib: 1.2.12.zlib-ng
1919
```
2020

docs/script-installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ To execute the script use this command:
2525
bash ~/qbittorrent-nox-static.sh
2626
```
2727

28-
If you need to install the dependencies and you have sudo privileges then do this:
28+
If you need to install the dependencies and you have `sudo` privileges then do this:
2929

3030
> [!WARNING|iconVisibility:hidden|labelVisibility:hidden] You only need to do this once as root to install the dependencies.
3131
3232
```bash
3333
sudo bash ~/qbittorrent-nox-static.sh
3434
```
3535

36-
> [!TIP|iconVisibility:hidden|labelVisibility:hidden] using certain switches can add dependencies like `-c` for cmake. So you may need to escalate your privileges again.
36+
> [!TIP|iconVisibility:hidden|labelVisibility:hidden] Using certain switches can add dependencies like `-c` for cmake. So you may need to escalate your privileges again.
3737
3838
## Docker via SSH
3939

0 commit comments

Comments
 (0)