diff options
Diffstat (limited to 'development/atom/use-system-electron.patch')
| -rw-r--r-- | development/atom/use-system-electron.patch | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/development/atom/use-system-electron.patch b/development/atom/use-system-electron.patch index cc97e04a65..eba8b5ed74 100644 --- a/development/atom/use-system-electron.patch +++ b/development/atom/use-system-electron.patch @@ -1,7 +1,7 @@ diff -Naur a/script/build b/script/build ---- a/script/build 2017-02-17 10:53:06.000000000 -0600 -+++ b/script/build 2017-02-22 23:35:29.241396450 -0600 -@@ -23,7 +23,6 @@ +--- a/script/build 2017-05-25 12:32:43.000000000 -0600 ++++ b/script/build 2017-06-03 14:39:33.504500031 -0600 +@@ -24,7 +24,6 @@ .wrap(yargs.terminalWidth()) .argv @@ -9,19 +9,28 @@ diff -Naur a/script/build b/script/build const cleanOutputDirectory = require('./lib/clean-output-directory') const codeSignOnMac = require('./lib/code-sign-on-mac') const compressArtifacts = require('./lib/compress-artifacts') -@@ -48,7 +47,6 @@ +@@ -36,7 +35,6 @@ + const generateAPIDocs = require('./lib/generate-api-docs') + const generateMetadata = require('./lib/generate-metadata') + const generateModuleCache = require('./lib/generate-module-cache') +-const generateStartupSnapshot = require('./lib/generate-startup-snapshot') + const installApplication = require('./lib/install-application') + const packageApplication = require('./lib/package-application') + const prebuildLessCache = require('./lib/prebuild-less-cache') +@@ -51,7 +49,6 @@ process.exit(1) }) -checkChromedriverVersion() cleanOutputDirectory() copyAssets() - transpileBabelPaths() -@@ -60,46 +58,3 @@ + transpilePackagesWithCustomTranspilerPaths() +@@ -64,47 +61,4 @@ generateMetadata() generateAPIDocs() dumpSymbols() - .then(packageApplication) +- .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath)) - .then(packagedAppPath => { - if (process.platform === 'darwin') { - if (argv.codeSign) { @@ -58,27 +67,30 @@ diff -Naur a/script/build b/script/build - console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray) - } - -- if (argv.install) { -- installApplication(packagedAppPath) +- if (argv.install != null) { +- installApplication(packagedAppPath, argv.install) - } else { - console.log('Skipping installation. Specify the --install option to install Atom'.gray) - } - }) ++ diff -Naur a/script/package.json b/script/package.json ---- a/script/package.json 2017-02-17 10:53:06.000000000 -0600 -+++ b/script/package.json 2017-02-22 23:36:47.888097996 -0600 -@@ -8,7 +8,6 @@ +--- a/script/package.json 2017-05-25 12:32:43.000000000 -0600 ++++ b/script/package.json 2017-06-03 14:39:33.505500053 -0600 +@@ -8,9 +8,6 @@ "colors": "1.1.2", "csslint": "1.0.2", "donna": "1.0.13", - "electron-chromedriver": "~1.3", +- "electron-link": "0.0.22", +- "electron-mksnapshot": "~1.3", "electron-packager": "7.3.0", "electron-winstaller": "2.5.1", "fs-extra": "0.30.0", diff -Naur a/src/main-process/atom-application.coffee b/src/main-process/atom-application.coffee ---- a/src/main-process/atom-application.coffee 2017-02-17 10:53:06.000000000 -0600 -+++ b/src/main-process/atom-application.coffee 2017-02-22 23:33:19.542590377 -0600 -@@ -797,7 +797,7 @@ +--- a/src/main-process/atom-application.coffee 2017-05-25 12:32:43.000000000 -0600 ++++ b/src/main-process/atom-application.coffee 2017-06-03 14:39:55.687979978 -0600 +@@ -821,7 +821,7 @@ @restart() restart: -> @@ -88,9 +100,9 @@ diff -Naur a/src/main-process/atom-application.coffee b/src/main-process/atom-ap args.push("--log-file=#{@logFile}") if @logFile? args.push("--socket-path=#{@socketPath}") if @socketPath? diff -Naur a/src/package-manager.coffee b/src/package-manager.coffee ---- a/src/package-manager.coffee 2017-02-17 10:53:06.000000000 -0600 -+++ b/src/package-manager.coffee 2017-02-25 02:23:32.459106058 -0600 -@@ -145,7 +145,7 @@ +--- a/src/package-manager.coffee 2017-05-25 12:32:43.000000000 -0600 ++++ b/src/package-manager.coffee 2017-06-03 14:39:33.505500053 -0600 +@@ -150,7 +150,7 @@ apmRoot = path.join(process.resourcesPath, 'app', 'apm') @apmPath = path.join(apmRoot, 'bin', commandName) unless fs.isFileSync(@apmPath) |