From ba18c65dacd5264be607356b85ff29db1b61b9ee Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 16 Jun 2014 12:37:04 -0700 Subject: [PATCH 1/6] Ignore plist tests/ --- build/tasks/build-task.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index e4ff2578c..76ae4b056 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -48,6 +48,7 @@ module.exports = (grunt) -> path.join('bootstrap', 'docs') path.join('bootstrap', 'examples') path.join('pegjs', 'examples') + path.join('plist', 'tests') # Add .* to avoid matching hunspell_dictionaries. path.join('spellchecker', 'vendor', 'hunspell', '.*') path.join('xmldom', 'test') From 72d1eb24a3f09d342e9578c1832e2be4443a671b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 16 Jun 2014 12:53:34 -0700 Subject: [PATCH 2/6] Ignore build/Release/obj directory --- build/tasks/build-task.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index 76ae4b056..5a9f6293a 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -54,6 +54,7 @@ module.exports = (grunt) -> path.join('xmldom', 'test') path.join('jasmine-reporters', 'ext') path.join('build', 'Release', 'obj.target') + path.join('build', 'Release', 'obj') path.join('build', 'Release', '.deps') path.join('vendor', 'apm') path.join('resources', 'mac') From a66f81d70abffcda3d8bc46fa8d38038cc26dc90 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 16 Jun 2014 12:56:39 -0700 Subject: [PATCH 3/6] Don't include *.pdb files --- build/tasks/build-task.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index 5a9f6293a..d69ca2009 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -56,6 +56,7 @@ module.exports = (grunt) -> path.join('build', 'Release', 'obj.target') path.join('build', 'Release', 'obj') path.join('build', 'Release', '.deps') + path.join('build', 'Release', '.*\\.pdb') path.join('vendor', 'apm') path.join('resources', 'mac') path.join('resources', 'win') From e9bcb851c3315225bf63e6a1daaa14e5ab606d5f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 16 Jun 2014 14:13:43 -0700 Subject: [PATCH 4/6] Escape ignored patterns --- build/tasks/build-task.coffee | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index d69ca2009..028485933 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -1,5 +1,6 @@ fs = require 'fs' path = require 'path' +_ = require 'underscore-plus' module.exports = (grunt) -> {cp, isAtomPackage, mkdir, rm} = require('./task-helpers')(grunt) @@ -49,18 +50,22 @@ module.exports = (grunt) -> path.join('bootstrap', 'examples') path.join('pegjs', 'examples') path.join('plist', 'tests') - # Add .* to avoid matching hunspell_dictionaries. - path.join('spellchecker', 'vendor', 'hunspell', '.*') path.join('xmldom', 'test') path.join('jasmine-reporters', 'ext') path.join('build', 'Release', 'obj.target') path.join('build', 'Release', 'obj') path.join('build', 'Release', '.deps') - path.join('build', 'Release', '.*\\.pdb') path.join('vendor', 'apm') path.join('resources', 'mac') path.join('resources', 'win') ] + ignoredPaths = ignoredPaths.map (ignoredPath) -> _.escapeRegExp(ignoredPath) + + # Put patterns here that shouldn't be escaped + ignoredPaths.push _.escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.pdb' + # Add .* to avoid matching hunspell_dictionaries. + ignoredPaths.push _.escapeRegExp(path.join('spellchecker', 'vendor', 'hunspell') + path.sep) + ".*" + # Hunspell dictionaries are only not needed on OS X. if process.platform is 'darwin' ignoredPaths.push path.join('spellchecker', 'vendor', 'hunspell_dictionaries') From bcc888bfb41f467f31a8d89c279ae9630416fec3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 16 Jun 2014 14:15:23 -0700 Subject: [PATCH 5/6] :lipstick: --- build/tasks/build-task.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index 028485933..ab8cbb768 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -61,10 +61,9 @@ module.exports = (grunt) -> ] ignoredPaths = ignoredPaths.map (ignoredPath) -> _.escapeRegExp(ignoredPath) - # Put patterns here that shouldn't be escaped - ignoredPaths.push _.escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.pdb' # Add .* to avoid matching hunspell_dictionaries. ignoredPaths.push _.escapeRegExp(path.join('spellchecker', 'vendor', 'hunspell') + path.sep) + ".*" + ignoredPaths.push _.escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.pdb' # Hunspell dictionaries are only not needed on OS X. if process.platform is 'darwin' From 416266b815bc9dcf2dde6881777ad62c4c28b2b4 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 16 Jun 2014 14:29:17 -0700 Subject: [PATCH 6/6] :lipstick: Use string interpolation --- build/tasks/build-task.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index ab8cbb768..1484b6a07 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -62,8 +62,8 @@ module.exports = (grunt) -> ignoredPaths = ignoredPaths.map (ignoredPath) -> _.escapeRegExp(ignoredPath) # Add .* to avoid matching hunspell_dictionaries. - ignoredPaths.push _.escapeRegExp(path.join('spellchecker', 'vendor', 'hunspell') + path.sep) + ".*" - ignoredPaths.push _.escapeRegExp(path.join('build', 'Release') + path.sep) + '.*\\.pdb' + ignoredPaths.push "#{_.escapeRegExp(path.join('spellchecker', 'vendor', 'hunspell') + path.sep)}.*" + ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.*\\.pdb" # Hunspell dictionaries are only not needed on OS X. if process.platform is 'darwin'