From aefeaa427a5ab3a2bd694344f31bff76f821c5f6 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 2 Feb 2016 10:00:27 -0800 Subject: [PATCH 1/3] Default build dir to out/ --- .gitignore | 1 + build/Gruntfile.coffee | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dee2ac3e9..941192f1f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ debug.log docs/output docs/includes spec/fixtures/evil-files/ +out diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee index ebaf1642d..948e2a911 100644 --- a/build/Gruntfile.coffee +++ b/build/Gruntfile.coffee @@ -36,7 +36,7 @@ module.exports = (grunt) -> # Options installDir = grunt.option('install-dir') buildDir = grunt.option('build-dir') - buildDir ?= path.join(os.tmpdir(), 'atom-build') + buildDir ?= 'out' buildDir = path.resolve(buildDir) channel = grunt.option('channel') From d53eb6a42f6c355d664889fea3d3677320201e7d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 2 Feb 2016 10:11:15 -0800 Subject: [PATCH 2/3] Add out/ to clean list --- script/clean | 1 + 1 file changed, 1 insertion(+) diff --git a/script/clean b/script/clean index 8b5fdf414..fd0aa5bfa 100755 --- a/script/clean +++ b/script/clean @@ -21,6 +21,7 @@ var commands = [ [__dirname, '..', 'apm', 'node_modules'], [__dirname, '..', 'atom-shell'], [__dirname, '..', 'electron'], + [__dirname, '..', 'out'], [home, '.atom', '.node-gyp'], [home, '.atom', 'storage'], [home, '.atom', '.apm'], From b93f0d61cfafb71decd5c6885a8f5f1a91f1510b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 2 Feb 2016 12:49:25 -0800 Subject: [PATCH 3/3] Use same ignore pattern as electron --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 941192f1f..6eec21c2a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ debug.log /tags /atom-shell/ /electron/ +/out/ docs/output docs/includes spec/fixtures/evil-files/ -out