Skip to content

Add colocate flag for game bundling on MacOS #159

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.

Sign up for GitHub

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

Draft
Jengamon wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add colocate flag for game bundling on MacOS #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/bundle/osx_bundle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {

for src in settings.resource_files() {
let src = src?;
let dest = resources_dir.join(common::resource_relpath(&src));
let dest_dir = if settings.colocate() {
bundle_directory.join("MacOS")
} else {
resources_dir.clone()
};
let dest = dest_dir.join(common::resource_relpath(&src));
common::copy_file(&src, &dest)
.chain_err(|| format!("Failed to copy resource file {src:?}"))?;
}
Expand Down
6 changes: 6 additions & 0 deletions src/bundle/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ struct BundleSettings {
icon: Option<Vec<String>>,
version: Option<String>,
resources: Option<Vec<String>>,
colocate: Option<bool>,
copyright: Option<String>,
category: Option<AppCategory>,
short_description: Option<String>,
Expand Down Expand Up @@ -362,6 +363,11 @@ impl Settings {
}
}

// TODO What does this flag do on non-MacOS OSes?
pub fn colocate(&self) -> bool {
self.bundle_settings.colocate.unwrap_or(false)
}

pub fn version_string(&self) -> &dyn Display {
match self.bundle_settings.version.as_ref() {
Some(v) => v,
Expand Down