mirror of
https://github.com/Llewellynvdm/nativefier.git
synced 2024-12-23 10:38:55 +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
88 lines
3.2 KiB
JavaScript
88 lines
3.2 KiB
JavaScript
var path = require('path')
|
|
var fs = require('fs')
|
|
var child = require('child_process')
|
|
|
|
var plist = require('plist')
|
|
var mv = require('mv')
|
|
var ncp = require('ncp').ncp
|
|
var series = require('run-series')
|
|
var common = require('./common')
|
|
|
|
module.exports = {
|
|
createApp: function createApp (opts, templatePath, callback) {
|
|
var appRelativePath = path.join('Electron.app', 'Contents', 'Resources', 'app')
|
|
common.initializeApp(opts, templatePath, appRelativePath, function buildMacApp (err, tempPath) {
|
|
if (err) return callback(err)
|
|
|
|
var contentsPath = path.join(tempPath, 'Electron.app', 'Contents')
|
|
var helperPath = path.join(contentsPath, 'Frameworks', 'Electron Helper.app')
|
|
var appPlistFilename = path.join(contentsPath, 'Info.plist')
|
|
var helperPlistFilename = path.join(helperPath, 'Contents', 'Info.plist')
|
|
var appPlist = plist.parse(fs.readFileSync(appPlistFilename).toString())
|
|
var helperPlist = plist.parse(fs.readFileSync(helperPlistFilename).toString())
|
|
|
|
// Update plist files
|
|
var defaultBundleName = 'com.electron.' + opts.name.toLowerCase().replace(/ /g, '_')
|
|
var appVersion = opts['app-version']
|
|
|
|
appPlist.CFBundleDisplayName = opts.name
|
|
appPlist.CFBundleIdentifier = opts['app-bundle-id'] || defaultBundleName
|
|
appPlist.CFBundleName = opts.name
|
|
helperPlist.CFBundleIdentifier = opts['helper-bundle-id'] || defaultBundleName + '.helper'
|
|
helperPlist.CFBundleName = opts.name
|
|
|
|
if (appVersion) {
|
|
appPlist.CFBundleVersion = appVersion
|
|
}
|
|
|
|
if (opts.protocols) {
|
|
helperPlist.CFBundleURLTypes = appPlist.CFBundleURLTypes = opts.protocols.map(function (protocol) {
|
|
return {
|
|
CFBundleURLName: protocol.name,
|
|
CFBundleURLSchemes: [].concat(protocol.schemes)
|
|
}
|
|
})
|
|
}
|
|
|
|
fs.writeFileSync(appPlistFilename, plist.build(appPlist))
|
|
fs.writeFileSync(helperPlistFilename, plist.build(helperPlist))
|
|
|
|
var operations = []
|
|
|
|
if (opts.icon) {
|
|
operations.push(function (cb) {
|
|
common.normalizeExt(opts.icon, '.icns', function (err, icon) {
|
|
if (err) {
|
|
// Ignore error if icon doesn't exist, in case it's only available for other OS
|
|
cb(null)
|
|
} else {
|
|
ncp(icon, path.join(contentsPath, 'Resources', 'atom.icns'), cb)
|
|
}
|
|
})
|
|
})
|
|
}
|
|
|
|
// Move Helper binary, then Helper.app, then top-level .app
|
|
var finalAppPath = path.join(tempPath, opts.name + '.app')
|
|
operations.push(function (cb) {
|
|
var helperBinaryPath = path.join(helperPath, 'Contents', 'MacOS')
|
|
mv(path.join(helperBinaryPath, 'Electron Helper'), path.join(helperBinaryPath, opts.name + ' Helper'), cb)
|
|
}, function (cb) {
|
|
mv(helperPath, path.join(path.dirname(helperPath), opts.name + ' Helper.app'), cb)
|
|
}, function (cb) {
|
|
mv(path.dirname(contentsPath), finalAppPath, cb)
|
|
})
|
|
|
|
if (opts.sign) {
|
|
operations.push(function (cb) {
|
|
child.exec('codesign --deep --force --sign "' + opts.sign + '" ' + finalAppPath, cb)
|
|
})
|
|
}
|
|
|
|
series(operations, function () {
|
|
common.moveApp(opts, tempPath, callback)
|
|
})
|
|
})
|
|
}
|
|
}
|