Skip to content
Permalink
Browse files

Fixes update submodule task for windows (uses an npm based task)

  • Loading branch information...
jaubourg committed Oct 15, 2012
1 parent cb67571 commit d01253e20158f53c08aa6bc0c1cf66806cd19148
Showing with 3 additions and 30 deletions.
  1. +2 −30 grunt.js
  2. +1 −0 package.json
@@ -123,14 +123,15 @@ module.exports = function( grunt ) {
});

// Default grunt.
grunt.registerTask( "default", "submodules selector build:*:* lint min dist:* compare_size" );
grunt.registerTask( "default", "update_submodules selector build:*:* lint min dist:* compare_size" );

// Short list as a high frequency watch task
grunt.registerTask( "dev", "selector build:*:* lint" );

// Load grunt tasks from NPM packages
grunt.loadNpmTasks( "grunt-compare-size" );
grunt.loadNpmTasks( "grunt-git-authors" );
grunt.loadNpmTasks( "grunt-update-submodules" );

grunt.registerTask( "testswarm", function( commit, configFile ) {
var testswarm = require( "testswarm" ),
@@ -381,35 +382,6 @@ module.exports = function( grunt ) {
log.writeln( "File '" + name + "' created." );
});

grunt.registerTask( "submodules", function() {
var done = this.async(),
// change pointers for submodules and update them to what is specified in jQuery
// --merge doesn't work when doing an initial clone, thus test if we have non-existing
// submodules, then do an real update
cmd = "if [ -d .git ]; then \n" +
"if git submodule status | grep -q -E '^-'; then \n" +
"git submodule update --init --recursive; \n" +
"else \n" +
"git submodule update --init --recursive --merge; \n" +
"fi; \n" +
"fi;";

grunt.verbose.write( "Updating submodules..." );

child_process.exec( cmd, function( err, stdout, stderr ) {
if ( stderr ) {
console.log(stderr);
grunt.verbose.error();
done( stderr );
return;
}

grunt.log.writeln( stdout );

done();
});
});

// Allow custom dist file locations
grunt.registerTask( "dist", function() {
var flags, paths, stored;
@@ -25,6 +25,7 @@
"devDependencies": {
"grunt-compare-size": ">=0.1.0",
"grunt-git-authors": ">=1.0.0",
"grunt-update-submodules": ">=0.1.0",
"grunt": "~0.3.9",
"testswarm": "0.2.2"
},

0 comments on commit d01253e

Please sign in to comment.
You can’t perform that action at this time.