Build: Move all external libraries to external directory

Closes gh-1593 Conflicts: Gruntfile.js test/index.html
jquery · Jun 25, 2014 · 72e6192 · 72e6192
1 parent 62f7f7b
commit 72e6192
Show file tree

Hide file tree

Showing 17 changed files with 71 additions and 55 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -1,5 +1,5 @@
 {
 	"preset": "jquery",
 
-	"excludeFiles": [ "src/intro.js", "src/outro.js", "src/sizzle/**/*" ]
+	"excludeFiles": [ "external", "src/intro.js", "src/outro.js" ]
 }
diff --git a/.jshintignore b/.jshintignore
@@ -1,7 +1,6 @@
+external
 src/intro.js
 src/outro.js
-src/sizzle/**/*
-test/libs/**/*
 test/data/jquery-1.9.1.js
 test/data/badcall.js
 test/data/badjson.js

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -45,23 +45,23 @@ module.exports = function( grunt ) {
 			}
 		},
 		bowercopy: {
-			options: {
-				clean: true
-			},
-			src: {
-				files: {
-					"src/sizzle/dist": "sizzle/dist"
-				}
-			},
-			tests: {
+			all: {
 				options: {
-					destPrefix: "test/libs"
+					clean: true,
+					destPrefix: "external"
 				},
 				files: {
-					"qunit": "qunit/qunit",
-					"require.js": "requirejs/require.js",
+					"sizzle/dist": "sizzle/dist",
+
+					"qunit/qunit.js": "qunit/qunit/qunit.js",
+					"qunit/qunit.css": "qunit/qunit/qunit.css",
+					"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
+
+					"requirejs/require.js": "requirejs/require.js",
+
 					"sinon/fake_timers.js": "sinon/lib/sinon/util/fake_timers.js",
-					"sinon/timers_ie.js": "sinon/lib/sinon/util/timers_ie.js"
+					"sinon/timers_ie.js": "sinon/lib/sinon/util/timers_ie.js",
+					"sinon/LICENSE.txt": "sinon/LICENSE"
 				}
 			}
 		},

diff --git a/build/ensure-sizzle.js b/build/ensure-sizzle.js
@@ -1,6 +1,6 @@
 var fs = require( "fs" ),
 	bower = require( "grunt-bowercopy/node_modules/bower" ),
-	sizzleLoc = __dirname + "/../src/sizzle/dist/sizzle.js",
+	sizzleLoc = __dirname + "/../external/sizzle/dist/sizzle.js",
 	rversion = /Engine v(\d+\.\d+\.\d+(?:-\w+)?)/;
 
 /**

diff --git a/build/tasks/build.js b/build/tasks/build.js
@@ -26,7 +26,7 @@ module.exports = function( grunt ) {
 				endFile: "src/outro.js"
 			},
 			paths: {
-				sizzle: "sizzle/dist/sizzle"
+				sizzle: "../external/sizzle/dist/sizzle"
 			},
 			rawText: {},
 			onBuildWrite: convert

diff --git a/external/qunit/MIT-LICENSE.txt b/external/qunit/MIT-LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright 2013 jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/test/libs/qunit/qunit.css → external/qunit/qunit.css b/test/libs/qunit/qunit.css → external/qunit/qunit.css
diff --git a/test/libs/qunit/qunit.js → external/qunit/qunit.js b/test/libs/qunit/qunit.js → external/qunit/qunit.js
diff --git a/test/libs/require.js → external/requirejs/require.js b/test/libs/require.js → external/requirejs/require.js
diff --git a/external/sinon/LICENSE.txt b/external/sinon/LICENSE.txt
@@ -0,0 +1,27 @@
+(The BSD License)
+
+Copyright (c) 2010-2013, Christian Johansen, [email protected]
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of Christian Johansen nor the names of his contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/test/libs/sinon/fake_timers.js → external/sinon/fake_timers.js b/test/libs/sinon/fake_timers.js → external/sinon/fake_timers.js
diff --git a/src/sizzle/dist/sizzle.js → external/sizzle/dist/sizzle.js b/src/sizzle/dist/sizzle.js → external/sizzle/dist/sizzle.js
diff --git a/src/sizzle/dist/sizzle.min.js → external/sizzle/dist/sizzle.min.js b/src/sizzle/dist/sizzle.min.js → external/sizzle/dist/sizzle.min.js
diff --git a/src/sizzle/dist/sizzle.min.map → external/sizzle/dist/sizzle.min.map b/src/sizzle/dist/sizzle.min.map → external/sizzle/dist/sizzle.min.map
diff --git a/test/index.html b/test/index.html
@@ -4,7 +4,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
 	<title>jQuery Test Suite</title>
-	<link rel="Stylesheet" media="screen" href="libs/qunit/qunit.css" />
+	<link rel="Stylesheet" media="screen" href="../external/qunit/qunit.css" />
 	<link rel="Stylesheet" media="screen" href="data/testsuite.css" />
 	<!-- Includes -->
 
@@ -14,10 +14,10 @@
 	-->
 	<script src="data/jquery-1.9.1.js"></script>
 
-	<script src="libs/qunit/qunit.js"></script>
-	<script src="libs/require.js"></script>
-	<script src="libs/sinon/fake_timers.js"></script>
-	<script src="libs/sinon/timers_ie.js"></script>
+  <script src="../external/qunit/qunit.js"></script>
+  <script src="../external/requirejs/require.js"></script>
+  <script src="../external/sinon/fake_timers.js"></script>
+	<script src="../external/sinon/timers_ie.js"></script>
 	<!-- See testinit for the list of tests -->
 	<script src="data/testinit.js"></script>
 

diff --git a/test/jquery.js b/test/jquery.js
@@ -32,7 +32,7 @@
 		require.config({
 			baseUrl: path,
 			paths: {
-				sizzle: "src/sizzle/dist/sizzle"
+				sizzle: "external/sizzle/dist/sizzle"
 			}
 		});
 		src = "src/jquery";

diff --git a/test/libs/sinon/timers_ie.js b/test/libs/sinon/timers_ie.js