Skip to content

Commit

Permalink
add more debug statements
Browse files Browse the repository at this point in the history
  • Loading branch information
amr-crabnebula committed Sep 21, 2023
1 parent 5c72170 commit 2994d1e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
3 changes: 3 additions & 0 deletions crates/packager/src/package/app/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,13 @@ pub(crate) fn package(ctx: &Context) -> crate::Result<Vec<PathBuf>> {
.macos()
.and_then(|macos| macos.signing_identity.as_ref())
{
log::debug!(action = "Codesigning"; "{}", app_bundle_path.display());
codesign::try_sign(&app_bundle_path, identity, config, true)?;

// notarization is required for distribution
match codesign::notarize_auth() {
Ok(auth) => {
log::debug!(action = "Notarizing"; "{}", app_bundle_path.display());
codesign::notarize(app_bundle_path.clone(), auth, config)?;
}
Err(e) => {
Expand Down
1 change: 1 addition & 0 deletions crates/packager/src/package/dmg/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ pub(crate) fn package(ctx: &Context) -> crate::Result<Vec<PathBuf>> {
.macos()
.and_then(|macos| macos.signing_identity.as_ref())
{
log::debug!(action = "Codesigning"; "{}", dmg_path.display());
codesign::try_sign(&dmg_path, identity, config, false)?;
}

Expand Down
9 changes: 7 additions & 2 deletions crates/packager/src/package/nsis/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,9 @@ fn build_nsis_app_installer(
{
let main_binary = config.main_binary()?;
let app_exe_source = config.binary_path(main_binary);
codesign::try_sign(&app_exe_source.with_extension("exe"), config)?;
let signing_path = app_exe_source.with_extension("exe");
log::debug!(action = "Codesigning"; "{}", signing_path.display());
codesign::try_sign(&signing_path, config)?;
}

#[cfg(not(target_os = "windows"))]
Expand Down Expand Up @@ -515,7 +517,10 @@ fn build_nsis_app_installer(
std::fs::rename(nsis_output_path, &installer_path)?;

#[cfg(target_os = "windows")]
codesign::try_sign(&installer_path, config)?;
{
log::debug!(action = "Codesigning"; "{}", installer_path.display());
codesign::try_sign(&installer_path, config)?;
}
#[cfg(not(target_os = "windows"))]
log::warn!("Code signing is currently only supported on Windows hosts, skipping signing the installer...");

Expand Down
6 changes: 4 additions & 2 deletions crates/packager/src/package/wix/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,9 @@ fn build_wix_app_installer(ctx: &Context, wix_path: &Path) -> crate::Result<Vec<

let main_binary = config.main_binary()?;
let app_exe_source = config.binary_path(main_binary);

codesign::try_sign(&app_exe_source.with_extension("exe"), config)?;
let signing_path = app_exe_source.with_extension("exe");
log::debug!(action = "Codesigning"; "{}", signing_path.display());
codesign::try_sign(&signing_path, config)?;

let intermediates_path = intermediates_path.join("wix").join(arch);
util::create_clean_dir(&intermediates_path)?;
Expand Down Expand Up @@ -706,6 +707,7 @@ fn build_wix_app_installer(ctx: &Context, wix_path: &Path) -> crate::Result<Vec<
&msi_output_path,
)?;
std::fs::rename(&msi_output_path, &msi_path)?;
log::debug!(action = "Codesigning"; "{}", msi_path.display());
codesign::try_sign(&msi_path, config)?;
output_paths.push(msi_path);
}
Expand Down

0 comments on commit 2994d1e

Please sign in to comment.