Index: Dev/trunk/Gruntfile.js
===================================================================
--- Dev/trunk/src/Gruntfile.js	(revision 462)
+++ Dev/trunk/Gruntfile.js	(revision 463)
@@ -6,54 +6,46 @@
  * can be distributed.
  */
-var fs = require('fs');
-var path = require('path');
 
 module.exports = function(grunt) {
 
-    var buildDir = '../build/';
-    var binDir = buildDir+'bin/';
-    var distDir = '../dist/';
+    var buildDir = 'build/';
+    var srcDir   = 'src/';
 
     grunt.initConfig({
         clean: {
             build: {
-                options: {
-                    force: true
-                },
-                src: [buildDir],
+                src: [buildDir]
+            }
+        },
+        coffee: {
+            options: {
+                bare: true
+            },
+            compile: {
+                files: [{
+                    expand: true,
+                    cwd: srcDir,
+                    src: ['client/qed-client/**/*.coffee', 'server/**/*.coffee'],
+                    dest: buildDir,
+                    ext: '.js'
+                }]
             }
         },
         copy: {
-            build: {
-                files: [
-                    {src: ['client/*.html'], dest: buildDir},
-                    {src: ['server/**', '!**/node_modules/**'], dest: buildDir},
-                    {src: ['qed-server.key', 'qed-server.pem'], dest: buildDir},
-                ]
-            },
-            dist: {
-                files: [
-                    {src: ['client/bin/'], dest: binDir},
-                    {src: ['server/**', '!**/node_modules/**'], dest: buildDir},
-                    {src: ['qed-server.key', 'qed-server.pem'], dest: buildDir},
-                ]
-            }
-        },
-        'curl-dir': {
-            dist: {
-                src: [
-                    'http://apache.xl-mirror.nl/couchdb/binary/win/1.3.0/setup-couchdb-1.3.0_R15B03-1.exe',
-                    'http://nodejs.org/dist/v0.10.10/node-v0.10.10-x86.msi'
-                ],
-                dest: binDir
+            compile: {
+                files: [{
+                    src: [srcDir+'**', '!**/*.coffee' ],
+                    dest: buildDir
+                }]
             }
         },
         dojo: {
             options: {
-                dojo: 'client/dojo/dojo.js',
+                dojo: srcDir+'client/dojo/dojo.js'
             },
             build: {
                 options: {
-                    profile: 'client/client.profile.js'
+                    profile: srcDir+'client/client.profile.js',
+                    releaseDir: buildDir
                 }
             }
@@ -61,20 +53,24 @@
         htmlhint: {
             options: {
-                htmlhintrc: ".htmlhintrc"
+                htmlhintrc: srcDir+".htmlhintrc"
             },
             compile: {
-                files: {
-                    src: ['client/*.html', 'client/qed-client/**.html']
-                }
+                files: [{
+                    expand: true,
+                    cwd: srcDir,
+                    src: ['client/*.html', 'client/qed-client/**/*.html']
+                }]
             }
         },
         jshint: {
             options: {
-                jshintrc: ".jshintrc"
+                jshintrc: srcDir+".jshintrc"
             },
             compile: {
-                files: {
-                    src: ['client/qed-client/**/*.js', 'server/**.js', '!**/node_modules/**']
-                }
+                files: [{
+                    expand: true,
+                    cwd: srcDir,
+                    src: ['client/qed-client/**/*.js', 'server/**.js']
+                }]
             }
         },
@@ -85,14 +81,11 @@
             },
             compile: {
-                files: {
-                    'client/qed-client/css/qed.css': 'client/qed-client/css/qed.less'
-                }
-            }
-        },
-        zip: {
-            dist: {
-                cwd: buildDir,
-                src: [buildDir+'**'],
-                dest: distDir+'qed-'+(new Date().toISOString())+'-x86.zip'
+                files: [{
+                    expand: true,
+                    cwd: srcDir,
+                    src: ['client/qed-client/css/qed.less'],
+                    dest: buildDir,
+                    ext: '.css'
+                }]
             }
         }
@@ -100,4 +93,5 @@
 
     grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks('grunt-contrib-coffee');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-jshint');
@@ -108,7 +102,7 @@
     grunt.loadNpmTasks('grunt-zip');
 
-    grunt.registerTask('compile', ['less:compile', 'jshint:compile', 'htmlhint:compile']);
-    grunt.registerTask('build', ['clean:build', 'compile', 'dojo:build', 'copy:build']);
-    grunt.registerTask('dist', ['build', 'copy:dist', 'curl-dir:dist', 'zip:dist']);
+    grunt.registerTask('compile', ['less:compile', 'jshint:compile', 'htmlhint:compile', 'coffee:compile', 'copy:compile']);
+    grunt.registerTask('build', ['clean:build', 'compile', 'dojo:build']);
+    grunt.registerTask('deploy', []);
     grunt.registerTask('default', ['compile']);
 
