Merge branch 'master' into selectmenu

2 files changed, 3 insertions, 52 deletions

diff --git a/build/tasks/build.js b/build/tasks/build.js
index c50745899..cdc03bd60 100644
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -2,21 +2,6 @@ module.exports = function( grunt ) {
 
 "use strict";
 
-var fs = require( "fs" );
-
-function expandFiles( files ) {
-	return grunt.util._.pluck( grunt.file.expandMapping( files ), "src" ).filter(function(filepath) {
-		// restrict to files, exclude folders
-		try {
-			return fs.statSync( filepath[ 0 ] ).isFile();
-		} catch(e) {
-			throw grunt.task.taskError(e.message, e);
-		}
-	}).map(function( values ) {
-		return values[ 0 ];
-	});
-}
-
 grunt.registerTask( "manifest", "Generate jquery.json manifest files", function() {
 	var pkg = grunt.config( "pkg" ),
 		base = {
@@ -96,41 +81,6 @@ grunt.registerTask( "manifest", "Generate jquery.json manifest files", function(
 	});
 });
 
-grunt.registerMultiTask( "copy", "Copy files to destination folder and replace @VERSION with pkg.version", function() {
-	function replaceVersion( source ) {
-		return source.replace( /@VERSION/g, grunt.config( "pkg.version" ) );
-	}
-	function copyFile( src, dest ) {
-		if ( /(js|css)$/.test( src ) ) {
-			grunt.file.copy( src, dest, {
-				process: replaceVersion
-			});
-		} else {
-			grunt.file.copy( src, dest );
-		}
-	}
-	var files = expandFiles( this.filesSrc ),
-		target = this.data.dest + "/",
-		strip = this.data.strip,
-		renameCount = 0,
-		fileName;
-	if ( typeof strip === "string" ) {
-		strip = new RegExp( "^" + grunt.template.process( strip, grunt.config() ).replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ) );
-	}
-	files.forEach(function( fileName ) {
-		var targetFile = strip ? fileName.replace( strip, "" ) : fileName;
-		copyFile( fileName, target + targetFile );
-	});
-	grunt.log.writeln( "Copied " + files.length + " files." );
-	for ( fileName in this.data.renames ) {
-		renameCount += 1;
-		copyFile( fileName, target + grunt.template.process( this.data.renames[ fileName ], grunt.config() ) );
-	}
-	if ( renameCount ) {
-		grunt.log.writeln( "Renamed " + renameCount + " files." );
-	}
-});
-
 grunt.registerTask( "clean", function() {
 	require( "rimraf" ).sync( "dist" );
 });
diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index 16d213e4b..86a06a69d 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -42,12 +42,13 @@ function submit( commit, runs, configFile, extra, done ) {
 		commitUrl = "https://github.com/jquery/jquery-ui/commit/" + commit;
 
 	if ( extra ) {
-		extra = " " + extra;
+		extra = " (" + extra + ")";
 	}
 
 	for ( testName in runs ) {
 		runs[ testName ] = config.testUrl + commit + "/tests/unit/" + runs[ testName ];
 	}
+
 	testswarm.createClient({
 		url: config.swarmUrl,
 		pollInterval: 10000,
@@ -59,7 +60,7 @@ function submit( commit, runs, configFile, extra, done ) {
 		token: config.authToken
 	})
 	.addjob({
-		name: "jQuery UI #<a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra,
+		name: "Commit <a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra,
 		runs: runs,
 		runMax: config.runMax,
 		browserSets: config.browserSets