From c2a43f70f2eb443b8a5eb76c3aa1109f3449ae47 Mon Sep 17 00:00:00 2001 From: Michael Ficarra Date: Fri, 5 Aug 2011 18:39:55 -0400 Subject: [PATCH] moved `src/coffee-script/*.coffee` to `src` as per discussion in #1246 --- Cakefile | 13 ++++++------- src/{coffee-script => }/browser.coffee | 0 src/{coffee-script => }/cake.coffee | 0 src/{coffee-script => }/coffee-script.coffee | 0 src/{coffee-script => }/command.coffee | 0 src/{coffee-script => }/grammar.coffee | 0 src/{coffee-script => }/helpers.coffee | 0 src/{coffee-script => }/index.coffee | 0 src/{coffee-script => }/lexer.coffee | 0 src/{coffee-script => }/nodes.coffee | 0 src/{coffee-script => }/optparse.coffee | 0 src/{coffee-script => }/repl.coffee | 0 src/{coffee-script => }/rewriter.coffee | 0 src/{coffee-script => }/scope.coffee | 0 14 files changed, 6 insertions(+), 7 deletions(-) rename src/{coffee-script => }/browser.coffee (100%) rename src/{coffee-script => }/cake.coffee (100%) rename src/{coffee-script => }/coffee-script.coffee (100%) rename src/{coffee-script => }/command.coffee (100%) rename src/{coffee-script => }/grammar.coffee (100%) rename src/{coffee-script => }/helpers.coffee (100%) rename src/{coffee-script => }/index.coffee (100%) rename src/{coffee-script => }/lexer.coffee (100%) rename src/{coffee-script => }/nodes.coffee (100%) rename src/{coffee-script => }/optparse.coffee (100%) rename src/{coffee-script => }/repl.coffee (100%) rename src/{coffee-script => }/rewriter.coffee (100%) rename src/{coffee-script => }/scope.coffee (100%) diff --git a/Cakefile b/Cakefile index deb1dbce..ce909544 100644 --- a/Cakefile +++ b/Cakefile @@ -22,11 +22,9 @@ header = """ """ sources = [ - 'coffee-script.coffee', 'grammar.coffee' - 'helpers.coffee', 'lexer.coffee', 'nodes.coffee' - 'rewriter.coffee', 'scope.coffee' -].map (filename) -> - 'src/coffee-script/' + filename + 'coffee-script', 'grammar', 'helpers' + 'lexer', 'nodes', 'rewriter', 'scope' +].map (filename) -> "src/#{filename}.coffee" # Run a CoffeeScript through our node/coffee interpreter. run = (args, cb) -> @@ -64,7 +62,8 @@ task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options) task 'build', 'build the CoffeeScript language from source', build = (cb) -> files = fs.readdirSync 'src' - run ['-c', '-o', 'lib', 'src'] + files = ('src/' + file for file in files when file.match(/\.coffee$/)) + run ['-c', '-o', 'lib/coffee-script'].concat(files), cb task 'build:full', 'rebuild the source twice, and run the tests', -> @@ -116,7 +115,7 @@ task 'doc:site', 'watch and continually rebuild the documentation for the websit task 'doc:source', 'rebuild the internal documentation', -> - exec 'docco src/coffee-script/*.coffee && cp -rf docs documentation && rm -r docs', (err) -> + exec 'docco src/*.coffee && cp -rf docs documentation && rm -r docs', (err) -> throw err if err diff --git a/src/coffee-script/browser.coffee b/src/browser.coffee similarity index 100% rename from src/coffee-script/browser.coffee rename to src/browser.coffee diff --git a/src/coffee-script/cake.coffee b/src/cake.coffee similarity index 100% rename from src/coffee-script/cake.coffee rename to src/cake.coffee diff --git a/src/coffee-script/coffee-script.coffee b/src/coffee-script.coffee similarity index 100% rename from src/coffee-script/coffee-script.coffee rename to src/coffee-script.coffee diff --git a/src/coffee-script/command.coffee b/src/command.coffee similarity index 100% rename from src/coffee-script/command.coffee rename to src/command.coffee diff --git a/src/coffee-script/grammar.coffee b/src/grammar.coffee similarity index 100% rename from src/coffee-script/grammar.coffee rename to src/grammar.coffee diff --git a/src/coffee-script/helpers.coffee b/src/helpers.coffee similarity index 100% rename from src/coffee-script/helpers.coffee rename to src/helpers.coffee diff --git a/src/coffee-script/index.coffee b/src/index.coffee similarity index 100% rename from src/coffee-script/index.coffee rename to src/index.coffee diff --git a/src/coffee-script/lexer.coffee b/src/lexer.coffee similarity index 100% rename from src/coffee-script/lexer.coffee rename to src/lexer.coffee diff --git a/src/coffee-script/nodes.coffee b/src/nodes.coffee similarity index 100% rename from src/coffee-script/nodes.coffee rename to src/nodes.coffee diff --git a/src/coffee-script/optparse.coffee b/src/optparse.coffee similarity index 100% rename from src/coffee-script/optparse.coffee rename to src/optparse.coffee diff --git a/src/coffee-script/repl.coffee b/src/repl.coffee similarity index 100% rename from src/coffee-script/repl.coffee rename to src/repl.coffee diff --git a/src/coffee-script/rewriter.coffee b/src/rewriter.coffee similarity index 100% rename from src/coffee-script/rewriter.coffee rename to src/rewriter.coffee diff --git a/src/coffee-script/scope.coffee b/src/scope.coffee similarity index 100% rename from src/coffee-script/scope.coffee rename to src/scope.coffee