Fix build until next grunt rc, disable compare_size.

diff --git a/Gruntfile.js b/Gruntfile.js
index f88eaeff6fcbd87d2100a0ff571a92658b0f5ebb..945b1aeff636f4107eb77f82ab009632fa27c182 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -22,40 +22,42 @@ module.exports = function( grunt ) {
                        files: distpaths
                },
                selector: {
-                       "src/selector.js": [
-                               "src/sizzle-jquery.js",
-                               "src/sizzle/sizzle.js"
-                       ]
+                       destFile: "src/selector.js",
+                       apiFile: "src/sizzle-jquery.js",
+                       srcFile: "src/sizzle/sizzle.js"
                },
                build: {
-                       "dist/jquery.js": [
-                               "src/intro.js",
-                               "src/core.js",
-                               "src/callbacks.js",
-                               "src/deferred.js",
-                               "src/support.js",
-                               "src/data.js",
-                               "src/queue.js",
-                               "src/attributes.js",
-                               "src/event.js",
-                               "src/selector.js",
-                               "src/traversing.js",
-                               "src/manipulation.js",
-
-                               { flag: "css", src: "src/css.js" },
-                               "src/serialize.js",
-                               { flag: "ajax", src: "src/ajax.js" },
-                               { flag: "ajax/script", src: "src/ajax/script.js", needs: ["ajax"]  },
-                               { flag: "ajax/jsonp", src: "src/ajax/jsonp.js", needs: [ "ajax", "ajax/script" ]  },
-                               { flag: "ajax/xhr", src: "src/ajax/xhr.js", needs: ["ajax"]  },
-                               { flag: "effects", src: "src/effects.js", needs: ["css"] },
-                               { flag: "offset", src: "src/offset.js", needs: ["css"] },
-                               { flag: "dimensions", src: "src/dimensions.js", needs: ["css"] },
-                               { flag: "deprecated", src: "src/deprecated.js" },
-
-                               "src/exports.js",
-                               "src/outro.js"
-                       ]
+                       all:{
+                               dest: "dist/jquery.js",
+                               src: [
+                                       "src/intro.js",
+                                       "src/core.js",
+                                       "src/callbacks.js",
+                                       "src/deferred.js",
+                                       "src/support.js",
+                                       "src/data.js",
+                                       "src/queue.js",
+                                       "src/attributes.js",
+                                       "src/event.js",
+                                       "src/selector.js",
+                                       "src/traversing.js",
+                                       "src/manipulation.js",
+
+                                       { flag: "css", src: "src/css.js" },
+                                       "src/serialize.js",
+                                       { flag: "ajax", src: "src/ajax.js" },
+                                       { flag: "ajax/script", src: "src/ajax/script.js", needs: ["ajax"]  },
+                                       { flag: "ajax/jsonp", src: "src/ajax/jsonp.js", needs: [ "ajax", "ajax/script" ]  },
+                                       { flag: "ajax/xhr", src: "src/ajax/xhr.js", needs: ["ajax"]  },
+                                       { flag: "effects", src: "src/effects.js", needs: ["css"] },
+                                       { flag: "offset", src: "src/offset.js", needs: ["css"] },
+                                       { flag: "dimensions", src: "src/dimensions.js", needs: ["css"] },
+                                       { flag: "deprecated", src: "src/deprecated.js" },
+
+                                       "src/exports.js",
+                                       "src/outro.js"
+                               ]
+                       }
                },
 
                jshint: {
@@ -143,15 +145,15 @@ module.exports = function( grunt ) {
        });
 
        // Build src/selector.js
-       grunt.registerMultiTask( "selector", "Build src/selector.js", function() {
+       grunt.registerTask( "selector", "Build src/selector.js", function() {
 
-               var name = this.file.dest,
-                               files = this.file.src,
-                               sizzle = {
-                                       api: grunt.file.read( files[0] ),
-                                       src: grunt.file.read( files[1] )
-                               },
-                               compiled, parts;
+               var cfg = grunt.config("selector"),
+                       name = cfg.destFile,
+                       sizzle = {
+                               api: grunt.file.read( cfg.apiFile ),
+                               src: grunt.file.read( cfg.srcFile )
+                       },
+                       compiled, parts;
 
                /**
 
@@ -241,13 +243,14 @@ module.exports = function( grunt ) {
                "build",
                "Concatenate source (include/exclude modules with +/- flags), embed date/version",
                function() {
+
                        // Concat specified files.
                        var compiled = "",
                                modules = this.flags,
                                optIn = !modules["*"],
                                explicit = optIn || Object.keys(modules).length > 1,
-                               name = this.file.dest,
-                               src = this.file.srcRaw,
+                               name = this.data.dest,
+                               src = this.data.src,
                                deps = {},
                                excluded = {},
                                version = grunt.config( "pkg.version" ),
@@ -479,7 +482,7 @@ module.exports = function( grunt ) {
        grunt.loadNpmTasks("grunt-contrib-uglify");
 
        // Default grunt
-       grunt.registerTask( "default", [ "update_submodules", "selector", "build:*:*", "jshint", "uglify", "dist:*", "compare_size" ] );
+       grunt.registerTask( "default", [ "update_submodules", "selector", "build:*:*", "jshint", "uglify", "dist:*" ] );
 
        // Short list as a high frequency watch task
        grunt.registerTask( "dev", [ "selector", "build:*:*", "jshint" ] );

diff --git a/package.json b/package.json
index f0c9845f07caaafd48840b7728b2d9da16c32cec..1d8b16fb48bc7021af9eb3706417cec667942a23 100644 (file)
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
        "name": "jquery",
        "title": "jQuery",
        "description": "JavaScript library for DOM operations",
-       "version": "2.0.0pre",
+       "version": "1.9.1pre",
        "homepage": "http://jquery.com",
        "author": {
                "name": "jQuery Foundation and other contributors",
@@ -29,10 +29,9 @@
                "grunt-compare-size": "~0.3.0",
                "grunt-git-authors": "~1.1.0",
                "grunt-update-submodules": "~0.2.0",
-               "grunt-contrib-watch": "~0.2.0",
-               "grunt-contrib-jshint": "git://github.com/gruntjs/grunt-contrib-jshint.git#7fd70e86c5a8d489095fa81589d95dccb8eb3a46",
-               "grunt-contrib-uglify": "git://github.com/gruntjs/grunt-contrib-uglify.git#f8da4ff90c7e8f74c81d8e5d3834e6011a90611c",
-               "grunt-cli": "~0.1.0",
+               "grunt-contrib-watch": "~0.1.1",
+               "grunt-contrib-jshint": "~0.1.1",
+               "grunt-contrib-uglify": "~0.1.1",
                "grunt": "0.4.0rc4",
                "testswarm": "0.2.2"
        },