github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 22:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

🎨

Browse Source 
Signed-off-by: Nathan Sobo <nathan@github.com>
This commit is contained in:
Antonio Scandurra
2016-07-28 20:17:07 +02:00
committed by Nathan Sobo
parent 510ef53398
commit 3a30f166d7
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
build/lib/package-application.js
View File

@@ -22,35 +22,38 @@ module.exports = function () {
'platform': process.platform,
'version': CONFIG.appMetadata.electronVersion
}, (err, packagedAppPaths) => {
if (err) {
console.error(err)
} else {
assert(packagedAppPaths.length === 1, 'Generated more than one electron application!')
const packagedAppPath = packagedAppPaths[0]
if (process.platform === 'darwin') {
const bundledResourcesPath = path.join(packagedAppPath, 'Atom.app', 'Contents', 'Resources')
const bundledShellCommandsPath = path.join(bundledResourcesPath, 'app')
console.log(`Copying shell commands to ${bundledShellCommandsPath}...`);
fs.copySync(
path.join(CONFIG.repositoryRootPath, 'apm', 'node_modules', 'atom-package-manager'),
path.join(bundledShellCommandsPath, 'apm'),
{filter: includePathInPackagedApp}
)
if (process.platform !== 'windows') {
// Existing symlinks on user systems point to an outdated path, so just symlink it to the real location of the apm binary.
// TODO: Change command installer to point to appropriate path and remove this fallback after a few releases.
fs.symlinkSync(path.join('..', '..', 'bin', 'apm'), path.join(bundledShellCommandsPath, 'apm', 'node_modules', '.bin', 'apm'))
fs.copySync(path.join(CONFIG.repositoryRootPath, 'atom.sh'), path.join(bundledShellCommandsPath, 'atom.sh'))
}
} else {
throw new Error('TODO: handle this case!')
}
if (err) throw new Error(err)
assert(packagedAppPaths.length === 1, 'Generated more than one electron application!')
console.log(`Application bundle(s) created on ${packagedAppPath}`)
const packagedAppPath = packagedAppPaths[0]
let bundledResourcesPath
if (process.platform === 'darwin') {
bundledResourcesPath = path.join(packagedAppPath, 'Atom.app', 'Contents', 'Resources')
} else {
throw new Error('TODO: handle this case!')
}
copyShellCommands(bundledResourcesPath)
console.log(`Application bundle(s) created on ${packagedAppPath}`)
})
}
function copyShellCommands (bundledResourcesPath) {
const bundledShellCommandsPath = path.join(bundledResourcesPath, 'app')
console.log(`Copying shell commands to ${bundledShellCommandsPath}...`);
fs.copySync(
path.join(CONFIG.repositoryRootPath, 'apm', 'node_modules', 'atom-package-manager'),
path.join(bundledShellCommandsPath, 'apm'),
{filter: includePathInPackagedApp}
)
if (process.platform !== 'win32') {
// Existing symlinks on user systems point to an outdated path, so just symlink it to the real location of the apm binary.
// TODO: Change command installer to point to appropriate path and remove this fallback after a few releases.
fs.symlinkSync(path.join('..', '..', 'bin', 'apm'), path.join(bundledShellCommandsPath, 'apm', 'node_modules', '.bin', 'apm'))
fs.copySync(path.join(CONFIG.repositoryRootPath, 'atom.sh'), path.join(bundledShellCommandsPath, 'atom.sh'))
}
}
function buildAsarUnpackGlobExpression () {
const unpack = [
'*.node',