Updating to requirejs 0.25.0, update r.js version number for release,…

… create a version capture for the dist directory.
requirejs · Jul 12, 2011 · 3579f46 · 3579f46
1 parent bf38040
commit 3579f46
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 24,471 deletions.
diff --git a/build/jslib/x.js b/build/jslib/x.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 0.24.0+ Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license r.js 0.25.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -20,7 +20,7 @@ var requirejs, require, define;
 
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists,
-        version = '0.24.0+',
+        version = '0.25.0',
         jsSuffixRegExp = /\.js$/,
         //Indicates so build/build.js that the modules for the optimizer
         //are built-in.

diff --git a/dist/r-20110629.js → dist/r-0.25.0.js b/dist/r-20110629.js → dist/r-0.25.0.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 0.24.0+ Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license r.js 0.25.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -20,7 +20,7 @@ var requirejs, require, define;
 
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists,
-        version = '0.24.0+',
+        version = '0.25.0',
         jsSuffixRegExp = /\.js$/,
         //Indicates so build/build.js that the modules for the optimizer
         //are built-in.
@@ -103,7 +103,7 @@ var requirejs, require, define;
     }
 
     /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 0.24.0+ Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 0.25.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -115,7 +115,7 @@ var requirejs, require, define;
 
 (function () {
     //Change this version number for each release.
-    var version = "0.24.0+",
+    var version = "0.25.0",
         commentRegExp = /(\/\*([\s\S]*?)\*\/|\/\/(.*)$)/mg,
         cjsRequireRegExp = /require\(["']([^'"\s]+)["']\)/g,
         currDirRegExp = /^\.\//,
@@ -2967,6 +2967,10 @@ define('logger', ['env!env/print'], function (print) {
         level: 0,
         logPrefix: "",
 
+        logLevel: function( level ) {
+            this.level = level;
+        },
+
         trace: function (message) {
             if (this.level <= this.TRACE) {
                 this._print(message);
@@ -7464,6 +7468,10 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
         config = build.createConfig(cmdConfig);
         paths = config.paths;
 
+        if ( config.logLevel ) {
+            logger.logLevel( config.logLevel );
+        }
+
         if (!config.out && !config.cssIn) {
             //This is not just a one-off file build but a full build profile, with
             //lots of files to process.