Skip to content

Commit

Permalink
Fixed issue #10 related to coffeescript 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
josephg committed May 15, 2011
1 parent 3177c08 commit 4ad2d16
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 23 deletions.
12 changes: 4 additions & 8 deletions Cakefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ task 'build', 'Build the .js files', (options) ->
throw err if err
console.log stdout + stderr

lib = [
]

client = [
'client/web-prelude'
'client/microevent'
Expand All @@ -23,6 +20,7 @@ client = [

# Backticks
e = (str, callback) ->
console.log str
exec str, (err, stdout, stderr) ->
throw err if err
out = stdout + stderr
Expand All @@ -47,11 +45,9 @@ compile = (infile, outfile) ->
task 'webclient', 'Build the web client into one file', ->
clientfiles = ("src/#{c}.coffee" for c in client).join ' '
# I would really rather do this in pure JS.
e "coffee -o webclient -cj #{clientfiles}", ->
e "cat #{lib.join ' '} webclient/concatenation.js >webclient/share.uncompressed.js", ->
e 'rm webclient/concatenation.js'
console.log "Building with closure's REST API..."
compile 'webclient/share.uncompressed.js', 'webclient/share.js'
e "coffee -j webclient/share.uncompressed.js -c #{clientfiles}", ->
console.log "Building with closure's REST API..."
compile 'webclient/share.uncompressed.js', 'webclient/share.js'

# TODO: This should also be closure compiled.
exec "coffee --compile --output webclient/ src/client/ace.coffee", (err, stdout, stderr) ->
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"socket.io": ">= 0.6.0",
"connect": ">= 1.1.1 < 2.0.0",
"coffee-script": "~1.0.0",
"coffee-script": "> 1.1.0",
"redis": "*",
"nodeunit": "~0.5.0"
},
Expand Down
8 changes: 4 additions & 4 deletions webclient/share.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 26 additions & 10 deletions webclient/share.uncompressed.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4ad2d16

Please sign in to comment.