From a84512f9cfb796464e6e9ce4fc5d4a6d4f386635 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=CC=88rn=20Zaefferer?= Date: Wed, 21 Mar 2012 21:19:31 +0100 Subject: [PATCH] Build/grunt: Use rimraf for clean task. Fix cop_hemes task to correctly rename the -custom.css file --- grunt.js | 8 ++------ package.json | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/grunt.js b/grunt.js index 83522ebb4..37f2d9178 100644 --- a/grunt.js +++ b/grunt.js @@ -446,7 +446,7 @@ task.registerTask( "copy_themes", function() { // TODO the template.process call shouldn't be necessary var target = "dist/" + template.process( config( "files.themes" ), config() ) + "/"; files.forEach(function( fileName ) { - var targetFile = fileName.replace( /dist\/tmp\/\d+\/development-bundle\//, "" ).replace( "jquery-ui-.custom", "jquery-ui.css" ); + var targetFile = fileName.replace( /dist\/tmp\/\d+\/development-bundle\//, "" ).replace( "jquery-ui-.custom", "jquery-ui" ); file.copy( fileName, target + targetFile ); }); @@ -460,11 +460,7 @@ task.registerTask( "copy_themes", function() { }); task.registerTask( "clean", function() { - // TODO use node methods and keep the dir, only delete its content - utils.spawn({ - cmd: "rm", - args: [ "-rf", "dist" ] - }, this.async()); + require( "rimraf" ).sync( "dist" ); }); // TODO merge with code in jQuery Core, share as grunt plugin/npm diff --git a/package.json b/package.json index 02d7a1173..de297f467 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "sqwish": "0.2.x", "request": "2.9.x", "csslint": "0.9.x", - "adm-zip": "0.1.x" + "adm-zip": "0.1.x", + "rimraf": "2.0.1" }, "keywords": [] } \ No newline at end of file -- 2.39.5