From 601466782fb45822e585b328ed23c5d52642ef0e Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 21 Nov 2013 09:43:11 -0800
Subject: [PATCH 01/31] Install build dependencies in tasks/node_modules

---
 script/bootstrap       |  1 +
 script/build           |  2 +-
 script/cibuild         |  2 +-
 tasks/docs-task.coffee |  2 +-
 tasks/package.json     | 26 ++++++++++++++++++++++++++
 5 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 tasks/package.json

diff --git a/script/bootstrap b/script/bootstrap
index 87c18f88b..2154a1ef4 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -35,6 +35,7 @@ var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 var commands = [
   'git submodule --quiet sync',
   'git submodule --quiet update --recursive --init',
+  {command: 'npm install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
   {command: 'npm install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
   {command: 'npm install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
   {command: 'npm install --quiet ' + apmVendorPath, options: {ignoreStdout: true}},
diff --git a/script/build b/script/build
index b2022c6ae..3a738ee84 100755
--- a/script/build
+++ b/script/build
@@ -6,6 +6,6 @@ process.chdir(path.dirname(__dirname));
 
 cp.safeExec('node script/bootstrap', function() {
   // node_modules/.bin/grunt "$@"
-  var gruntPath = path.join('node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
+  var gruntPath = path.join('tasks', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
   cp.safeSpawn(gruntPath, process.argv.slice(2), process.exit);
 });
diff --git a/script/cibuild b/script/cibuild
index 8999f0af9..4a81a8025 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -36,7 +36,7 @@ cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
     cp.safeExec.bind(global, gruntPath + ' ci --stack --no-color'),
   ]
   if (process.platform === 'darwin') {
-    tasks.push(cp.safeExec.bind(global, 'node_modules/.bin/coffee script/upload-release'))
+    tasks.push(cp.safeExec.bind(global, 'build/node_modules/.bin/coffee script/upload-release'))
   }
   async.series(tasks, function(error) {
     process.exit(error ? 1 : 0);
diff --git a/tasks/docs-task.coffee b/tasks/docs-task.coffee
index ac034818f..4c7c0e3e7 100644
--- a/tasks/docs-task.coffee
+++ b/tasks/docs-task.coffee
@@ -3,7 +3,7 @@ fs = require 'fs'
 
 module.exports = (grunt) ->
   cmd = path.join('node_modules', '.bin', 'coffee')
-  commonArgs = [path.join('node_modules', '.bin', 'biscotto'), '--']
+  commonArgs = [path.join('tasks', 'node_modules', '.bin', 'biscotto'), '--']
   opts =
     stdio: 'inherit'
 
diff --git a/tasks/package.json b/tasks/package.json
new file mode 100644
index 000000000..3ae54e344
--- /dev/null
+++ b/tasks/package.json
@@ -0,0 +1,26 @@
+{
+  "dependencies": {
+    "biscotto": "0.0.17",
+    "formidable": "~1.0.14",
+    "fstream": "0.1.24",
+    "grunt": "~0.4.1",
+    "grunt-cli": "~0.1.9",
+    "grunt-coffeelint": "git://github.com/atom/grunt-coffeelint.git",
+    "grunt-lesslint": "0.13.0",
+    "grunt-cson": "0.5.0",
+    "grunt-contrib-csslint": "~0.1.2",
+    "grunt-contrib-coffee": "~0.7.0",
+    "grunt-contrib-less": "~0.8.0",
+    "walkdir": "0.0.7",
+    "js-yaml": "~2.1.0",
+    "grunt-markdown": "~0.4.0",
+    "json-front-matter": "~0.1.3",
+    "grunt-shell": "~0.3.1",
+    "jasmine-node": "git://github.com/kevinsawicki/jasmine-node.git#short-stacks",
+    "jasmine-tagged": "0.2.0",
+    "request": "~2.27.0",
+    "unzip": "~0.1.9",
+    "rcedit": "~0.1.2",
+    "rimraf": "~2.2.2"
+  }
+}

From c720a6a0299c1b40d44223fedaa5f1cb708bf64b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 21 Nov 2013 09:50:11 -0800
Subject: [PATCH 02/31] Don't lint tasks/node_modules

---
 Gruntfile.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 024c01e48..c2d7bb1a9 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -123,6 +123,7 @@ module.exports = (grunt) ->
         'exports/**/*.coffee'
         'src/**/*.coffee'
         'tasks/**/*.coffee'
+        '!tasks/node_modules/**/*.coffee'
         'Gruntfile.coffee'
       ]
       test: [

From c2cd1cd13dd2180829ef77fd869174a37601ad06 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 21 Nov 2013 09:56:18 -0800
Subject: [PATCH 03/31] Remove devDependencies from package.json

They are now stored as dependencies in tasks/package.json
---
 package.json       | 26 --------------------------
 tasks/package.json |  4 +++-
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index f15021933..d0827a198 100644
--- a/package.json
+++ b/package.json
@@ -48,32 +48,6 @@
     "temp": "0.5.0",
     "underscore-plus": "0.6.1"
   },
-  "devDependencies": {
-    "biscotto": "0.0.17",
-    "formidable": "~1.0.14",
-    "fstream": "0.1.24",
-    "grunt": "~0.4.1",
-    "grunt-cli": "~0.1.9",
-    "grunt-coffeelint": "git://github.com/atom/grunt-coffeelint.git",
-    "grunt-lesslint": "0.13.0",
-    "grunt-cson": "0.5.0",
-    "grunt-contrib-csslint": "~0.1.2",
-    "grunt-contrib-coffee": "~0.7.0",
-    "grunt-contrib-less": "~0.8.0",
-    "walkdir": "0.0.7",
-    "js-yaml": "~2.1.0",
-    "grunt-markdown": "~0.4.0",
-    "json-front-matter": "~0.1.3",
-    "grunt-shell": "~0.3.1",
-    "jasmine-node": "git://github.com/kevinsawicki/jasmine-node.git#short-stacks",
-    "jasmine-tagged": "0.2.0",
-    "request": "~2.27.0",
-    "unzip": "~0.1.9",
-    "rcedit": "~0.1.2",
-    "rimraf": "~2.2.2",
-    "github-releases": "~0.2.0",
-    "harmony-collections": "~0.3.8"
-  },
   "packageDependencies": {
     "atom-dark-syntax": "0.10.0",
     "atom-dark-ui": "0.18.0",
diff --git a/tasks/package.json b/tasks/package.json
index 3ae54e344..723c5c480 100644
--- a/tasks/package.json
+++ b/tasks/package.json
@@ -21,6 +21,8 @@
     "request": "~2.27.0",
     "unzip": "~0.1.9",
     "rcedit": "~0.1.2",
-    "rimraf": "~2.2.2"
+    "rimraf": "~2.2.2",
+    "github-releases": "~0.2.0",
+    "harmony-collections": "~0.3.8"
   }
 }

From e187604942e44d3add6a2cbfd55345e6b4dc94dd Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 21 Nov 2013 09:57:53 -0800
Subject: [PATCH 04/31] Run grunt from tasks folder

---
 script/constructicon/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/constructicon/build b/script/constructicon/build
index 6bb049759..e9d9e3fd4 100755
--- a/script/constructicon/build
+++ b/script/constructicon/build
@@ -9,7 +9,7 @@ cd "$(dirname "$0")/../.."
 rm -fr node_modules
 rm -fr vendor/apm/node_modules
 ./script/bootstrap --no-color
-./node_modules/.bin/grunt --no-color --build-dir="$BUILT_PRODUCTS_DIR" deploy
+./tasks/node_modules/.bin/grunt --no-color --build-dir="$BUILT_PRODUCTS_DIR" deploy
 
 echo "TARGET_BUILD_DIR=$BUILT_PRODUCTS_DIR"
 echo "FULL_PRODUCT_NAME=Atom.app"

From 673d2330f0e247993391e07c274341716c80e4db Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 21 Nov 2013 10:00:06 -0800
Subject: [PATCH 05/31] Add jasmine-node/jasmine-focused to dependencies

---
 package.json       | 2 ++
 tasks/package.json | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d0827a198..b07fc7db6 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,8 @@
     "git-utils": "0.29.0",
     "guid": "0.0.10",
     "jasmine-focused": "~0.15.0",
+    "jasmine-node": "git://github.com/kevinsawicki/jasmine-node.git#short-stacks",
+    "jasmine-tagged": "0.2.0",
     "mkdirp": "0.3.5",
     "keytar": "0.13.0",
     "less-cache": "0.10.0",
diff --git a/tasks/package.json b/tasks/package.json
index 723c5c480..c8188e1cf 100644
--- a/tasks/package.json
+++ b/tasks/package.json
@@ -16,8 +16,6 @@
     "grunt-markdown": "~0.4.0",
     "json-front-matter": "~0.1.3",
     "grunt-shell": "~0.3.1",
-    "jasmine-node": "git://github.com/kevinsawicki/jasmine-node.git#short-stacks",
-    "jasmine-tagged": "0.2.0",
     "request": "~2.27.0",
     "unzip": "~0.1.9",
     "rcedit": "~0.1.2",

From 70c14eb4f559ad5ae87a5d0fcc4b86614cafd1d4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 21 Nov 2013 10:39:31 -0800
Subject: [PATCH 06/31] Move tasks to build directory

---
 Gruntfile.coffee => build/Gruntfile.coffee    | 27 ++++++++++---------
 {tasks => build}/package.json                 |  0
 {tasks => build/tasks}/build-task.coffee      |  0
 {tasks => build/tasks}/clean-task.coffee      |  0
 {tasks => build/tasks}/codesign-task.coffee   |  0
 {tasks => build/tasks}/convert-theme.coffee   |  0
 .../tasks}/copy-info-plist-task.coffee        |  0
 {tasks => build/tasks}/docs-task.coffee       |  0
 {tasks => build/tasks}/install-task.coffee    |  0
 {tasks => build/tasks}/nof-task.coffee        |  0
 .../tasks}/prebuild-less-task.coffee          |  0
 .../tasks}/publish-packages.coffee            |  0
 .../set-development-version-task.coffee       |  0
 .../tasks}/set-exe-icon-task.coffee           |  2 +-
 {tasks => build/tasks}/spec-task.coffee       |  0
 {tasks => build/tasks}/task-helpers.coffee    |  0
 script/build                                  |  7 ++---
 script/cibuild                                |  4 +--
 18 files changed, 22 insertions(+), 18 deletions(-)
 rename Gruntfile.coffee => build/Gruntfile.coffee (97%)
 rename {tasks => build}/package.json (100%)
 rename {tasks => build/tasks}/build-task.coffee (100%)
 rename {tasks => build/tasks}/clean-task.coffee (100%)
 rename {tasks => build/tasks}/codesign-task.coffee (100%)
 rename {tasks => build/tasks}/convert-theme.coffee (100%)
 rename {tasks => build/tasks}/copy-info-plist-task.coffee (100%)
 rename {tasks => build/tasks}/docs-task.coffee (100%)
 rename {tasks => build/tasks}/install-task.coffee (100%)
 rename {tasks => build/tasks}/nof-task.coffee (100%)
 rename {tasks => build/tasks}/prebuild-less-task.coffee (100%)
 rename {tasks => build/tasks}/publish-packages.coffee (100%)
 rename {tasks => build/tasks}/set-development-version-task.coffee (100%)
 rename {tasks => build/tasks}/set-exe-icon-task.coffee (80%)
 rename {tasks => build/tasks}/spec-task.coffee (100%)
 rename {tasks => build/tasks}/task-helpers.coffee (100%)

diff --git a/Gruntfile.coffee b/build/Gruntfile.coffee
similarity index 97%
rename from Gruntfile.coffee
rename to build/Gruntfile.coffee
index c2d7bb1a9..0f9063e0f 100644
--- a/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -5,7 +5,7 @@ os = require 'os'
 fm = require 'json-front-matter'
 _ = require 'underscore-plus'
 
-packageJson = require './package.json'
+packageJson = require '../package.json'
 
 # OAuth token for atom-bot
 # TODO Remove once all repositories are public
@@ -16,6 +16,20 @@ process.env.ATOM_ACCESS_TOKEN ?= '362295be4c5258d3f7b967bbabae662a455ca2a7'
 _.extend(global, require('harmony-collections')) unless global.WeakMap?
 
 module.exports = (grunt) ->
+  grunt.loadNpmTasks('grunt-coffeelint')
+  grunt.loadNpmTasks('grunt-lesslint')
+  grunt.loadNpmTasks('grunt-cson')
+  grunt.loadNpmTasks('grunt-contrib-csslint')
+  grunt.loadNpmTasks('grunt-contrib-coffee')
+  grunt.loadNpmTasks('grunt-contrib-less')
+  grunt.loadNpmTasks('grunt-markdown')
+  grunt.loadNpmTasks('grunt-shell')
+  grunt.loadNpmTasks('grunt-download-atom-shell')
+  grunt.loadTasks('tasks')
+
+  # This allows all subsequent paths to the relative to the root of the repo
+  grunt.file.setBase(path.resolve('..'))
+
   if not grunt.option('verbose')
     grunt.log.writeln = (args...) -> grunt.log
     grunt.log.write = (args...) -> grunt.log
@@ -194,17 +208,6 @@ module.exports = (grunt) ->
           stderr: false
           failOnError: false
 
-  grunt.loadNpmTasks('grunt-coffeelint')
-  grunt.loadNpmTasks('grunt-lesslint')
-  grunt.loadNpmTasks('grunt-cson')
-  grunt.loadNpmTasks('grunt-contrib-csslint')
-  grunt.loadNpmTasks('grunt-contrib-coffee')
-  grunt.loadNpmTasks('grunt-contrib-less')
-  grunt.loadNpmTasks('grunt-markdown')
-  grunt.loadNpmTasks('grunt-download-atom-shell')
-  grunt.loadNpmTasks('grunt-shell')
-  grunt.loadTasks('tasks')
-
   grunt.registerTask('compile', ['coffee', 'prebuild-less', 'cson'])
   grunt.registerTask('lint', ['coffeelint', 'csslint', 'lesslint'])
   grunt.registerTask('test', ['shell:kill-atom', 'run-specs'])
diff --git a/tasks/package.json b/build/package.json
similarity index 100%
rename from tasks/package.json
rename to build/package.json
diff --git a/tasks/build-task.coffee b/build/tasks/build-task.coffee
similarity index 100%
rename from tasks/build-task.coffee
rename to build/tasks/build-task.coffee
diff --git a/tasks/clean-task.coffee b/build/tasks/clean-task.coffee
similarity index 100%
rename from tasks/clean-task.coffee
rename to build/tasks/clean-task.coffee
diff --git a/tasks/codesign-task.coffee b/build/tasks/codesign-task.coffee
similarity index 100%
rename from tasks/codesign-task.coffee
rename to build/tasks/codesign-task.coffee
diff --git a/tasks/convert-theme.coffee b/build/tasks/convert-theme.coffee
similarity index 100%
rename from tasks/convert-theme.coffee
rename to build/tasks/convert-theme.coffee
diff --git a/tasks/copy-info-plist-task.coffee b/build/tasks/copy-info-plist-task.coffee
similarity index 100%
rename from tasks/copy-info-plist-task.coffee
rename to build/tasks/copy-info-plist-task.coffee
diff --git a/tasks/docs-task.coffee b/build/tasks/docs-task.coffee
similarity index 100%
rename from tasks/docs-task.coffee
rename to build/tasks/docs-task.coffee
diff --git a/tasks/install-task.coffee b/build/tasks/install-task.coffee
similarity index 100%
rename from tasks/install-task.coffee
rename to build/tasks/install-task.coffee
diff --git a/tasks/nof-task.coffee b/build/tasks/nof-task.coffee
similarity index 100%
rename from tasks/nof-task.coffee
rename to build/tasks/nof-task.coffee
diff --git a/tasks/prebuild-less-task.coffee b/build/tasks/prebuild-less-task.coffee
similarity index 100%
rename from tasks/prebuild-less-task.coffee
rename to build/tasks/prebuild-less-task.coffee
diff --git a/tasks/publish-packages.coffee b/build/tasks/publish-packages.coffee
similarity index 100%
rename from tasks/publish-packages.coffee
rename to build/tasks/publish-packages.coffee
diff --git a/tasks/set-development-version-task.coffee b/build/tasks/set-development-version-task.coffee
similarity index 100%
rename from tasks/set-development-version-task.coffee
rename to build/tasks/set-development-version-task.coffee
diff --git a/tasks/set-exe-icon-task.coffee b/build/tasks/set-exe-icon-task.coffee
similarity index 80%
rename from tasks/set-exe-icon-task.coffee
rename to build/tasks/set-exe-icon-task.coffee
index 09bc2b67b..0d9e2c0f6 100644
--- a/tasks/set-exe-icon-task.coffee
+++ b/build/tasks/set-exe-icon-task.coffee
@@ -6,7 +6,7 @@ module.exports = (grunt) ->
 
     shellAppDir = grunt.config.get('atom.shellAppDir')
     shellExePath = path.join(shellAppDir, 'atom.exe')
-    iconPath = path.resolve(__dirname, '..', 'resources', 'win', 'atom.ico')
+    iconPath = path.resolve('resources', 'win', 'atom.ico')
 
     rcedit = require('rcedit')
     rcedit(shellExePath, {'icon': iconPath}, done)
diff --git a/tasks/spec-task.coffee b/build/tasks/spec-task.coffee
similarity index 100%
rename from tasks/spec-task.coffee
rename to build/tasks/spec-task.coffee
diff --git a/tasks/task-helpers.coffee b/build/tasks/task-helpers.coffee
similarity index 100%
rename from tasks/task-helpers.coffee
rename to build/tasks/task-helpers.coffee
diff --git a/script/build b/script/build
index 3a738ee84..b2a93d025 100755
--- a/script/build
+++ b/script/build
@@ -5,7 +5,8 @@ var path = require('path');
 process.chdir(path.dirname(__dirname));
 
 cp.safeExec('node script/bootstrap', function() {
-  // node_modules/.bin/grunt "$@"
-  var gruntPath = path.join('tasks', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
-  cp.safeSpawn(gruntPath, process.argv.slice(2), process.exit);
+  var gruntPath = path.join('build', 'node_modules', 'grunt-cli', 'bin', 'grunt');
+  var args = [gruntPath, '--gruntfile', path.resolve('build', 'Gruntfile.coffee')];
+  args = args.concat(process.argv.slice(2));
+  cp.safeSpawn(process.execPath, args, process.exit);
 });
diff --git a/script/cibuild b/script/cibuild
index 4a81a8025..341d929b6 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -29,11 +29,11 @@ cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
   if (error)
     process.exit(1);
   var async = require('async');
-  var gruntPath = path.join('node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
+  var gruntPath = path.join('build' 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
   var tasks = [
     require('rimraf').bind(global, path.join(homeDir, '.atom')),
     cp.safeExec.bind(global, 'git clean -dff'),
-    cp.safeExec.bind(global, gruntPath + ' ci --stack --no-color'),
+    cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'),
   ]
   if (process.platform === 'darwin') {
     tasks.push(cp.safeExec.bind(global, 'build/node_modules/.bin/coffee script/upload-release'))

From 822f13d6e3be1ccc1cabd1bf7b8109594083bdf0 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 21 Nov 2013 11:26:12 -0800
Subject: [PATCH 07/31] Remove unneeded lint exclude

---
 build/Gruntfile.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee
index 0f9063e0f..b0b10ba7b 100644
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -137,7 +137,6 @@ module.exports = (grunt) ->
         'exports/**/*.coffee'
         'src/**/*.coffee'
         'tasks/**/*.coffee'
-        '!tasks/node_modules/**/*.coffee'
         'Gruntfile.coffee'
       ]
       test: [

From 790c22792476ac806ea30a59aae23172fb92ec17 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 10:53:22 -0800
Subject: [PATCH 08/31] Add back comment

---
 script/build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/build b/script/build
index b2a93d025..004ba6189 100755
--- a/script/build
+++ b/script/build
@@ -5,6 +5,7 @@ var path = require('path');
 process.chdir(path.dirname(__dirname));
 
 cp.safeExec('node script/bootstrap', function() {
+  // node build/node_modules/grunt-cli/bin/grunt "$@"
   var gruntPath = path.join('build', 'node_modules', 'grunt-cli', 'bin', 'grunt');
   var args = [gruntPath, '--gruntfile', path.resolve('build', 'Gruntfile.coffee')];
   args = args.concat(process.argv.slice(2));

From 0c5ed1eee46cb82e39ab481f6662f2ffd8ecfc9d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 10:55:19 -0800
Subject: [PATCH 09/31] Run grunt from build folder

---
 script/constructicon/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/constructicon/build b/script/constructicon/build
index e9d9e3fd4..647108d85 100755
--- a/script/constructicon/build
+++ b/script/constructicon/build
@@ -9,7 +9,7 @@ cd "$(dirname "$0")/../.."
 rm -fr node_modules
 rm -fr vendor/apm/node_modules
 ./script/bootstrap --no-color
-./tasks/node_modules/.bin/grunt --no-color --build-dir="$BUILT_PRODUCTS_DIR" deploy
+./build/node_modules/.bin/grunt --no-color --build-dir="$BUILT_PRODUCTS_DIR" deploy
 
 echo "TARGET_BUILD_DIR=$BUILT_PRODUCTS_DIR"
 echo "FULL_PRODUCT_NAME=Atom.app"

From 401ef87bb28b89dd7954d8218591ff06d93f1285 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 10:56:00 -0800
Subject: [PATCH 10/31] Clean build/node_modules folder

---
 script/clean | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/clean b/script/clean
index 1c6590ae3..d0c7c93ea 100755
--- a/script/clean
+++ b/script/clean
@@ -16,6 +16,7 @@ var killatom = process.platform === 'win32' ? 'START taskkill /F /IM ' + product
 var commands = [
   killatom,
   [__dirname, '..', 'node_modules'],
+  [__dirname, '..', 'build', 'node_modules'],
   [__dirname, '..', 'atom-shell'],
   [home, '.atom', '.node-gyp'],
   [home, '.atom', 'storage'],

From 9bc24b8736cec7788ec56201dc0ec4c10c8b1ee0 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 10:58:13 -0800
Subject: [PATCH 11/31] Add missing comma

---
 script/cibuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/cibuild b/script/cibuild
index 341d929b6..969524675 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -29,7 +29,7 @@ cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
   if (error)
     process.exit(1);
   var async = require('async');
-  var gruntPath = path.join('build' 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
+  var gruntPath = path.join('build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
   var tasks = [
     require('rimraf').bind(global, path.join(homeDir, '.atom')),
     cp.safeExec.bind(global, 'git clean -dff'),

From 2910170eebceddf7a8fbb466d4fea01cd2ab30ad Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:10:24 -0800
Subject: [PATCH 12/31] Add name field

---
 build/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/package.json b/build/package.json
index c8188e1cf..2bca8949f 100644
--- a/build/package.json
+++ b/build/package.json
@@ -1,4 +1,5 @@
 {
+  "name": "atom-build",
   "dependencies": {
     "biscotto": "0.0.17",
     "formidable": "~1.0.14",

From 64aba6ec248bbaa4083e6bad5f0d1ffa9b7e2249 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:12:12 -0800
Subject: [PATCH 13/31] Add first-mate dependency

---
 build/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/package.json b/build/package.json
index 2bca8949f..51243c7af 100644
--- a/build/package.json
+++ b/build/package.json
@@ -22,6 +22,7 @@
     "rcedit": "~0.1.2",
     "rimraf": "~2.2.2",
     "github-releases": "~0.2.0",
-    "harmony-collections": "~0.3.8"
+    "harmony-collections": "~0.3.8",
+    "first-mate": "~0.10.0"
   }
 }

From e2db58c6ee31479c83f8bd52bca60023ea125905 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:15:40 -0800
Subject: [PATCH 14/31] Add grunt-download-atom-shell as dependency

---
 build/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/package.json b/build/package.json
index 51243c7af..cacc37a35 100644
--- a/build/package.json
+++ b/build/package.json
@@ -12,6 +12,7 @@
     "grunt-contrib-csslint": "~0.1.2",
     "grunt-contrib-coffee": "~0.7.0",
     "grunt-contrib-less": "~0.8.0",
+    "grunt-download-atom-shell": "git+https://atom-bot:362295be4c5258d3f7b967bbabae662a455ca2a7@github.com/atom/grunt-download-atom-shell#v0.4.0",
     "walkdir": "0.0.7",
     "js-yaml": "~2.1.0",
     "grunt-markdown": "~0.4.0",

From 4f6c655294efb8b7a6bb3211c3cdbce236b6698b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:16:12 -0800
Subject: [PATCH 15/31] Remove grunt-download-atom-shell as package dependency

---
 package.json               | 3 +--
 src/package-manager.coffee | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package.json b/package.json
index b07fc7db6..57020a862 100644
--- a/package.json
+++ b/package.json
@@ -132,8 +132,7 @@
     "language-todo": "0.2.0",
     "language-toml": "0.7.0",
     "language-xml": "0.2.0",
-    "language-yaml": "0.1.0",
-    "grunt-download-atom-shell": "0.4.0"
+    "language-yaml": "0.1.0"
   },
   "private": true,
   "scripts": {
diff --git a/src/package-manager.coffee b/src/package-manager.coffee
index a85e51e43..e94a69785 100644
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -226,10 +226,6 @@ class PackageManager
         {@packageDependencies} = JSON.parse(fs.readFileSync(metadataPath)) ? {}
       @packageDependencies ?= {}
 
-    # Temporarily ignore 'grunt-download-atom-shell' here, should remove this
-    # when it became a public npm module.
-    delete @packageDependencies['grunt-download-atom-shell']
-
     @packageDependencies
 
   # Public: Get an array of all the available package paths.

From 088a6274681baae34338ea02c0e26d814b27b633 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:20:57 -0800
Subject: [PATCH 16/31] :lipstick: Sort build dependencies

---
 build/package.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/package.json b/build/package.json
index cacc37a35..a4245d07b 100644
--- a/build/package.json
+++ b/build/package.json
@@ -2,28 +2,28 @@
   "name": "atom-build",
   "dependencies": {
     "biscotto": "0.0.17",
+    "first-mate": "~0.10.0",
     "formidable": "~1.0.14",
     "fstream": "0.1.24",
+    "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.9",
     "grunt-coffeelint": "git://github.com/atom/grunt-coffeelint.git",
-    "grunt-lesslint": "0.13.0",
-    "grunt-cson": "0.5.0",
     "grunt-contrib-csslint": "~0.1.2",
     "grunt-contrib-coffee": "~0.7.0",
     "grunt-contrib-less": "~0.8.0",
+    "grunt-cson": "0.5.0",
     "grunt-download-atom-shell": "git+https://atom-bot:362295be4c5258d3f7b967bbabae662a455ca2a7@github.com/atom/grunt-download-atom-shell#v0.4.0",
-    "walkdir": "0.0.7",
-    "js-yaml": "~2.1.0",
+    "grunt-lesslint": "0.13.0",
     "grunt-markdown": "~0.4.0",
-    "json-front-matter": "~0.1.3",
     "grunt-shell": "~0.3.1",
-    "request": "~2.27.0",
-    "unzip": "~0.1.9",
-    "rcedit": "~0.1.2",
-    "rimraf": "~2.2.2",
-    "github-releases": "~0.2.0",
     "harmony-collections": "~0.3.8",
-    "first-mate": "~0.10.0"
+    "js-yaml": "~2.1.0",
+    "json-front-matter": "~0.1.3",
+    "rcedit": "~0.1.2",
+    "request": "~2.27.0",
+    "rimraf": "~2.2.2",
+    "unzip": "~0.1.9",
+    "walkdir": "0.0.7"
   }
 }

From 167e6dc1bff0c63757bf125176c7d98aad2788cd Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:41:34 -0800
Subject: [PATCH 17/31] Convert upload-release script to a grunt task

---
 build/Gruntfile.coffee                        |  2 +-
 .../tasks/publish-build-task.coffee           | 72 +++++++++++--------
 script/cibuild                                |  3 -
 3 files changed, 45 insertions(+), 32 deletions(-)
 rename script/upload-release => build/tasks/publish-build-task.coffee (67%)
 mode change 100755 => 100644

diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee
index b0b10ba7b..831f18a15 100644
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -210,7 +210,7 @@ module.exports = (grunt) ->
   grunt.registerTask('compile', ['coffee', 'prebuild-less', 'cson'])
   grunt.registerTask('lint', ['coffeelint', 'csslint', 'lesslint'])
   grunt.registerTask('test', ['shell:kill-atom', 'run-specs'])
-  grunt.registerTask('ci', ['download-atom-shell', 'build', 'set-development-version', 'lint', 'test'])
+  grunt.registerTask('ci', ['download-atom-shell', 'build', 'set-development-version', 'lint', 'test', 'publish-build'])
   grunt.registerTask('deploy', ['partial-clean', 'download-atom-shell', 'build', 'codesign'])
   grunt.registerTask('docs', ['markdown:guides', 'build-docs'])
   grunt.registerTask('default', ['download-atom-shell', 'build', 'set-development-version', 'install'])
diff --git a/script/upload-release b/build/tasks/publish-build-task.coffee
old mode 100755
new mode 100644
similarity index 67%
rename from script/upload-release
rename to build/tasks/publish-build-task.coffee
index 1227f94d5..401d39fa0
--- a/script/upload-release
+++ b/build/tasks/publish-build-task.coffee
@@ -1,7 +1,3 @@
-#!/usr/bin/env coffee
-
-return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'
-
 child_process = require 'child_process'
 path = require 'path'
 
@@ -19,16 +15,35 @@ defaultHeaders =
   Authorization: "token #{token}"
   'User-Agent': 'Atom'
 
+module.exports = ->
+  grunt.registerTask 'publish-build', 'Publish the built app', ->
+    return unless process.platform is 'darwin'
+    return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'
+
+    done = @async()
+
+    createRelease (error, release) ->
+      return done(error) if error?
+      zipApp (error) ->
+        return done(error) if error?
+        uploadAsset release, (error) ->
+          return done(error) if error?
+          publishRelease release (error) ->
+          done(error)
+
+logError = (message, error, details) ->
+  grunt.log.error(message)
+  grunt.log.error(error.message ? error) if error?
+  grunt.log.error(details) if details
+
 zipApp = (callback) ->
   fs.removeSync(assetPath)
 
   options = {cwd: path.dirname(assetPath), maxBuffer: Infinity}
   child_process.exec "zip -r --symlinks #{assetName} Atom.app", options, (error, stdout, stderr) ->
     if error?
-      console.error('Zipping Atom.app failed', error, stderr)
-      process.exit(1)
-    else
-      callback()
+      logError('Zipping Atom.app failed', error, stderr)
+    callback(error)
 
 getRelease = (callback) ->
   options =
@@ -38,14 +53,14 @@ getRelease = (callback) ->
     json: true
   request options, (error, response, releases=[]) ->
     if error? or response.statusCode isnt 200
-      console.error('Fetching releases failed', error, releases)
-      process.exit(1)
+      logError('Fetching releases failed', error, releases)
+      callback(error ? response.statusCode)
     else
       if releases.length > maxReleases
         deleteRelease(release) for release in releases[maxReleases..]
 
       for release in releases when release.name is commitSha
-        callback(release)
+        callback(null, release)
         return
       callback()
 
@@ -57,7 +72,7 @@ deleteRelease = (release) ->
     json: true
   request options, (error, response, body='') ->
     if error? or response.statusCode isnt 204
-      console.error('Deleting release failed', error, body)
+      logError('Deleting release failed', error, body)
 
 deleteExistingAsset = (release, callback) ->
   for asset in release.assets when asset.name is assetName
@@ -67,8 +82,8 @@ deleteExistingAsset = (release, callback) ->
       headers: defaultHeaders
     request options, (error, response, body='') ->
       if error? or response.statusCode isnt 204
-        console.error('Deleting existing release asset failed', error, body)
-        process.exit(1)
+        logError('Deleting existing release asset failed', error, body)
+        callback(error ? response.statusCode)
       else
         callback()
 
@@ -77,7 +92,11 @@ deleteExistingAsset = (release, callback) ->
   callback()
 
 createRelease = (callback) ->
-  getRelease (release) ->
+  getRelease (error, release) ->
+    if error?
+      callback(error)
+      return
+
     if release?
       deleteExistingAsset release, ->
         callback(release)
@@ -96,10 +115,10 @@ createRelease = (callback) ->
         prerelease: true
     request options, (error, response, release={}) ->
       if error? or response.statusCode isnt 201
-        console.error('Creating release failed', error, release)
-        process.exit(1)
+        logError('Creating release failed', error, release)
+        callback(error ? response.statusCode)
       else
-        callback(release)
+        callback(null, release)
 
 uploadAsset = (release, callback) ->
   options =
@@ -112,10 +131,10 @@ uploadAsset = (release, callback) ->
 
   assetRequest = request options, (error, response, body='') ->
     if error? or response.statusCode >= 400
-      console.error('Upload release asset failed', error, body)
-      process.exit(1)
+      logError('Upload release asset failed', error, body)
+      callback(error ? response.statusCode)
     else
-      callback(release)
+      callback(null, release)
 
   fs.createReadStream(assetPath).pipe(assetRequest)
 
@@ -128,10 +147,7 @@ publishRelease = (release) ->
       draft: false
   request options, (error, response, body={}) ->
     if error? or response.statusCode isnt 200
-      console.error('Creating release failed', error, body)
-      process.exit(1)
-
-createRelease (release) ->
-  zipApp ->
-    uploadAsset release, ->
-      publishRelease release
+      logError('Creating release failed', error, body)
+      callback(error ? response.statusCode)
+    else
+      callback()
diff --git a/script/cibuild b/script/cibuild
index 969524675..bd9138fa1 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -35,9 +35,6 @@ cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
     cp.safeExec.bind(global, 'git clean -dff'),
     cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'),
   ]
-  if (process.platform === 'darwin') {
-    tasks.push(cp.safeExec.bind(global, 'build/node_modules/.bin/coffee script/upload-release'))
-  }
   async.series(tasks, function(error) {
     process.exit(error ? 1 : 0);
   });

From 43482ea78ea919a146b20f439ad11dc7e410abf9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:42:35 -0800
Subject: [PATCH 18/31] Add grunt param

---
 build/tasks/publish-build-task.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee
index 401d39fa0..e5e7f6ccc 100644
--- a/build/tasks/publish-build-task.coffee
+++ b/build/tasks/publish-build-task.coffee
@@ -15,7 +15,7 @@ defaultHeaders =
   Authorization: "token #{token}"
   'User-Agent': 'Atom'
 
-module.exports = ->
+module.exports = (grunt) ->
   grunt.registerTask 'publish-build', 'Publish the built app', ->
     return unless process.platform is 'darwin'
     return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'

From b1470fc1b506e82f26f24987efc0db40e081709f Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:43:13 -0800
Subject: [PATCH 19/31] Indent done callback

---
 build/tasks/publish-build-task.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee
index e5e7f6ccc..86c156e69 100644
--- a/build/tasks/publish-build-task.coffee
+++ b/build/tasks/publish-build-task.coffee
@@ -29,7 +29,7 @@ module.exports = (grunt) ->
         uploadAsset release, (error) ->
           return done(error) if error?
           publishRelease release (error) ->
-          done(error)
+            done(error)
 
 logError = (message, error, details) ->
   grunt.log.error(message)

From 963513e8400d6ddece4ad96a44775df3fba97e7a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:45:04 -0800
Subject: [PATCH 20/31] Wrap status code in an Error

---
 build/tasks/publish-build-task.coffee | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee
index 86c156e69..0c0f9c1fc 100644
--- a/build/tasks/publish-build-task.coffee
+++ b/build/tasks/publish-build-task.coffee
@@ -54,7 +54,7 @@ getRelease = (callback) ->
   request options, (error, response, releases=[]) ->
     if error? or response.statusCode isnt 200
       logError('Fetching releases failed', error, releases)
-      callback(error ? response.statusCode)
+      callback(error ? new Error(response.statusCode))
     else
       if releases.length > maxReleases
         deleteRelease(release) for release in releases[maxReleases..]
@@ -83,7 +83,7 @@ deleteExistingAsset = (release, callback) ->
     request options, (error, response, body='') ->
       if error? or response.statusCode isnt 204
         logError('Deleting existing release asset failed', error, body)
-        callback(error ? response.statusCode)
+        callback(error ? new Error(response.statusCode))
       else
         callback()
 
@@ -116,7 +116,7 @@ createRelease = (callback) ->
     request options, (error, response, release={}) ->
       if error? or response.statusCode isnt 201
         logError('Creating release failed', error, release)
-        callback(error ? response.statusCode)
+        callback(error ? new Error(response.statusCode))
       else
         callback(null, release)
 
@@ -132,7 +132,7 @@ uploadAsset = (release, callback) ->
   assetRequest = request options, (error, response, body='') ->
     if error? or response.statusCode >= 400
       logError('Upload release asset failed', error, body)
-      callback(error ? response.statusCode)
+      callback(error ? new Error(response.statusCode))
     else
       callback(null, release)
 
@@ -148,6 +148,6 @@ publishRelease = (release) ->
   request options, (error, response, body={}) ->
     if error? or response.statusCode isnt 200
       logError('Creating release failed', error, body)
-      callback(error ? response.statusCode)
+      callback(error ? new Error(response.statusCode))
     else
       callback()

From 7f2e0e2317be14e9d3b8699218a8bcba3253f27b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:54:36 -0800
Subject: [PATCH 21/31] Add back window .cmd suffix

---
 script/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/build b/script/build
index 004ba6189..6fdbffa82 100755
--- a/script/build
+++ b/script/build
@@ -6,7 +6,7 @@ process.chdir(path.dirname(__dirname));
 
 cp.safeExec('node script/bootstrap', function() {
   // node build/node_modules/grunt-cli/bin/grunt "$@"
-  var gruntPath = path.join('build', 'node_modules', 'grunt-cli', 'bin', 'grunt');
+  var gruntPath = path.join('build', 'node_modules', 'grunt-cli', 'bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
   var args = [gruntPath, '--gruntfile', path.resolve('build', 'Gruntfile.coffee')];
   args = args.concat(process.argv.slice(2));
   cp.safeSpawn(process.execPath, args, process.exit);

From 18f2f5f8214c45e04a7450b5a92877a7089d8629 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 2 Jan 2014 11:55:14 -0800
Subject: [PATCH 22/31] Add script/grunt

---
 script/grunt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100755 script/grunt

diff --git a/script/grunt b/script/grunt
new file mode 100755
index 000000000..3f8516512
--- /dev/null
+++ b/script/grunt
@@ -0,0 +1,9 @@
+#!/usr/bin/env node --harmony_collections
+var cp = require('./utils/child-process-wrapper.js');
+var path = require('path');
+
+// node build/node_modules/grunt-cli/bin/grunt "$@"
+var gruntPath = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-cli', 'bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
+var args = [gruntPath, '--gruntfile', path.resolve('build', 'Gruntfile.coffee')];
+args = args.concat(process.argv.slice(2));
+cp.safeSpawn(process.execPath, args, process.exit);

From 847a8165e04c69b327d5b8250a6f74948b3aefb6 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 3 Jan 2014 08:37:16 -0800
Subject: [PATCH 23/31] Add fields to prevent warnings

---
 build/package.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/package.json b/build/package.json
index a4245d07b..82348a5c0 100644
--- a/build/package.json
+++ b/build/package.json
@@ -1,5 +1,10 @@
 {
   "name": "atom-build",
+  "description": "Atom build",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/atom/atom.git"
+  },
   "dependencies": {
     "biscotto": "0.0.17",
     "first-mate": "~0.10.0",

From 704294a2d523b06f2f3d9a152ce7b7489927ec96 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 3 Jan 2014 08:37:24 -0800
Subject: [PATCH 24/31] Add build/README.md

---
 build/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 build/README.md

diff --git a/build/README.md b/build/README.md
new file mode 100644
index 000000000..a67c16f73
--- /dev/null
+++ b/build/README.md
@@ -0,0 +1,9 @@
+# Atom Build
+
+This folder contains the grunt configuration and tasks to build Atom.
+
+It was moved from the root of the repository so that native modules would be
+compiled against node's v8 headers instead of Atom's v8 headers.
+
+New build dependencies should be added to the `package.json` file located in
+this folder.

From 04eef20c846f50d373ad2b7464bd8800261890c1 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 3 Jan 2014 09:06:58 -0800
Subject: [PATCH 25/31] Use fs-plus instead of rimraf directly

---
 script/cibuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/cibuild b/script/cibuild
index bd9138fa1..dcee0daa1 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -31,7 +31,7 @@ cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
   var async = require('async');
   var gruntPath = path.join('build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
   var tasks = [
-    require('rimraf').bind(global, path.join(homeDir, '.atom')),
+    require('fs-plus').removeSync.bind(global, path.join(homeDir, '.atom')),
     cp.safeExec.bind(global, 'git clean -dff'),
     cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'),
   ]

From 344d237a420bb7329af9286b3c6405c25f0a167b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 3 Jan 2014 09:26:04 -0800
Subject: [PATCH 26/31] Remove ~/.atom outside of tasks

---
 script/cibuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/cibuild b/script/cibuild
index dcee0daa1..c5b1a0423 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -28,10 +28,10 @@ readEnvironmentVariables();
 cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
   if (error)
     process.exit(1);
+  require('fs-plus').removeSync.bind(global, path.join(homeDir, '.atom'))
   var async = require('async');
   var gruntPath = path.join('build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
   var tasks = [
-    require('fs-plus').removeSync.bind(global, path.join(homeDir, '.atom')),
     cp.safeExec.bind(global, 'git clean -dff'),
     cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'),
   ]

From 5e2e5a4b58479ea87be3d18035629f9d5133e84a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 3 Jan 2014 09:29:45 -0800
Subject: [PATCH 27/31] Use same grunt path in script/build and script/cibuild

---
 script/build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/build b/script/build
index 6fdbffa82..19e38f818 100755
--- a/script/build
+++ b/script/build
@@ -5,8 +5,8 @@ var path = require('path');
 process.chdir(path.dirname(__dirname));
 
 cp.safeExec('node script/bootstrap', function() {
-  // node build/node_modules/grunt-cli/bin/grunt "$@"
-  var gruntPath = path.join('build', 'node_modules', 'grunt-cli', 'bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
+  // build/node_modules/.bin/grunt "$@"
+  var gruntPath = path.join('build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
   var args = [gruntPath, '--gruntfile', path.resolve('build', 'Gruntfile.coffee')];
   args = args.concat(process.argv.slice(2));
   cp.safeSpawn(process.execPath, args, process.exit);

From 5e5ba63c59f1826a996e0ef61c1e7e94fc5b630c Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 3 Jan 2014 09:38:57 -0800
Subject: [PATCH 28/31] Move fstream from build to dev dependency

---
 build/package.json | 1 -
 package.json       | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/package.json b/build/package.json
index 82348a5c0..ef04087b0 100644
--- a/build/package.json
+++ b/build/package.json
@@ -9,7 +9,6 @@
     "biscotto": "0.0.17",
     "first-mate": "~0.10.0",
     "formidable": "~1.0.14",
-    "fstream": "0.1.24",
     "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.9",
diff --git a/package.json b/package.json
index 57020a862..2712c40c0 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "emissary": "0.19.0",
     "first-mate": "0.10.0",
     "fs-plus": "0.13.0",
+    "fstream": "0.1.24",
     "fuzzaldrin": "0.1.0",
     "git-utils": "0.29.0",
     "guid": "0.0.10",

From f9a9712f54322e039c4a5f5567ff584671614740 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 3 Jan 2014 09:48:28 -0800
Subject: [PATCH 29/31] Upgrade to grunt-download-atom-shell@0.5.0

---
 build/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/package.json b/build/package.json
index ef04087b0..221dc69c2 100644
--- a/build/package.json
+++ b/build/package.json
@@ -17,7 +17,7 @@
     "grunt-contrib-coffee": "~0.7.0",
     "grunt-contrib-less": "~0.8.0",
     "grunt-cson": "0.5.0",
-    "grunt-download-atom-shell": "git+https://atom-bot:362295be4c5258d3f7b967bbabae662a455ca2a7@github.com/atom/grunt-download-atom-shell#v0.4.0",
+    "grunt-download-atom-shell": "git+https://atom-bot:362295be4c5258d3f7b967bbabae662a455ca2a7@github.com/atom/grunt-download-atom-shell#v0.5.0",
     "grunt-lesslint": "0.13.0",
     "grunt-markdown": "~0.4.0",
     "grunt-shell": "~0.3.1",

From 3a7ecccec7458d549fa1a41d84e2acd5d69179a7 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 3 Jan 2014 10:01:40 -0800
Subject: [PATCH 30/31] :memo: Clarify justification for moving

---
 build/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/README.md b/build/README.md
index a67c16f73..4ada056f1 100644
--- a/build/README.md
+++ b/build/README.md
@@ -2,8 +2,9 @@
 
 This folder contains the grunt configuration and tasks to build Atom.
 
-It was moved from the root of the repository so that native modules would be
-compiled against node's v8 headers instead of Atom's v8 headers.
+It was moved from the root of the repository so that any native modules used
+would be compiled against node's v8 headers since anything stored in
+`node_modules` at the root of the repo is compiled against atom's v8 headers.
 
 New build dependencies should be added to the `package.json` file located in
 this folder.

From 0112e8887f041e48168a336047c7d7d01fb181d8 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 3 Jan 2014 10:12:55 -0800
Subject: [PATCH 31/31] biscotto is in build folder not tasks folder

---
 build/tasks/docs-task.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/tasks/docs-task.coffee b/build/tasks/docs-task.coffee
index 4c7c0e3e7..42856f8ee 100644
--- a/build/tasks/docs-task.coffee
+++ b/build/tasks/docs-task.coffee
@@ -3,7 +3,7 @@ fs = require 'fs'
 
 module.exports = (grunt) ->
   cmd = path.join('node_modules', '.bin', 'coffee')
-  commonArgs = [path.join('tasks', 'node_modules', '.bin', 'biscotto'), '--']
+  commonArgs = [path.join('build', 'node_modules', '.bin', 'biscotto'), '--']
   opts =
     stdio: 'inherit'