make grunt updated

Gruntfile.js

+/*jslint indent: 2, maxlen: 80 */
+/*global module */
+
 module.exports = function (grunt) {
   "use strict";
 
   // Project configuration.
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
-    uglify: {
-      options: {
-        banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
-      },
-      jio: {
-        src: 'jio.js', // '<%= pkg.name %>.js'
-        dest: 'jio.min.js',
-      }
-    },
     jslint: {
+      grunt: {
+        src: ['Gruntfile.js'],
+        options: {
+          errorsOnly: true
+        }
+      },
       jio: {
         src: ['src/jio/**/*.js'],
         exclude: ['src/jio/intro.js', 'src/jio/outro.js'],
         options: {
-          errorsOnly: true,
+          errorsOnly: true
+        }
+      },
+      jio_storages: {
+        src: ['src/jio.storage/**/*.js'],
+        options: {
+          errorsOnly: true
         }
       },
       tests: {
         src: ['test/**/*.js'],
         options: {
-          errorsOnly: true,
+          errorsOnly: true
+        }
+      },
+      queries: {
+        src: ['src/queries/core/**/*.js'],
+        exclude: [
+          'src/queries/begin.js',
+          'src/queries/end.js',
+          'src/queries/parser-begin.js',
+          'src/queries/parser-end.js'
+        ],
+        options: {
+          errorsOnly: true
         }
       }
-      // queries: {
-      //   src: ['src/queries/**/*.js'],
-      //   exclude: ['src/queries/begin.js', 'src/queries/end.js']
-      // }
     },
     concat: {
       jio: {
-        //banner: 'src/jio/intro.js',
-        //footer: 'src/j',
         src: [
           'src/jio/intro.js',
           'src/jio/core/**/*.js',
           'src/jio/features/**/*.js',
-          'src/jio/outro.js',
+          'src/jio/outro.js'
+        ],
+        dest: 'jio.js'
+      },
+      queries: {
+        src: [
+          'src/queries/begin.js',
+          'src/queries/parser-begin.js',
+          'src/queries/build/parser.js',
+          'src/queries/parser-end.js',
+          'src/queries/core/**/*.js',
+          'src/queries/end.js'
         ],
-        dest: 'jio.js',
+        dest: 'complex_queries.js'
       }
     },
-    qunit: {
-      files: ['test/tests.html'], // grunt doesn't like requirejs
+    uglify: {
+      options: {
+        banner: '/*! <%= pkg.name %> <%= pkg.version %> ' +
+          '<%= grunt.template.today("yyyy-mm-dd") %> */\n'
+      },
+      jio: {
+        src: 'jio.js', // '<%= pkg.name %>.js'
+        dest: 'jio.min.js'
+      },
+      queries: {
+        src: 'complex_queries.js',
+        dest: 'complex_queries.min.js'
+      }
     },
+    qunit: {
+      // grunt doesn't like requirejs
+      // phantomjs daesn't know Blobs !!
+      files: ['test/tests.html']
+    }
   });
 
   grunt.loadNpmTasks('grunt-jslint');

Makefile

@@ -6,14 +6,15 @@ JIO         = jio.js
 JIO_MIN     = jio.min.js
 COMPLEX     = complex_queries.js
 COMPLEX_MIN = complex_queries.min.js
-PARSER_PAR  = $(QUERIES_DIR)/parser.par
-PARSER_OUT  = $(QUERIES_DIR)/parser.js
+PARSER_PAR  = $(QUERIES_DIR)/core/parser.par
+PARSER_OUT  = $(QUERIES_DIR)/build/parser.js
 
 JSCC_CMD   	= node ./node_modules/jscc-node/jscc.js -t ./node_modules/jscc-node/driver_node.js_
 
 auto: compile
 
 compile:
+	mkdir -p $(dir $(PARSER_OUT))
 	$(JSCC_CMD) -o $(PARSER_OUT) $(PARSER_PAR)
 
 .phony: clean