Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(bundler): output file name consistency, closes #10465 #10577

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from

Conversation

lucasfernog
Copy link
Member

@lucasfernog lucasfernog commented Aug 12, 2024

I'm still not sure if we want to keep the release tag in the RPM file name, but I'll keep it for now.
Mainly wanted to raise awareness on this issue first.
I like the consistency of this, but I'm also not really a fan of using - instead of _ as separator.

Note that - is also the separator used on the language string currently appended to the MSI file name. I think I'll just change that to use _ instead.

@lucasfernog lucasfernog requested a review from a team as a code owner August 12, 2024 10:46
Copy link
Contributor

github-actions bot commented Aug 12, 2024

Package Changes Through a9af8cc

There are 7 changes which include tauri-build with prepatch, tauri-codegen with prerelease, tauri-utils with prerelease, tauri-cli with prerelease, @tauri-apps/cli with prerelease, tauri with prerelease, tauri-bundler with prerelease

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package current next
tauri-utils 2.0.0-rc.2 2.0.0-rc.3
tauri-bundler 2.0.1-rc.1 2.0.1-rc.2
tauri-runtime 2.0.0-rc.2 2.0.0-rc.3
tauri-runtime-wry 2.0.0-rc.2 2.0.0-rc.3
tauri-codegen 2.0.0-rc.2 2.0.0-rc.3
tauri-macros 2.0.0-rc.2 2.0.0-rc.3
tauri-plugin 2.0.0-rc.2 2.0.0-rc.3
tauri-build 2.0.0-rc.2 2.0.1-rc.0
tauri 2.0.0-rc.2 2.0.0-rc.3
@tauri-apps/cli 2.0.0-rc.3 2.0.0-rc.4
tauri-cli 2.0.0-rc.3 2.0.0-rc.4

Add another change file through the GitHub UI by following this link.


Read about change files or the docs at github.com/jbolda/covector

language,
);
let msi_name =
crate::bundle::bundle_name_with_suffix(settings, &language.replace('-', "_"), "msi");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should probably revert this change, - (hyphen) is the separator in language tags per the IETF standard https://en.wikipedia.org/wiki/IETF_language_tag#Syntax_of_language_tags

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well that's true, but with this change it's also the separator for the parts in the bundle file name.. I'd prefer using _ instead, but some people prefer -

Copy link
Member

@amrbashir amrbashir Aug 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there will always people wanting it the other way around but I don't see an issue with App-1.2.0-x64-en-US.exe, seems better than App-1.2.0-x64-en_US.exe

tooling/bundler/src/bundle/windows/msi/wix.rs Show resolved Hide resolved
tooling/bundler/src/bundle.rs Show resolved Hide resolved
tooling/bundler/src/bundle.rs Show resolved Hide resolved
@lucasfernog
Copy link
Member Author

let's at least hold on merging this one, must be communicated (ideally released as the last RC or perhaps even the first 2.0 stable release)

@FabianLars
Copy link
Member

This is missing explicit Arm + AppImage support - noticed because of #10619 (arm64 currently works, but i apparently didn't test arm 32bit which doesn't work).

Expanding this condition for arm->armhf should be enough i think https://github.com/tauri-apps/tauri/blob/dev/tooling/bundler/src/bundle/linux/templates/appimage#L14

@@ -30,27 +28,26 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {

let summary = settings.short_description().trim();

let package_base_name = format!("{product_name}-{version}-{release}.{arch}");
let package_name = format!("{package_base_name}.rpm");
let rpm_name = crate::bundle::bundle_name_with_suffix(settings, release, "dmg");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let rpm_name = crate::bundle::bundle_name_with_suffix(settings, release, "dmg");
let rpm_name = crate::bundle::bundle_name_with_suffix(settings, release, "rpm");

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants