Skip to content

Fix missing DLL in windows packaging#1807

Merged
BareosBot merged 4 commits intobareos:masterfrom
arogge:dev/arogge/master/fix-traymon-win
May 17, 2024
Merged

Fix missing DLL in windows packaging#1807
BareosBot merged 4 commits intobareos:masterfrom
arogge:dev/arogge/master/fix-traymon-win

Conversation

@arogge
Copy link
Member

@arogge arogge commented May 8, 2024

After switching to a newer crossbuild-image a DLL for bareos-tray-monitor.exe is missing from packaging. This PR adds that DLL and fixes some minor issues with the NSI script.

This will resolve #1801

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Required backport PRs have been created
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

@arogge arogge added this to the 24.0.0 milestone May 8, 2024
@arogge arogge changed the title Fixes #1801 add missing DLL to windows packaging Resolves #1801 add missing DLL to windows packaging May 8, 2024
@arogge arogge changed the title Resolves #1801 add missing DLL to windows packaging Fix missing DLL in windows packaging May 8, 2024
Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

I added some comments

@arogge
Copy link
Member Author

arogge commented May 14, 2024

I addresses your remarks, I hope all is good now.

Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

Looks good to me.

arogge added 3 commits May 17, 2024 11:08
replace /nonfatal file copies by conditional fatal ones
this makes sure don't accidentially skip files we wanted.
It also makes sure we don't like files that don't exist anymore.
remove unused label
@arogge arogge force-pushed the dev/arogge/master/fix-traymon-win branch from 113301c to dd6965c Compare May 17, 2024 09:08
@BareosBot BareosBot merged commit 92a44c7 into bareos:master May 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

fix broken tray monitor on windows

3 participants