Changeset 453

Timestamp:

06/09/13 00:50:34 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Building is working and builds work.

Location:

Dev/trunk

Files:

• . (modified) (1 prop)
• build (deleted)
• src/Gruntfile.js (modified) (5 diffs)
• src/client (modified) (1 prop)
• src/client/client.profile.js (added)
• src/package.json (modified) (1 diff)

Dev/trunk

@@ -1 @@
-nbproject
+build

@@ -1 @@
-nbproject
+build

Dev/trunk/src/Gruntfile.js

@@ +1 @@
+/***************************************
+ * This Gruntfile is organized with two phases,
+ * compile and build. Compile will lint HTML,
+ * JavaScript and compile LESS. The build phase
+ * creates an optimized stand-alone build that
+ * can be distributed.
+ */
 var fs = require('fs');
 var path = require('path');
@@ -4 +11 @@
 module.exports = function(grunt) {
 
+    var buildDir = '../build/';
+
     grunt.initConfig({
-        //pkg: grunt.file.readJSON('package.json'),
-        less: {
+        copy: {
+            build: {
+                files: [
+                    {src: ['client/*.html'], dest: buildDir},
+                    {src: ['server/**', '!**/node_modules/**'], dest: buildDir},
+                    {src: ['qed-server.key', 'qed-server.pem'], dest: buildDir},
+                ]
+            }
+        },
+        dojo: {
             options: {
-                strictImports: false,
-                dumpLineNumbers: "all"
+                dojo: 'client/dojo/dojo.js',
             },
-            all: {
+            build: {
+                options: {
+                    profile: 'client/client.profile.js'
+                }
+            }
+        },
+        htmlhint: {
+            options: {
+                htmlhintrc: ".htmlhintrc"
+            },
+            compile: {
                 files: {
-                    'client/qed-client/css/qed.css': 'client/qed-client/css/qed.less'
+                    src: ['client/*.html', 'client/qed-client/**.html']
                 }
             }
@@ -21 +47 @@
                 jshintrc: ".jshintrc"
             },
-            all: {
+            compile: {
                 files: {
                     src: ['client/qed-client/**/*.js', 'server/**.js', '!**/node_modules/**']
@@ -27 +53 @@
             }
         },
-        htmlhint: {
+        less: {
             options: {
-                htmlhintrc: ".htmlhintrc"
+                strictImports: false,
+                dumpLineNumbers: "all"
             },
-            all: {
+            compile: {
                 files: {
-                    src: ['*.html', 'client/qed-client/**.html', '!**/node_modules/**']
+                    'client/qed-client/css/qed.css': 'client/qed-client/css/qed.less'
                 }
             }
@@ -39 +66 @@
     });
 
+    grunt.loadNpmTasks('grunt-contrib-copy');
+    grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-less');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
+    grunt.loadNpmTasks('grunt-dojo');
     grunt.loadNpmTasks('grunt-htmlhint');
 
-    grunt.registerTask('default', ['less', 'jshint', 'htmlhint']);
+    grunt.registerTask('compile', ['less:compile', 'jshint:compile', 'htmlhint:compile']);
+    grunt.registerTask('build', ['compile', 'dojo:build', 'copy:build']);
+    grunt.registerTask('default', ['compile']);
+
 };

Dev/trunk/src/package.json

@@ -5 +5 @@
   "devDependencies": {
     "grunt": "~0.4.0",
+    "grunt-contrib-copy": "~0.4.1",
+    "grunt-contrib-jshint": "~0.2.0",
     "grunt-contrib-less": "~0.5.0",
-    "grunt-contrib-jshint": "~0.2.0",
+    "grunt-dojo": "~0.2.3",
+    "grunt-exec": "~0.4.1",
     "grunt-htmlhint": "~0.4.0"
   }

@@ -1 @@
-nbproject
+build