mirror of
https://github.com/Llewellynvdm/nativefier.git
synced 2024-11-11 07:41:04 +00:00
a157f716a5
This adds support for --all, --platform=all, and --arch=all. In order to accommodate outputting multiple directories for multiple platforms and architectures, this also implements a new directory structure under the output folder (distinguished by both platform and arch). This structure is applied even to OS X distributions, which formerly were output directly to an .app folder. This could be considered a backwards-incompatible change. One other backwards-incompatible change is the value that the packager function passes to the callback, which is now always an array of paths, rather than just a single path. The behavior of the icon option has also been modified to use its basename and apply .ico or .icns depending on platform, to make it usable with --all and --platform=all. This attempts to maximize backwards compatibility, by allowing a full filename to be specified, but replacing the filename's extension with what is appropriate for each target platform. Alternatively, the extension can now be omitted. In the process of implementing this, it became evident that some things were being done in 3 different places, and weren't always being done consistently, so I've deduplicated everything I could. This also includes a few other changes to improve stability for multi-target runs, and other fixes: * Avoid targeting darwin if the environment doesn't support symlinks, to avoid the process bailing out on Windows * Implement --overwrite centrally in index.js such that it explicitly skips if an output directory already exists, for consistency with all target platforms and to avoid any possible errors that would halt operation during one target of a multi-target run * Use ncp instead of mv to move to finalPath, which avoids flakiness I noticed when testing on Windows 8 especially with multi-target runs * Simplify temp directory logic by using a nested structure, so there is only one top-level directory to clean up * Reinstate fix from #55 which seems to have been clobbered by a later merge * linux.createApp now resolves to the final output directory; it was formerly resolving to the executable path * mac.createApp now replaces space with underscore in bundle IDs * Only the platform modules that are needed are loaded * The win32 module only loads rcedit if needed This also fixes a couple of missing updates to docs (readme/usage). This commit addresses the following issues: * Resolves #40 * Resolves #38 * Resolves #70 * Works around #71 * Resolves #84 by reinstating #55
170 lines
5.0 KiB
JavaScript
170 lines
5.0 KiB
JavaScript
var path = require('path')
|
|
var fs = require('fs')
|
|
var os = require('os')
|
|
|
|
var download = require('electron-download')
|
|
var extract = require('extract-zip')
|
|
var mkdirp = require('mkdirp')
|
|
var rimraf = require('rimraf')
|
|
var series = require('run-series')
|
|
var common = require('./common')
|
|
|
|
var supportedArchs = {
|
|
ia32: 1,
|
|
x64: 1
|
|
}
|
|
|
|
var supportedPlatforms = {
|
|
// Maps to module ID for each platform (lazy-required if used)
|
|
darwin: './mac',
|
|
linux: './linux',
|
|
win32: './win32'
|
|
}
|
|
|
|
var tempBase = path.join(os.tmpdir(), 'electron-packager')
|
|
|
|
function testSymlink (cb) {
|
|
var testPath = path.join(tempBase, 'symlink-test')
|
|
var testFile = path.join(testPath, 'test')
|
|
var testLink = path.join(testPath, 'testlink')
|
|
series([
|
|
function (cb) {
|
|
mkdirp(testPath, cb)
|
|
},
|
|
function (cb) {
|
|
fs.writeFile(testFile, '', cb)
|
|
},
|
|
function (cb) {
|
|
fs.symlink(testFile, testLink, cb)
|
|
}
|
|
], function (err) {
|
|
var result = !err
|
|
rimraf(testPath, function () {
|
|
cb(result) // ignore errors on cleanup
|
|
})
|
|
})
|
|
}
|
|
|
|
function validateList (list, supported, name) {
|
|
// Validates list of architectures or platforms.
|
|
// Returns a normalized array if successful, or an error message string otherwise.
|
|
|
|
if (!list) return 'Must specify ' + name
|
|
if (list === 'all') return Object.keys(supported)
|
|
|
|
if (!Array.isArray(list)) list = list.split(',')
|
|
for (var i = list.length; i--;) {
|
|
if (!supported[list[i]]) {
|
|
return 'Unsupported ' + name + ' ' + list[i] + '; must be one of: ' + Object.keys(supported).join(', ')
|
|
}
|
|
}
|
|
|
|
return list
|
|
}
|
|
|
|
function createSeries (opts, archs, platforms) {
|
|
var combinations = []
|
|
archs.forEach(function (arch) {
|
|
platforms.forEach(function (platform) {
|
|
// Electron does not have 32-bit releases for Mac OS X, so skip that combination
|
|
if (platform === 'darwin' && arch === 'ia32') return
|
|
combinations.push({
|
|
platform: platform,
|
|
arch: arch,
|
|
version: opts.version
|
|
})
|
|
})
|
|
})
|
|
|
|
return [
|
|
function (cb) {
|
|
rimraf(tempBase, cb)
|
|
}
|
|
].concat(combinations.map(function (combination) {
|
|
var arch = combination.arch
|
|
var platform = combination.platform
|
|
var version = combination.version
|
|
|
|
return function (callback) {
|
|
download(combination, function (err, zipPath) {
|
|
if (err) return callback(err)
|
|
|
|
var tmpDir = path.join(tempBase, platform + '-' + arch + '-template')
|
|
|
|
var operations = [
|
|
function (cb) {
|
|
mkdirp(tmpDir, cb)
|
|
},
|
|
function (cb) {
|
|
extract(zipPath, {dir: tmpDir}, cb)
|
|
}
|
|
]
|
|
|
|
function createApp (comboOpts) {
|
|
console.error('Packaging app for platform', platform + ' ' + arch, 'using electron v' + version)
|
|
series(operations, function () {
|
|
require(supportedPlatforms[platform]).createApp(comboOpts, tmpDir, callback)
|
|
})
|
|
}
|
|
|
|
function checkOverwrite () {
|
|
// Create delegated options object with specific platform and arch, for output directory naming
|
|
var comboOpts = Object.create(opts)
|
|
comboOpts.arch = arch
|
|
comboOpts.platform = platform
|
|
|
|
var finalPath = common.generateFinalPath(comboOpts)
|
|
fs.exists(finalPath, function (exists) {
|
|
if (exists) {
|
|
if (opts.overwrite) {
|
|
rimraf(finalPath, function () {
|
|
createApp(comboOpts)
|
|
})
|
|
} else {
|
|
console.error('Skipping ' + platform + ' ' + arch +
|
|
' (output dir already exists, use --overwrite to force)')
|
|
callback()
|
|
}
|
|
} else {
|
|
createApp(comboOpts)
|
|
}
|
|
})
|
|
}
|
|
|
|
if (combination.platform === 'darwin') {
|
|
testSymlink(function (result) {
|
|
if (result) return checkOverwrite()
|
|
|
|
console.error('Cannot create symlinks; skipping darwin platform')
|
|
callback()
|
|
})
|
|
} else {
|
|
checkOverwrite()
|
|
}
|
|
})
|
|
}
|
|
}))
|
|
}
|
|
|
|
module.exports = function packager (opts, cb) {
|
|
var archs = validateList(opts.all ? 'all' : opts.arch, supportedArchs, 'arch')
|
|
var platforms = validateList(opts.all ? 'all' : opts.platform, supportedPlatforms, 'platform')
|
|
if (!opts.version) return cb(new Error('Must specify version'))
|
|
if (!Array.isArray(archs)) return cb(new Error(archs))
|
|
if (!Array.isArray(platforms)) return cb(new Error(platforms))
|
|
|
|
// Ignore this and related modules by default
|
|
var defaultIgnores = ['/node_modules/electron-prebuilt($|/)', '/node_modules/electron-packager($|/)', '/\.git($|/)']
|
|
if (opts.ignore && !Array.isArray(opts.ignore)) opts.ignore = [opts.ignore]
|
|
opts.ignore = (opts.ignore) ? opts.ignore.concat(defaultIgnores) : defaultIgnores
|
|
|
|
series(createSeries(opts, archs, platforms), function (err, appPaths) {
|
|
if (err) return cb(err)
|
|
|
|
cb(null, appPaths.filter(function (appPath) {
|
|
// Remove falsy entries (e.g. skipped platforms)
|
|
return appPath
|
|
}))
|
|
})
|
|
}
|