mektpoy
80e4da0e3d
`prepareDevelopmentProject()` resolved the build target from the host platform and architecture, so a Linux host threw `unsupported target linux-x64` while writing the runtime descriptor. Pass the target in instead: the launcher supplies the target it prepared, and isolated tests supply a fixed supported target. Extract `desktopTargetPlatform()` into desktop-build-paths.mjs so the target-to-payload mapping has one home, and use it for the qualification runner, which previously derived both its target directory and its descriptor from the host architecture. Correct the README limitation to name the module that now performs the architecture check.
108 lines
4.7 KiB
JavaScript
108 lines
4.7 KiB
JavaScript
/** Resolve build-owned Desktop paths without sharing mutable state across release targets. */
|
|
|
|
import { join, resolve } from 'node:path'
|
|
|
|
const APP_ROOT = resolve(import.meta.dirname, '..')
|
|
const BUILD_ROOT = join(APP_ROOT, '.desktop-build')
|
|
const SUPPORTED_TARGETS = new Set(['mac-arm64', 'mac-x64', 'win-x64'])
|
|
|
|
/**
|
|
* Resolve the fixed build target selected by a packaging environment.
|
|
* @param {NodeJS.ProcessEnv} env - Packaging environment.
|
|
* @param {NodeJS.Platform} hostPlatform - Build-host platform used when no target override exists.
|
|
* @param {string} hostArch - Build-host architecture used when no target override exists.
|
|
* @returns {'mac-arm64' | 'mac-x64' | 'win-x64'} Supported Desktop target name.
|
|
*/
|
|
export function resolveDesktopBuildTarget(
|
|
env = process.env,
|
|
hostPlatform = process.platform,
|
|
hostArch = process.arch,
|
|
) {
|
|
const platform = env.DSH_DESKTOP_TARGET_PLATFORM ?? env.npm_config_platform ?? hostPlatform
|
|
const arch = env.DSH_DESKTOP_TARGET_ARCH ?? env.npm_config_arch
|
|
?? (platform === 'win32' || platform === 'win' ? 'x64' : hostArch)
|
|
const os = platform === 'darwin' ? 'mac' : platform === 'win32' || platform === 'win' ? 'win' : platform
|
|
const target = `${os}-${arch}`
|
|
if (!SUPPORTED_TARGETS.has(target)) {
|
|
throw new Error(`desktop build paths: unsupported target ${target}`)
|
|
}
|
|
return /** @type {'mac-arm64' | 'mac-x64' | 'win-x64'} */ (target)
|
|
}
|
|
|
|
function assertSupportedTarget(target) {
|
|
if (!SUPPORTED_TARGETS.has(target)) {
|
|
throw new Error(`desktop build paths: unsupported target ${String(target)}`)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Return the mutable preparation and artifact directories owned by one release target.
|
|
* @param {'mac-arm64' | 'mac-x64' | 'win-x64'} target - Supported Desktop target name.
|
|
* @returns {{ root: string, artifacts: string, unsignedArtifacts: string, runtime: string, packageSet: string, dsh: string, dshPnpm: string, electron: string, packedDsh: string, packedVendor: string, packedLandlock: string, downloads: string }} Target paths plus the shared immutable download cache.
|
|
*/
|
|
export function desktopTargetBuildPaths(target) {
|
|
assertSupportedTarget(target)
|
|
const root = join(BUILD_ROOT, 'targets', target)
|
|
const packed = join(root, 'packed')
|
|
return {
|
|
root,
|
|
artifacts: join(root, 'artifacts'),
|
|
unsignedArtifacts: join(root, 'unsigned-artifacts'),
|
|
runtime: join(root, 'runtime'),
|
|
packageSet: join(root, 'package-set'),
|
|
dsh: join(root, 'dsh'),
|
|
dshPnpm: join(root, 'dsh-pnpm'),
|
|
electron: join(root, 'electron'),
|
|
packedDsh: join(packed, 'dsh'),
|
|
packedVendor: join(packed, 'vendor'),
|
|
packedLandlock: join(packed, 'landlock'),
|
|
downloads: join(BUILD_ROOT, 'downloads'),
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Return the platform and architecture of the payload one release target prepares.
|
|
* Windows is prepared as x64 only, so this differs from the build host on an arm64 Windows machine.
|
|
* @param {'mac-arm64' | 'mac-x64' | 'win-x64'} target - Supported Desktop target name.
|
|
* @returns {{ platform: 'darwin' | 'win32', arch: 'arm64' | 'x64' }} Platform and architecture of the prepared payload.
|
|
*/
|
|
export function desktopTargetPlatform(target) {
|
|
assertSupportedTarget(target)
|
|
return {
|
|
platform: /** @type {'darwin' | 'win32'} */ (target === 'win-x64' ? 'win32' : 'darwin'),
|
|
arch: /** @type {'arm64' | 'x64'} */ (target === 'mac-arm64' ? 'arm64' : 'x64'),
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Resolve the paths owned by the target selected in a packaging environment.
|
|
* @param {NodeJS.ProcessEnv} env - Packaging environment.
|
|
* @param {NodeJS.Platform} hostPlatform - Build-host platform used when no target override exists.
|
|
* @param {string} hostArch - Build-host architecture used when no target override exists.
|
|
* @returns {ReturnType<typeof desktopTargetBuildPaths>} Selected target paths.
|
|
*/
|
|
export function resolveDesktopTargetBuildPaths(
|
|
env = process.env,
|
|
hostPlatform = process.platform,
|
|
hostArch = process.arch,
|
|
) {
|
|
return desktopTargetBuildPaths(resolveDesktopBuildTarget(env, hostPlatform, hostArch))
|
|
}
|
|
|
|
/**
|
|
* Resolve the primary-runtime directory an unpackaged development launch uses.
|
|
* The build target fixes Windows to x64, so the shell cannot derive this directory from
|
|
* the architecture of the process that launched it.
|
|
* @param {NodeJS.ProcessEnv} env - Packaging environment.
|
|
* @param {NodeJS.Platform} hostPlatform - Build-host platform used when no target override exists.
|
|
* @param {string} hostArch - Build-host architecture used when no target override exists.
|
|
* @returns {string} Primary-runtime directory prepared for the selected target.
|
|
*/
|
|
export function developmentRuntimeDirectory(
|
|
env = process.env,
|
|
hostPlatform = process.platform,
|
|
hostArch = process.arch,
|
|
) {
|
|
return join(resolveDesktopTargetBuildPaths(env, hostPlatform, hostArch).runtime, 'primary-runtime')
|
|
}
|