-
Notifications
You must be signed in to change notification settings - Fork 8.1k
Packaging: make mac package require 10.12 or newer #5649
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
Conversation
add distribution xml template for mac package
This will cause the package not to install on before macOS 11.12 This adds a background image to the package
|
@thezim If you are familiar with this area, would you review this. Look at the issue for the main reason for the change. |
tools/packaging/packaging.psm1
Outdated
| } | ||
|
|
||
| # Create the distribution xml | ||
| $distributionXmlPath = Join-Path -Path $tempDir -ChildPath '/powershellDistribution.xml' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the / is not required in '/powershellDistribution.xml'
tools/packaging/packaging.psm1
Outdated
| # 2 - minimum os version | ||
| $PackagingStrings.OsxDistributionTemplate -f "PowerShell - $Version", $Version, $packageName, '10.12' | Out-File -Encoding ascii -FilePath $distributionXmlPath -Force | ||
|
|
||
| #$FpmPackage = Rename-Item -Path $FpmPackage.FullName -NewName $newPackagePath -PassThru -ErrorAction Stop |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove this line
|
@TravisEz13 The package does not contain the launcher when I build your branch. Not sure if this is product of #5625 or I'm missing something in the build. Can you please verify if the launcher is there? |
|
@thezim Thanks for the review. The issue was caused by the previous PR. I have updated this PR. Thanks. |
87803e2 to
31fe05a
Compare
daxian-dbw
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Left two non-blocking comments which can be addressed in separate PRs.
| Push-Location $tempDir | ||
| try | ||
| { | ||
| Start-NativeExecution -sb {productbuild --distribution $distributionXmlPath --resources $resourcesDir $newPackagePath} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Non-blocking: it's better to add a comment explaining that productbuild is a xcode command line tool which will be installed when homebrew is installed, so that people won't question about whether bootstrap script needs to be updated 😄
| $Arguments += "$AppsFolder=/" | ||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Non-blocking: remove an extra new line.
Fixes PowerShell#4290 Make mac package require 10.12 or newer. Required that the package is installed to a disk with macOS installed. The Apple example XML had a background image added as well, so I added a background image: https://user-images.githubusercontent.com/10873629/33738943-014c9d00-db50-11e7-9628-310ce6427438.png
Fixes #4290 Make mac package require 10.12 or newer. Required that the package is installed to a disk with macOS installed. The Apple example XML had a background image added as well, so I added a background image: https://user-images.githubusercontent.com/10873629/33738943-014c9d00-db50-11e7-9628-310ce6427438.png
PR Summary
Fixes #4290

Make mac package require 10.12 or newer.
Required that the package is installed to a disk with macOS installed.
The Apple example XML had a background image added as well, so I added a background image:
PR Checklist
Note: Please mark anything not applicable to this PR
NA.[feature]if the change is significant or affectes feature tests