Skip to content

[pull] master from atom:master #175

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

Merged
pull merged 2 commits into from
Nov 22, 2022
Merged

[pull] master from atom:master #175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b696d6
Use the new naming format for snapshots on macOS
sergiou87 Nov 22, 2022
1c3bd35
Merge pull request #25709 from atom/fix-snapshot-result-macos
sergiou87 Nov 22, 2022
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
12 changes: 11 additions & 1 deletion script/lib/generate-startup-snapshot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,20 @@ module.exports = function(packagedAppPath) {

const snapshotBinaries = ['v8_context_snapshot.bin', 'snapshot_blob.bin'];
for (let snapshotBinary of snapshotBinaries) {
const destinationPath = path.join(
let destinationPath = path.join(
startupBlobDestinationPath,
snapshotBinary
);
if (
process.platform === 'darwin' &&
snapshotBinary === 'v8_context_snapshot.bin'
) {
// TODO: check if we're building for arm64 and use the arm64 version of the binary
destinationPath = path.join(
startupBlobDestinationPath,
'v8_context_snapshot.x86_64.bin'
);
}
console.log(`Moving generated startup blob into "${destinationPath}"`);
try {
fs.unlinkSync(destinationPath);
Expand Down