Skip to content

Commit 52db04e

Browse files
authored
fix: fix Linux and macOS build scripts (#20)
* fix: fix Linux and macOS build scripts * docs: changelog
1 parent ab782c8 commit 52db04e

File tree

6 files changed

+26
-6
lines changed

6 files changed

+26
-6
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2222

2323
## [Unreleased]
2424

25+
### Fixed
26+
27+
- [#20](https://github.com/pytauri/create-pytauri-app/pull/20) - fix: fix Linux and macOS build scripts.
28+
29+
- Pass the `libpython` path correctly on Linux and macOS as `-L` arguments to `RUSTFLAGS`.
30+
- Temporarily disable `appimage` bundle target
31+
32+
Currently unable to build `appimage`, see <https://github.com/python-pillow/Pillow/issues/9198>.
33+
34+
- Change the default `identifier` to `com.username.{{ project_name }}`
35+
36+
Tauri no longer recommends identifiers ending with `.app`, see <https://github.com/tauri-apps/tauri/issues/12674>.
37+
2538
### Security
2639

2740
- [#19](https://github.com/pytauri/create-pytauri-app/pull/19) - chore(deps-dev): bump vite from 6.3.5 to 6.3.6 in the npm_and_yarn group across 1 directory.

copier.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ package_name:
1313
identifier:
1414
type: str
1515
help: Identifier
16-
default: "com.{{ project_name }}.app"
16+
default: "com.username.{{ project_name }}"
1717

1818
template:
1919
type: str

templates/{{ '.' }}/{{ project_name }}/scripts/linux/build.sh.jinja

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ set -e
55
cd "$(dirname "$0")/../.."
66

77
PROJECT_NAME="{{ project_name }}"
8+
PYLIB_DIR="$(realpath src-tauri/pyembed/python/lib)"
89

910
export PYTAURI_STANDALONE="1"
1011
export PYO3_PYTHON="$(realpath src-tauri/pyembed/python/bin/python3)"
1112
export RUSTFLAGS=" \
1213
-C link-arg=-Wl,-rpath,\$ORIGIN/../lib/$PROJECT_NAME/lib \
13-
-L \"$PYO3_PYTHON\""
14+
-L $PYLIB_DIR"
1415

1516
uv pip install \
1617
--exact \

templates/{{ '.' }}/{{ project_name }}/scripts/macos/build.sh.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export PYTAURI_STANDALONE="1"
1111
export PYO3_PYTHON="$(realpath src-tauri/pyembed/python/bin/python3)"
1212
export RUSTFLAGS=" \
1313
-C link-arg=-Wl,-rpath,@executable_path/../Resources/lib \
14-
-L \"$PYLIB_DIR\""
14+
-L $PYLIB_DIR"
1515

1616
uv pip install \
1717
--exact \

templates/{{ '.' }}/{{ project_name }}/src-tauri/tauri.bundle.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
{
22
"bundle": {
33
"active": true,
4-
"targets": "all",
4+
"targets": [
5+
"deb",
6+
"rpm",
7+
"msi",
8+
"nsis",
9+
"app",
10+
"dmg"
11+
],
512
"resources": {
613
"pyembed/python": "./"
714
}

templates/{{ '.' }}/{{ project_name }}/src-tauri/tauri.conf.json.jinja

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
}
2424
},
2525
"bundle": {
26-
"active": true,
27-
"targets": "all",
26+
"active": false,
2827
"icon": [
2928
"icons/32x32.png",
3029
"icons/128x128.png",

0 commit comments

Comments
 (0)