Skip to content

Conversation

@TravisEz13
Copy link
Member

@TravisEz13 TravisEz13 commented Dec 7, 2017

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:
image

PR Checklist

Note: Please mark anything not applicable to this PR NA.

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
@TravisEz13
Copy link
Member Author

@thezim If you are familiar with this area, would you review this. Look at the issue for the main reason for the change.

}

# Create the distribution xml
$distributionXmlPath = Join-Path -Path $tempDir -ChildPath '/powershellDistribution.xml'
Copy link
Member

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'

# 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
Copy link
Member

Choose a reason for hiding this comment

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

Remove this line

@thezim
Copy link
Contributor

thezim commented Dec 8, 2017

@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?

@TravisEz13
Copy link
Member Author

@thezim Thanks for the review. The issue was caused by the previous PR. I have updated this PR. Thanks.

Copy link
Member

@daxian-dbw daxian-dbw left a 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}
Copy link
Member

@daxian-dbw daxian-dbw Dec 8, 2017

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=/"
}


Copy link
Member

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.

@TravisEz13 TravisEz13 merged commit 24298f7 into PowerShell:master Dec 8, 2017
@TravisEz13 TravisEz13 deleted the macOsPackaging branch December 8, 2017 18:55
TravisEz13 added a commit to TravisEz13/PowerShell that referenced this pull request Dec 8, 2017
@TravisEz13 TravisEz13 added this to the 6.0.0-RC.2 milestone Dec 9, 2017
TravisEz13 added a commit to TravisEz13/PowerShell that referenced this pull request Dec 9, 2017
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
TravisEz13 added a commit that referenced this pull request Dec 10, 2017
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
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.

4 participants