Removing GPL license option since new/modified BSD is already GPL-com…

…patible.
requirejs · Oct 13, 2010 · 1d50f68 · 1d50f68
1 parent d81b12b
commit 1d50f68
Show file tree

Hide file tree

Showing 27 changed files with 51 additions and 143 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ RequireJS includes [an optimization tool](requirejs/tree/master/docs/optimizatio
 
 If the JavaScript file defines a JavaScript module via [require.def()](requirejs/tree/master/docs/api.md#define), then there are other benefits RequireJS can offer: [better CommonJS support](requirejs/tree/master/docs/commonjs.md) and [loading multiple versions](requirejs/tree/master/docs/api.md#multiversion) of a module in a page. RequireJS also allows for [module modifiers](requirejs/tree/master/docs/api.md#modifiers) and has a plugin system that supports features like [i18n string bundles](requirejs/tree/master/docs/api.md#i18n), [text file dependencies](requirejs/tree/master/docs/api.md#text), and [JSONP service dependencies](requirejs/tree/master/docs/api.md#jsonp).
 
-RequireJS does not have any dependencies on a JavaScript framework. It is tri-licensed -- BSD, MIT, and GPL.
+RequireJS does not have any dependencies on a JavaScript framework. It is dual-licensed -- new BSD or MIT.
 
 The standard require.js file is around 4.9KB when minified via Closure Compiler and gzipped. require.js can be built without some features, with the smallest option (just dependency tracking and simple module loading) weighing in at 3.9KB minified, gzipped.
 

diff --git a/build/build.js b/build/build.js
@@ -1,6 +1,6 @@
 /**
- * @license Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/convert/node/dist.js b/build/convert/node/dist.js
@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/convert/node/r-source.js b/build/convert/node/r-source.js
@@ -1,6 +1,6 @@
 /**
  * @license r.js Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/convert/node/requireAdapter.js b/build/convert/node/requireAdapter.js
@@ -1,6 +1,6 @@
 /**
  * @license RequireJS requireAdapter Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 /*jslint nomen: false */

diff --git a/build/jslib/build.js b/build/jslib/build.js
@@ -1,6 +1,6 @@
 /**
- * @license Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/jslib/commandLine.js b/build/jslib/commandLine.js
@@ -1,6 +1,6 @@
 /**
  * @license RequireJS Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/jslib/commonJs.js b/build/jslib/commonJs.js
@@ -1,6 +1,6 @@
 /**
  * @license RequireJS Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/jslib/fileUtil.js b/build/jslib/fileUtil.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 //Helper functions to deal with file I/O.

diff --git a/build/jslib/lang.js b/build/jslib/lang.js
@@ -1,6 +1,6 @@
 /**
- * @license Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/jslib/logger.js b/build/jslib/logger.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 var logger = {

diff --git a/build/jslib/optimize.js b/build/jslib/optimize.js
@@ -1,6 +1,6 @@
 /**
- * @license Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/jslib/parse.js b/build/jslib/parse.js
@@ -1,6 +1,6 @@
 /**
- * @license Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/jslib/pragma.js b/build/jslib/pragma.js
@@ -1,6 +1,6 @@
 /**
- * @license Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/build/jslib/requirePatch.js b/build/jslib/requirePatch.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 /*

diff --git a/build/tests/priority/webapp/scripts/require-jquery.js b/build/tests/priority/webapp/scripts/require-jquery.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 //laxbreak is true to allow build pragmas to change some statements.

diff --git a/dist/dist-build.sh b/dist/dist-build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-#@license RequireJS Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
-#Available via the MIT, GPL or new BSD license.
+#@license RequireJS Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+#Available via the MIT or new BSD license.
 #see: http://github.com/jrburke/requirejs for details
 
 #version should be something like 0.9.0beta or 0.9.0

diff --git a/dist/dist-site.js b/dist/dist-site.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 

diff --git a/require.js b/require.js
@@ -1,6 +1,6 @@
 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 //laxbreak is true to allow build pragmas to change some statements.

diff --git a/require/i18n.js b/require/i18n.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS i18n Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS i18n Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 /*jslint regexp: false, nomen: false, plusplus: false */

diff --git a/require/jsonp.js b/require/jsonp.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS jsonp Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS jsonp Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 /*jslint nomen: false, plusplus: false */

diff --git a/require/order.js b/require/order.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS order Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS order Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 /*jslint nomen: false, plusplus: false */

diff --git a/require/rhino.js b/require/rhino.js
@@ -1,6 +1,6 @@
 /**
  * @license RequireJS rhino Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 /*global require: false, readFile: false */

diff --git a/require/text.js b/require/text.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS text Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS text Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 /*jslint regexp: false, nomen: false, plusplus: false */

diff --git a/require/transportD.js b/require/transportD.js
@@ -1,6 +1,6 @@
 /**
- * @license RequireJS transportD Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
- * Available via the MIT, GPL or new BSD license.
+ * @license RequireJS transportD Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
 /*jslint  */

diff --git a/tasks.txt b/tasks.txt
@@ -19,6 +19,9 @@
 - in commonJs.js convert, if take out dependency scanning, things break in the Node adapter.
 Need to figure out why. Function.toString() seems to work.
 
+- Allow paths mapping inside modules? for things like jsdom/browser/index.js retrieved via
+  require("./jsdom/browser");
+
 - Build: do not require the user to be in the same directory as build file?
 - Build: if optimize the build profile file, Closure compiler complains. If put parens
   around the object, then it is OK. Decide if want to go that route or pure JSON route,