add support for building with different versions of jquery depending on the branch

Author: Caolan McMahon

README.md

@@ -80,6 +80,15 @@ There are a number of pre-defined builds available:
 * default -  UI tools with jQuery
 * full - All tools with jquery
 
+To update the available builds, see the lib/packages.js file.
+
+
+## jQuery versions
+
+By default, the build server uses jQuery v1.4.2, but this can be overridden
+depending on the branch used for the build. The 'dev' branch uses jQuery v1.5.1, for
+example. To update these settings, see the lib/jquery_versions.js file.
+
 
 ## Adding another branch to the build server
 

deps/jquery-1.5.1.min.js

@@ -10,10 +10,8 @@ var jsp = require('../deps/UglifyJS/lib/parse-js'),
     git = require('./git'),
     fs = require('fs'),
     _path = require('path'),
-    packages = require('./packages');
-
-
-var JQUERY_FILE = __dirname + '/../deps/jquery-1.4.2.min.js';
+    packages = require('./packages'),
+    jquery_versions = require('./jquery_versions');
 
 
 /**
@@ -89,6 +87,19 @@ exports.exportAllMinified = function (wd, path, output_dir, callback) {
 };
 
 
+/**
+ * Returns the path to the correct jQuery file for the given branch.
+ *
+ * @param {String} branch
+ * @return {String}
+ * @api public
+ */
+
+exports.jQueryFile = function (branch) {
+    return jquery_versions.branches[branch] || jquery_versions.defaultFile;
+};
+
+
 /**
  * Concatenates a list of files from a version and returns the result.
  *
@@ -123,7 +134,8 @@ exports.concat = function (version, files, include_jquery, callback) {
             licenses.compile(version, files, function (err, l) {
                 if (err) return callback(err);
                 if (include_jquery) {
-                    fs.readFile(JQUERY_FILE, function (err, content) {
+                    var jqfile = exports.jQueryFile(version);
+                    fs.readFile(jqfile, function (err, content) {
                         if (err) callback(err);
                         callback(null, l + content.toString() + src);
                     });

lib/builder.js

@@ -0,0 +1,9 @@
+exports.defaultFile = __dirname + '/../deps/jquery-1.4.2.min.js';
+
+/**
+ * Only need to specify other version here if its not the default
+ */
+
+exports.branches = {
+    'dev': __dirname + '/../deps/jquery-1.5.1.min.js'
+};