Skip to content

Merge build fix from master to maintenance-9.x #2499

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
sensei-hacker merged 5 commits into from
Dec 24, 2025
Merged

Merge build fix from master to maintenance-9.x #2499

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01d957e
Merge pull request #2479 from iNavFlight/maintenance-9.x
sensei-hacker Dec 24, 2025
0b8b5a6
Fix SITL binary path resolution for dev and packaged modes
sensei-hacker Dec 24, 2025
ac7cb28
Fix SITL remove wrong architecture
sensei-hacker Dec 24, 2025
47d2a46
Merge pull request #2497 from sensei-hacker/master
sensei-hacker Dec 24, 2025
d9d1431
Merge pull request #2498 from sensei-hacker/fix-sitl-path-resolution
sensei-hacker Dec 24, 2025
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
61 changes: 31 additions & 30 deletions forge.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,6 @@ export default {
extraResource: [
'resources/public/sitl'
],
afterCopy: [
(buildPath, electronVersion, platform, arch, callback) => {
// Remove SITL binaries for other platforms/architectures to reduce package size
const sitlPath = path.join(buildPath, 'resources', 'sitl');
if (platform === 'win32') {
fs.rmSync(path.join(sitlPath, 'linux'), { recursive: true, force: true });
fs.rmSync(path.join(sitlPath, 'macos'), { recursive: true, force: true });
} else if (platform === 'darwin') {
fs.rmSync(path.join(sitlPath, 'linux'), { recursive: true, force: true });
fs.rmSync(path.join(sitlPath, 'windows'), { recursive: true, force: true });
} else if (platform === 'linux') {
fs.rmSync(path.join(sitlPath, 'macos'), { recursive: true, force: true });
fs.rmSync(path.join(sitlPath, 'windows'), { recursive: true, force: true });
// Remove wrong architecture
if (arch === 'x64') {
fs.rmSync(path.join(sitlPath, 'linux', 'arm64'), { recursive: true, force: true });
} else if (arch === 'arm64') {
// Move arm64 binary to linux root and remove x64
const arm64Binary = path.join(sitlPath, 'linux', 'arm64', 'inav_SITL');
const destBinary = path.join(sitlPath, 'linux', 'inav_SITL');
if (fs.existsSync(arm64Binary)) {
fs.rmSync(destBinary, { force: true });
fs.renameSync(arm64Binary, destBinary);
fs.rmSync(path.join(sitlPath, 'linux', 'arm64'), { recursive: true, force: true });
}
}
}
callback();
}
],
},
rebuildConfig: {},
plugins: [
Expand Down Expand Up @@ -76,6 +46,37 @@ export default {
},
],
hooks: {
// Remove SITL binaries for other platforms/architectures to reduce package size
postPackage: async (forgeConfig, options) => {
for (const outputPath of options.outputPaths) {
const sitlPath = path.join(outputPath, 'resources', 'sitl');
if (!fs.existsSync(sitlPath)) continue;

if (options.platform === 'win32') {
fs.rmSync(path.join(sitlPath, 'linux'), { recursive: true, force: true });
fs.rmSync(path.join(sitlPath, 'macos'), { recursive: true, force: true });
} else if (options.platform === 'darwin') {
fs.rmSync(path.join(sitlPath, 'linux'), { recursive: true, force: true });
fs.rmSync(path.join(sitlPath, 'windows'), { recursive: true, force: true });
} else if (options.platform === 'linux') {
fs.rmSync(path.join(sitlPath, 'macos'), { recursive: true, force: true });
fs.rmSync(path.join(sitlPath, 'windows'), { recursive: true, force: true });
// Remove wrong architecture
if (options.arch === 'x64') {
fs.rmSync(path.join(sitlPath, 'linux', 'arm64'), { recursive: true, force: true });
} else if (options.arch === 'arm64') {
// Move arm64 binary to linux root and remove x64
const arm64Binary = path.join(sitlPath, 'linux', 'arm64', 'inav_SITL');
const destBinary = path.join(sitlPath, 'linux', 'inav_SITL');
if (fs.existsSync(arm64Binary)) {
fs.rmSync(destBinary, { force: true });
fs.renameSync(arm64Binary, destBinary);
fs.rmSync(path.join(sitlPath, 'linux', 'arm64'), { recursive: true, force: true });
}
}
}
}
},
// Uniform artifact file names
postMake: async (config, makeResults) => {
makeResults.forEach(result => {
Expand Down