Skip to content

Commit 47c1457

Browse files
userdocsuserdocs
committed
Update build-help.mdx
Update build-help.mdx docs Update qbittorrent-nox-static.sh
1 parent ad84711 commit 47c1457

File tree

4 files changed

+34
-25
lines changed

4 files changed

+34
-25
lines changed

‎docs/package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/starlight": "^0.28.3",
13+
"@astrojs/starlight": "^0.28.4",
1414
"astro": "^4.16.7",
1515
"gray-matter": "^4.0.3",
1616
"sharp": "^0.32.5",

‎docs/src/content/docs/build-help.mdx‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ description: Build Help
55

66
import { Advanced, Charts, Details, Modal, Steps, Tabs, TabItem, Card, CardGrid, LinkCard, Aside, Icon } from "/src/components/global.jsx"
77

8-
98
Once the script has successfully configured the platform you can execute the help switch to see how it works and what options you have available to you.
109

1110
```bash
@@ -20,26 +19,37 @@ The script has some `env` settings that can trigger certain behaviour.
2019
`export` the variables listed below when you use them in your local env.
2120
:::
2221

23-
You can export these before you run the script to set them. There is not specific benefit to using these over the flags and switches.
22+
You can export these before you run the script to set them. The can be used for docker builds or local builds and work in the `.qbt_env` file.
2423

25-
| Build variable | Default if unset | Options | example usage |
26-
| ------------------------------- | ----------------------------------- | ---------------------------------- | -------------------------------------------------------- |
27-
| `qbt_libtorrent_version` | `2.0` | `1.2` `2.0` | `export qbt_libtorrent_version=2.0` |
28-
| `qbt_qt_version` | `6.3` | `5.12` `5.15` `6.3` `6.3.1` | `export qbt_qt_version=6.3` |
29-
| `qbt_build_tool` | `qmake` | `cmake` | `export qbt_build_tool=cmake` |
30-
| `qbt_cross_name` | empty = `unset` (default to OS gcc) | `x86_64` `aarch64` `armv7` `armhf` | `export qbt_cross_name=aarch64` |
31-
| `qbt_patches_url` | `userdocs/qbittorrent-nox-static` | `username/repo` | `export qbt_patches_url=userdocs/qbittorrent-nox-static` |
32-
| `qbt_workflow_files` | empty = `unset` (defaults to no) | `yes` `no` | `export qbt_workflow_files=yes` |
33-
| `qbt_libtorrent_master_jamfile` | empty = `unset` (defaults to no) | `yes` `no` | `export qbt_libtorrent_master_jamfile=yes` |
34-
| `qbt_optimise_strip` | empty = `unset` (defaults to no) | `yes` `no` | `export qbt_optimise_strip=yes` |
35-
| `qbt_build_debug` | empty = `unset` (defaults to no) | `yes` `no` | `export qbt_build_debug=yes` |
24+
```bash
25+
| Build variable | Default if unset | Options | example usage |
26+
| ------------------------------- | ----------------------------------- | ---------------------------------- | --------------------------------------------------- |
27+
| `qbt_libtorrent_version` | `2.0` | `1.2` `2.0` | `qbt_libtorrent_version="2.0"` |
28+
| `qbt_qt_version` | `6` | `5.12` `5.15` `6.3` `6.3.1` | `qbt_qt_version="6"` |
29+
| `qbt_build_tool` | `cmake` | `cmake` `qmake` | `qbt_build_tool="cmake"` |
30+
| `qbt_cross_name` | empty = `unset` (default to OS gcc) | `x86_64` `aarch64` `armv7` `armhf` | `qbt_cross_name="default"` |
31+
| `qbt_patches_url` | `username/repo` | `username/repo` | `qbt_patches_url="userdocs/qbittorrent-nox-static"` |
32+
| `qbt_skip_icu` | `yes` | `yes` `no` | `qbt_skip_icu="yes"` |
33+
| `qbt_boost_tag` | latest github stable release or tag | Any valid git tag | `qbt_boost_tag="boost-1.86.0"` |
34+
| `qbt_libtorrent_tag` | latest github stable release or tag | Any valid git tag | `qbt_libtorrent_tag="v2.0.10"` |
35+
| `qbt_qt_tag` | latest github stable release or tag | Any valid git tag | `qbt_qt_tag="v6.8.0"` |
36+
| `qbt_qbittorrent_tag` | latest github stable release or tag | Any valid git tag | `qbt_qbittorrent_tag="release-5.0.1"` |
37+
| `qbt_libtorrent_master_jamfile` | `no` | `yes` `no` | `qbt_libtorrent_master_jamfile="no"` |
38+
| `qbt_workflow_files` | `no` | `yes` `no` | `qbt_workflow_files="no"` |
39+
| `qbt_workflow_artifacts` | `no` | `yes` `no` | `qbt_workflow_artifacts="no"` |
40+
| `qbt_cache_dir` | empty = `unset` | Path: relative or full | `qbt_cache_dir=""` |
41+
| `qbt_optimise_strip` | `yes` | `yes` `no` | `qbt_optimise_strip="yes"` |
42+
| `qbt_build_debug` | `no` | `yes` `no` | `qbt_build_debug="no"` |
43+
| `qbt_standard` | `20` | `14` `17` `20` `23` | `qbt_standard="20"` |
44+
| `qbt_static_ish` | `no` | `yes` `no` | `qbt_static_ish="no"` |
45+
```
3646
3747
:::tip
3848
If you see more variables in the script but they are not listed here they are Github Action specific configured by workflows.
3949
:::
4050
4151
:::note
42-
If you set `qbt_build_tool=cmake` and `qt_version=6.2` with the switch `-qm` you can build against QT6.
52+
If you set `qbt_build_tool=qmake` and `qbt_qt_version=5` you can build qBittorrent v4 or earleir using Qt5.
4353
:::
4454
4555
## Switches and flags summarised
@@ -124,13 +134,13 @@ The `--boot-strap-release` and `--boot-strap-multi-arch` options are specific to
124134
qbt_libtorrent_version="2.0"
125135
qbt_qt_version="6"
126136
qbt_build_tool="cmake"
127-
qbt_cross_name="x86_64"
137+
qbt_cross_name="default"
128138
qbt_patches_url="userdocs/qbittorrent-nox-static"
129139
qbt_skip_icu="yes"
130-
qbt_boost_tag="boost-1.84.0"
140+
qbt_boost_tag="boost-1.86.0"
131141
qbt_libtorrent_tag="v2.0.10"
132-
qbt_qt_tag="v6.6.2"
133-
qbt_qbittorrent_tag="release-4.6.3"
142+
qbt_qt_tag="v6.8.0"
143+
qbt_qbittorrent_tag="release-5.0.1"
134144
qbt_libtorrent_master_jamfile="no"
135145
qbt_workflow_files="no"
136146
qbt_workflow_artifacts="no"
@@ -247,7 +257,6 @@ The `-b` must be used in all commands provided to the script or default `qbt-bui
247257
The `-b` flag accepts both full `/opt` and relative `opt` paths.
248258
:::
249259
250-
```bash
251260
252261
```bash
253262
bash ~/qbittorrent-nox-static.sh all -b "/opt"

‎qbittorrent-nox-static.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2472,7 +2472,7 @@ _icu() {
24722472
#######################################################################################################################################################
24732473
# shellcheck disable=SC2317
24742474
_openssl() {
2475-
"${multi_openssl[@]}" --prefix="${qbt_install_dir}" --libdir="${lib_dir##*/}" --openssldir="/etc/ssl" threads no-shared no-dso no-comp CXXFLAGS="${CXXFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" |& _tee "${qbt_install_dir}/logs/${app_name}.log"
2475+
"${multi_openssl[@]}" --prefix="${qbt_install_dir}" --libdir="${lib_dir##*/}" --openssldir="/etc/ssl" threads no-shared no-dso no-comp no-docs CXXFLAGS="${CXXFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" |& _tee "${qbt_install_dir}/logs/${app_name}.log"
24762476
make -j"$(nproc)" |& _tee -a "${qbt_install_dir}/logs/${app_name}.log"
24772477
_post_command build
24782478
make install_sw |& _tee -a "${qbt_install_dir}/logs/${app_name}.log"

0 commit comments

Comments
 (0)