github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 07:19:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add Windows file.ico lost in move to new build

Browse Source
This commit is contained in:
Damien Guard
2016-09-08 21:16:55 -07:00
parent 604aac782c
commit 3eb55d7db0
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
script/lib/package-application.js
View File

@@ -73,11 +73,8 @@ function copyNonASARResources (packagedAppPath, bundledResourcesPath) {
} else if (process.platform === 'linux') { } else if (process.platform === 'linux') {
fs.copySync(path.join(CONFIG.repositoryRootPath, 'resources', 'app-icons', CONFIG.channel, 'png', '1024.png'), path.join(packagedAppPath, 'atom.png')) fs.copySync(path.join(CONFIG.repositoryRootPath, 'resources', 'app-icons', CONFIG.channel, 'png', '1024.png'), path.join(packagedAppPath, 'atom.png'))
} else if (process.platform === 'win32') { } else if (process.platform === 'win32') {
fs.copySync(path.join('resources', 'win', 'atom.cmd'), path.join(bundledResourcesPath, 'cli', 'atom.cmd')) [ 'atom.cmd', 'atom.sh', 'atom.js', 'apm.cmd', 'apm.sh', 'file.ico' ]
fs.copySync(path.join('resources', 'win', 'atom.sh'), path.join(bundledResourcesPath, 'cli', 'atom.sh')) .forEach(file => fs.copySync(path.join('resources', 'win', file), path.join(bundledResourcesPath, 'cli', file)))
fs.copySync(path.join('resources', 'win', 'atom.js'), path.join(bundledResourcesPath, 'cli', 'atom.js'))
fs.copySync(path.join('resources', 'win', 'apm.cmd'), path.join(bundledResourcesPath, 'cli', 'apm.cmd'))
fs.copySync(path.join('resources', 'win', 'apm.sh'), path.join(bundledResourcesPath, 'cli', 'apm.sh'))
} }
console.log(`Writing LICENSE.md to ${bundledResourcesPath}`) console.log(`Writing LICENSE.md to ${bundledResourcesPath}`)

5
src/atom-environment.coffee
View File

@@ -854,16 +854,21 @@ class AtomEnvironment extends Model
@blobStore.save() @blobStore.save()
saveState: (options) -> saveState: (options) ->
console.log('environment.saveState\n')
new Promise (resolve, reject) => new Promise (resolve, reject) =>
if @enablePersistence and @project if @enablePersistence and @project
state = @serialize(options) state = @serialize(options)
console.log('environment.saveState serialized\n')
savePromise = savePromise =
if storageKey = @getStateKey(@project?.getPaths()) if storageKey = @getStateKey(@project?.getPaths())
@stateStore.save(storageKey, state) @stateStore.save(storageKey, state)
console.log('environment.saveState saved\n')
else else
@applicationDelegate.setTemporaryWindowState(state) @applicationDelegate.setTemporaryWindowState(state)
console.log('environment.saveState caching\n')
savePromise.catch(reject).then(resolve) savePromise.catch(reject).then(resolve)
else else
console.log('environment.saveState resolving\n')
resolve() resolve()
loadState: -> loadState: ->

5
src/main-process/atom-application.coffee
View File

@@ -96,10 +96,13 @@ class AtomApplication
@launch(options) @launch(options)
destroy: -> destroy: ->
console.log('application-destroy\n')
windowsClosePromises = @windows.map (window) -> windowsClosePromises = @windows.map (window) ->
window.close() window.close()
window.closedPromise window.closedPromise
console.log('application-destroy promising\n')
Promise.all(windowsClosePromises).then(=> @disposable.dispose()) Promise.all(windowsClosePromises).then(=> @disposable.dispose())
console.log('application-destroy complete\n')
launch: (options) -> launch: (options) ->
if options.pathsToOpen?.length > 0 or options.urlsToOpen?.length > 0 or options.test if options.pathsToOpen?.length > 0 or options.urlsToOpen?.length > 0 or options.test
@@ -323,9 +326,11 @@ class AtomApplication
win.temporaryState = state win.temporaryState = state
@disposable.add ipcHelpers.on ipcMain, 'did-cancel-window-unload', => @disposable.add ipcHelpers.on ipcMain, 'did-cancel-window-unload', =>
console.log('did-cancel-window-unload\n')
@quitting = false @quitting = false
for window in @windows for window in @windows
window.didCancelWindowUnload() window.didCancelWindowUnload()
console.log('did-cancel-window-unload done\n')
clipboard = require '../safe-clipboard' clipboard = require '../safe-clipboard'
@disposable.add ipcHelpers.on ipcMain, 'write-text-to-selection-clipboard', (event, selectedText) -> @disposable.add ipcHelpers.on ipcMain, 'write-text-to-selection-clipboard', (event, selectedText) ->