[arch-commits] Commit in atom/trunk (10 files)
Nicola Squartini
tensor5 at archlinux.org
Sat Oct 22 15:29:27 UTC 2016
Date: Saturday, October 22, 2016 @ 15:29:26
Author: tensor5
Revision: 192976
upgpkg: atom 1.11.2-1
Modified:
atom/trunk/PKGBUILD
atom/trunk/beforeunload.patch
atom/trunk/fix-atom-sh.patch
atom/trunk/fix-ime-events-handler.patch
atom/trunk/fix-license-path.patch
atom/trunk/run-as-node.patch
atom/trunk/use-system-apm.patch
atom/trunk/use-system-electron.patch
Deleted:
atom/trunk/fix-marker-index.patch
atom/trunk/tree-view.patch
------------------------------+
PKGBUILD | 75 +++++++---------------------
beforeunload.patch | 2
fix-atom-sh.patch | 6 +-
fix-ime-events-handler.patch | 6 +-
fix-license-path.patch | 6 +-
fix-marker-index.patch | 37 --------------
run-as-node.patch | 18 +++---
tree-view.patch | 11 ----
use-system-apm.patch | 13 ----
use-system-electron.patch | 107 +++++++++++++++++++++++++++--------------
10 files changed, 112 insertions(+), 169 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-22 14:16:33 UTC (rev 192975)
+++ PKGBUILD 2016-10-22 15:29:26 UTC (rev 192976)
@@ -2,8 +2,8 @@
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
pkgname=atom
-pkgver=1.10.2
-pkgrel=4
+pkgver=1.11.2
+pkgrel=1
pkgdesc='A hackable text editor for the 21st Century'
arch=('i686' 'x86_64')
url='https://github.com/atom/atom'
@@ -12,6 +12,7 @@
'electron')
makedepends=('git' 'npm')
optdepends=('ctags: symbol indexing support')
+options=(!emptydirs)
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
'autocomplete-plus.patch'
'beforeunload.patch'
@@ -19,29 +20,25 @@
'fix-atom-sh.patch'
'fix-ime-events-handler.patch'
'fix-license-path.patch'
- 'fix-marker-index.patch'
'fix-oniguruma.patch'
'fix-pane-resize-handle.patch'
'run-as-node.patch'
'symbols-view-use-system-ctags.patch'
- 'tree-view.patch'
'use-system-apm.patch'
'use-system-electron.patch')
-sha256sums=('de47aa7d80b3e31f1c42823fec6e98a9473021c022970a8548cb36c498a7e6f8'
+sha256sums=('b7c09d03d950b0a6aca82225f072d9005d5681887e3a7c466b0504bf64d7c5cd'
'58198d214edc434580c5764f749e26fb686d77c3c983d01f247f48aec84eb1a4'
- 'e92e23bbf839bec6611b2ac76c1f5bba35b476983b0faa9b310288e2956247a2'
+ '9c419697ed1ce272a864f1a89c91d4a2e314f88ba1dc6f1836468db6572f95b6'
'6fca91b3e80248a96fc4b6b0228602d4dd68ef851cb059a97a7379e72e53b432'
- 'd3eb239f53feb3181fb4d57d2db391d7b31ce2188c5bd5b79d9ed3133351cd90'
- '51e8f64206cdc96bddd934ffbf0a3b3509617deb9c9aad0ccb21df4b5b72dfee'
- 'a606d1efbea1f68a0a9c250b1d7023315a5392fa23f220600304c7308be7ebbb'
- '2569702bee0508ee38a181f28bc99d6844725de206362a010705d84da09735c3'
+ 'b0c94877962e98818b8c14865c35ac0d0e088838e24670264069b7417ce1b6ab'
+ '25ccca2a773f6bf449691eac10fc4e78f5c2d264092c9f792177f6bd7ea32cce'
+ '883b0be8b68cda5d1004e99e8c1622ca633cf3eaf5c4aad7cc25f8dcb1235350'
'c0ae6c64802bc20219bc9142bd6e62e65853044b4a678d3f7ec72dcb61d22274'
'41aaa35b638e29d28b5d92077b7b242725046cc11d4c51d3eca589eaed977ec5'
- '991626ab07c90643e14039a1367769761262ddbc108a66193c08fe146b0222e9'
+ 'b17d546406362572d94b5aee6cc66d9a55fd3967fc256d54f5070cc6ff415554'
'a5a2b1fefa29799b3225c4aa3fe0e5b057b2b320f98ad7bc28d3596923e52b41'
- '109af01ceae45615994f2ac08292c44db339bf7ef89369b077e04fcfc35aa3dd'
- '0c9a815a3e6f13134cd648af67e1de3b9c24297b731d5815967a08256ec54f58'
- '1ee2fac6dd1f1ffb82b312a716fc96d8a838a16a727894ab3240979a5773fb0d')
+ '8ad15829dd52df15eb2a963f96b5f1869950c6e90ed8dfeac2a3202d8389d4a2'
+ 'c246a7ee41a2b0f9334b6130abf58587fc70a85f5a24922e2e4083c213e6468a')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -51,9 +48,6 @@
patch -Np1 -i "${srcdir}"/use-system-apm.patch
patch -Np1 -i "${srcdir}"/fix-license-path.patch
- # apm with system (updated) nodejs cannot 'require' modules inside asar
- sed -e "s/, 'generate-asar'//" -i build/Gruntfile.coffee
-
# Fix for Electron 1.2.0
patch -Np1 -i "${srcdir}"/beforeunload.patch
patch -Np1 -i "${srcdir}"/run-as-node.patch
@@ -84,47 +78,17 @@
cd node_modules/autocomplete-plus
patch -Np1 -i "${srcdir}"/autocomplete-plus.patch
cd ../..
- cd node_modules/tree-view
- patch -Np1 -i "${srcdir}"/tree-view.patch
- cd ../..
# Fix for Electron 1.3
_node_gyp="node-gyp rebuild --target=$(</usr/lib/electron/version) --dist-url=https://atom.io/download/atom-shell"
- cd node_modules/marker-index
- patch -Np1 -i "${srcdir}"/fix-marker-index.patch
- ${_node_gyp}
- cd ../oniguruma
+ cd node_modules/oniguruma
patch -Np1 -i "${srcdir}"/fix-oniguruma.patch
${_node_gyp}
cd ../../
- _packagesToDedupe=('abbrev'
- 'amdefine'
- 'atom-space-pen-views'
- 'cheerio'
- 'domelementtype'
- 'fs-plus'
- 'grim'
- 'highlights'
- 'humanize-plus'
- 'iconv-lite'
- 'inherits'
- 'loophole'
- 'oniguruma'
- 'q'
- 'request'
- 'rimraf'
- 'roaster'
- 'season'
- 'sigmund'
- 'semver'
- 'through'
- 'temp')
- apm dedupe ${_packagesToDedupe[@]}
- cd build
+ cd script
npm install
- cd ..
- script/grunt --channel=stable
+ ./build
}
package() {
@@ -131,8 +95,7 @@
cd "${srcdir}/${pkgname}-${pkgver}"
install -d -m 755 "${pkgdir}"/usr/lib
- cp -r out/Atom/resources/app "${pkgdir}"/usr/lib
- mv "${pkgdir}"/usr/lib/app "${pkgdir}"/usr/lib/atom
+ cp -r out/app "${pkgdir}"/usr/lib/atom
install -d -m 755 "${pkgdir}/usr/share/applications"
sed -e "s|<%= appName %>|Atom|" \
@@ -148,15 +111,17 @@
ln -sf ../../../share/icons/hicolor/1024x1024/apps/atom.png \
"${pkgdir}"/usr/lib/atom/resources/atom.png
- install -D -m 755 out/Atom/resources/new-app/atom.sh "${pkgdir}/usr/bin/atom"
+ install -D -m 755 atom.sh "${pkgdir}/usr/bin/atom"
- install -D -m 644 out/Atom/resources/LICENSE.md \
- "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
+ install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ node -e "require('./script/lib/get-license-text')().then((licenseText) => require('fs').writeFileSync('${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md', licenseText))"
# Remove useless stuff
+ rm "${pkgdir}"/usr/lib/atom/node_modules/.bin/pegjs
find "${pkgdir}"/usr/lib/atom/node_modules \
-name "*.a" -exec rm '{}' \; \
-or -name "*.bat" -exec rm '{}' \; \
+ -or -name "*.node" -exec chmod a-x '{}' \; \
-or -name "benchmark" -prune -exec rm -r '{}' \; \
-or -name "doc" -prune -exec rm -r '{}' \; \
-or -name "html" -prune -exec rm -r '{}' \; \
Modified: beforeunload.patch
===================================================================
--- beforeunload.patch 2016-10-22 14:16:33 UTC (rev 192975)
+++ beforeunload.patch 2016-10-22 15:29:26 UTC (rev 192976)
@@ -1,6 +1,6 @@
--- a/src/window-event-handler.coffee
+++ b/src/window-event-handler.coffee
-@@ -145,9 +145,8 @@
+@@ -161,9 +161,8 @@
@atomEnvironment.storeWindowDimensions()
if confirmed
@atomEnvironment.unloadEditorWindow()
Modified: fix-atom-sh.patch
===================================================================
--- fix-atom-sh.patch 2016-10-22 14:16:33 UTC (rev 192975)
+++ fix-atom-sh.patch 2016-10-22 15:29:26 UTC (rev 192976)
@@ -21,7 +21,7 @@
while getopts ":wtfvh-:" opt; do
case "$opt" in
-)
-@@ -52,66 +37,22 @@
+@@ -52,68 +37,22 @@
export ELECTRON_ENABLE_LOGGING=1
fi
@@ -28,8 +28,10 @@
-if [ $OS == 'Mac' ]; then
- if [ -n "$BETA_VERSION" ]; then
- ATOM_APP_NAME="Atom Beta.app"
+- ATOM_EXECUTABLE_NAME="Atom Beta"
- else
- ATOM_APP_NAME="Atom.app"
+- ATOM_EXECUTABLE_NAME="Atom"
- fi
+ATOM_PATH="electron --app=/usr/lib/atom"
@@ -54,7 +56,7 @@
+mkdir -p "$ATOM_HOME"
- if [ $EXPECT_OUTPUT ]; then
-- "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/Atom" --executed-from="$(pwd)" --pid=$$ "$@"
+- "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
- exit $?
- else
- open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
Modified: fix-ime-events-handler.patch
===================================================================
--- fix-ime-events-handler.patch 2016-10-22 14:16:33 UTC (rev 192975)
+++ fix-ime-events-handler.patch 2016-10-22 15:29:26 UTC (rev 192976)
@@ -1,6 +1,6 @@
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
-@@ -119,6 +119,7 @@ class TextEditorComponent
+@@ -111,6 +111,7 @@ class TextEditorComponent
@updateSync()
@checkForVisibilityChange()
@initialized = true
@@ -8,7 +8,7 @@
destroy: ->
@mounted = false
-@@ -309,19 +310,20 @@ class TextEditorComponent
+@@ -301,19 +302,20 @@ class TextEditorComponent
# User escape to cancel
# 4. compositionend fired
# OR User chooses a completion
@@ -34,7 +34,7 @@
event.target.value = ''
# Listen for selection changes and store the currently selected text
-@@ -373,6 +375,10 @@ class TextEditorComponent
+@@ -353,6 +355,10 @@ class TextEditorComponent
onTextInput: (event) =>
event.stopPropagation()
Modified: fix-license-path.patch
===================================================================
--- fix-license-path.patch 2016-10-22 14:16:33 UTC (rev 192975)
+++ fix-license-path.patch 2016-10-22 15:29:26 UTC (rev 192976)
@@ -1,6 +1,6 @@
--- a/src/main-process/atom-application.coffee
+++ b/src/main-process/atom-application.coffee
-@@ -213,7 +213,7 @@
+@@ -231,7 +231,7 @@
@openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap')
@openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets')
@openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet')
@@ -7,11 +7,11 @@
- @openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
+ @openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md')
- app.on 'before-quit', =>
+ @disposable.add ipcHelpers.on app, 'before-quit', =>
@quitting = true
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
-@@ -459,7 +459,7 @@
+@@ -461,7 +461,7 @@
# Open Atom's license in the active pane.
openLicense: ->
Deleted: fix-marker-index.patch
===================================================================
--- fix-marker-index.patch 2016-10-22 14:16:33 UTC (rev 192975)
+++ fix-marker-index.patch 2016-10-22 15:29:26 UTC (rev 192976)
@@ -1,37 +0,0 @@
---- a/src/native/marker-index-wrapper.cc
-+++ b/src/native/marker-index-wrapper.cc
-@@ -18,20 +18,20 @@ public:
- constructorTemplate->SetClassName(
- Nan::New<String>("MarkerIndex").ToLocalChecked());
- constructorTemplate->InstanceTemplate()->SetInternalFieldCount(1);
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("generateRandomNumber").ToLocalChecked(), Nan::New<FunctionTemplate>(GenerateRandomNumber)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("insert").ToLocalChecked(), Nan::New<FunctionTemplate>(Insert)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("setExclusive").ToLocalChecked(), Nan::New<FunctionTemplate>(SetExclusive)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("delete").ToLocalChecked(), Nan::New<FunctionTemplate>(Delete)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("splice").ToLocalChecked(), Nan::New<FunctionTemplate>(Splice)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getStart").ToLocalChecked(), Nan::New<FunctionTemplate>(GetStart)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getEnd").ToLocalChecked(), Nan::New<FunctionTemplate>(GetEnd)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("compare").ToLocalChecked(), Nan::New<FunctionTemplate>(Compare)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findIntersecting").ToLocalChecked(), Nan::New<FunctionTemplate>(FindIntersecting)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContaining").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContaining)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContainedIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContainedIn)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findStartingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindStartingIn)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findEndingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindEndingIn)->GetFunction());
-- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("dump").ToLocalChecked(), Nan::New<FunctionTemplate>(Dump)->GetFunction());
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("generateRandomNumber").ToLocalChecked(), Nan::New<FunctionTemplate>(GenerateRandomNumber));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("insert").ToLocalChecked(), Nan::New<FunctionTemplate>(Insert));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("setExclusive").ToLocalChecked(), Nan::New<FunctionTemplate>(SetExclusive));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("delete").ToLocalChecked(), Nan::New<FunctionTemplate>(Delete));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("splice").ToLocalChecked(), Nan::New<FunctionTemplate>(Splice));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getStart").ToLocalChecked(), Nan::New<FunctionTemplate>(GetStart));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getEnd").ToLocalChecked(), Nan::New<FunctionTemplate>(GetEnd));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("compare").ToLocalChecked(), Nan::New<FunctionTemplate>(Compare));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findIntersecting").ToLocalChecked(), Nan::New<FunctionTemplate>(FindIntersecting));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContaining").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContaining));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContainedIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContainedIn));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findStartingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindStartingIn));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findEndingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindEndingIn));
-+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("dump").ToLocalChecked(), Nan::New<FunctionTemplate>(Dump));
-
- // assign Number.isFinite for use from C++
- Local<String> number_string = Nan::New("Number").ToLocalChecked();
Modified: run-as-node.patch
===================================================================
--- run-as-node.patch 2016-10-22 14:16:33 UTC (rev 192975)
+++ run-as-node.patch 2016-10-22 15:29:26 UTC (rev 192976)
@@ -1,11 +1,11 @@
---- a/exports/atom.coffee
-+++ b/exports/atom.coffee
-@@ -26,7 +26,7 @@
+--- a/exports/atom.js
++++ b/exports/atom.js
+@@ -37,7 +37,7 @@
- # The following classes can't be used from a Task handler and should therefore
- # only be exported when not running as a child node process
--unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
-+unless process.env.ELECTRON_RUN_AS_NODE
- module.exports.Task = require '../src/task'
+ // The following classes can't be used from a Task handler and should therefore
+ // only be exported when not running as a child node process
+-if (!process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE) {
++if (!process.env.ELECTRON_RUN_AS_NODE) {
+ atomExport.Task = require('../src/task')
- TextEditor = (params) ->
+ const TextEditor = (params) => {
Deleted: tree-view.patch
===================================================================
--- tree-view.patch 2016-10-22 14:16:33 UTC (rev 192975)
+++ tree-view.patch 2016-10-22 15:29:26 UTC (rev 192976)
@@ -1,11 +0,0 @@
---- a/lib/main.coffee
-+++ b/lib/main.coffee
-@@ -54,7 +54,7 @@
- projectPath = atom.project.getPaths()[0]
- if atom.workspace.getActivePaneItem()
- false
-- else if path.basename(projectPath) is '.git'
-+ else if projectPath and path.basename(projectPath) is '.git'
- # Only attach when the project path matches the path to open signifying
- # the .git folder was opened explicitly and not by using Atom as the Git
- # editor.
Modified: use-system-apm.patch
===================================================================
--- use-system-apm.patch 2016-10-22 14:16:33 UTC (rev 192975)
+++ use-system-apm.patch 2016-10-22 15:29:26 UTC (rev 192976)
@@ -1,16 +1,3 @@
---- a/build/tasks/build-task.coffee
-+++ b/build/tasks/build-task.coffee
-@@ -149,10 +149,6 @@
- cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee)$/
- cp 'static', path.join(appDir, 'static')
-
-- cp path.join('apm', 'node_modules', 'atom-package-manager'), path.resolve(appDir, '..', 'new-app', 'apm'), filter: filterNodeModule
-- if process.platform isnt 'win32'
-- fs.symlinkSync(path.join('..', '..', 'bin', 'apm'), path.resolve(appDir, '..', 'new-app', 'apm', 'node_modules', '.bin', 'apm'))
--
- channel = grunt.config.get('atom.channel')
-
- cp path.join('resources', 'app-icons', channel, 'png', '1024.png'), path.join(appDir, 'resources', 'atom.png')
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -136,12 +136,7 @@
Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch 2016-10-22 14:16:33 UTC (rev 192975)
+++ use-system-electron.patch 2016-10-22 15:29:26 UTC (rev 192976)
@@ -1,36 +1,3 @@
---- a/build/Gruntfile.coffee
-+++ b/build/Gruntfile.coffee
-@@ -304,7 +304,7 @@
-
- grunt.registerTask('ci', ciTasks)
-
-- defaultTasks = ['download-electron', 'download-electron-chromedriver', 'build', 'set-version', 'generate-asar']
-+ defaultTasks = ['build', 'set-version', 'generate-asar']
- unless process.platform is 'linux' or grunt.option('no-install')
- defaultTasks.push 'install'
- grunt.registerTask('default', defaultTasks)
---- a/build/tasks/build-task.coffee
-+++ b/build/tasks/build-task.coffee
-@@ -14,19 +14,6 @@
- rm path.join(buildDir, 'installer')
- mkdir path.dirname(buildDir)
-
-- if process.platform is 'darwin'
-- cp 'electron/Electron.app', shellAppDir, filter: /default_app/
-- fs.renameSync path.join(shellAppDir, 'Contents', 'MacOS', 'Electron'), path.join(shellAppDir, 'Contents', 'MacOS', 'Atom')
-- fs.renameSync path.join(shellAppDir, 'Contents', 'Frameworks', 'Electron Helper.app'), path.join(shellAppDir, 'Contents', 'Frameworks', 'Atom Helper.app')
-- fs.renameSync path.join(shellAppDir, 'Contents', 'Frameworks', 'Atom Helper.app', 'Contents', 'MacOS', 'Electron Helper'), path.join(shellAppDir, 'Contents', 'Frameworks', 'Atom Helper.app', 'Contents', 'MacOS', 'Atom Helper')
-- else
-- cp 'electron', shellAppDir, filter: /default_app/
--
-- if process.platform is 'win32'
-- fs.renameSync path.join(shellAppDir, 'electron.exe'), path.join(shellAppDir, 'atom.exe')
-- else
-- fs.renameSync path.join(shellAppDir, 'electron'), path.join(shellAppDir, 'atom')
--
- mkdir appDir
-
- if process.platform isnt 'win32'
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
@@ -41,6 +8,76 @@
"dependencies": {
"async": "0.2.6",
"atom-keymap": "6.3.2",
+--- a/script/build
++++ b/script/build
+@@ -2,10 +2,6 @@
+
+ 'use strict'
+
+-// Run bootstrap first to ensure all the dependencies used later in this script
+-// are installed.
+-require('./bootstrap')
+-
+ // Needed so we can require src/module-cache.coffee during generateModuleCache
+ require('coffee-script/register')
+ require('colors')
+@@ -28,7 +24,6 @@
+ const createDebianPackage = require('./lib/create-debian-package')
+ const createRpmPackage = require('./lib/create-rpm-package')
+ const createWindowsInstaller = require('./lib/create-windows-installer')
+-const downloadChromedriver = require('./lib/download-chromedriver')
+ const dumpSymbols = require('./lib/dump-symbols')
+ const generateAPIDocs = require('./lib/generate-api-docs')
+ const generateMetadata = require('./lib/generate-metadata')
+@@ -56,48 +51,4 @@
+ prebuildLessCache()
+ generateMetadata()
+ generateAPIDocs()
+-downloadChromedriver()
+ dumpSymbols()
+- .then(packageApplication)
+- .then(packagedAppPath => {
+- if (process.platform === 'darwin') {
+- if (argv.codeSign) {
+- codeSignOnMac(packagedAppPath)
+- } else {
+- console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
+- }
+- } else if (process.platform === 'win32') {
+- if (argv.createWindowsInstaller) {
+- return createWindowsInstaller(packagedAppPath, argv.codeSign).then(() => packagedAppPath)
+- }
+- else {
+- console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer. Code-signing was skipped too.'.gray)
+- }
+- } else if (process.platform === 'linux') {
+- if (argv.createDebianPackage) {
+- createDebianPackage(packagedAppPath)
+- } else {
+- console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray)
+- }
+-
+- if (argv.createRpmPackage) {
+- createRpmPackage(packagedAppPath)
+- } else {
+- console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray)
+- }
+- }
+-
+- return Promise.resolve(packagedAppPath)
+- }).then(packagedAppPath => {
+- if (argv.compressArtifacts) {
+- compressArtifacts(packagedAppPath)
+- } else {
+- console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray)
+- }
+-
+- if (argv.install) {
+- installApplication(packagedAppPath)
+- } else {
+- console.log('Skipping installation. Specify the --install option to install Atom'.gray)
+- }
+- })
--- a/src/module-cache.coffee
+++ b/src/module-cache.coffee
@@ -194,7 +194,7 @@
@@ -50,8 +87,8 @@
- if devMode or not cache.resourcePath.startsWith("#{process.resourcesPath}#{path.sep}")
+ if devMode or not cache.resourcePath.startsWith("/usr/lib/atom")
fs = require 'fs-plus'
- atomCoffeePath = path.join(cache.resourcePath, 'exports', 'atom.coffee')
- cache.builtins.atom = atomCoffeePath if fs.isFileSync(atomCoffeePath)
+ atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js')
+ cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath)
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -526,7 +526,7 @@
More information about the arch-commits
mailing list