aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2014-06-10 15:32:25 -0400
committerTimmy Willison <timmywillisn@gmail.com>2014-06-24 10:17:50 -0400
commitc5d9d88dce65b89a1d7d12b41ad254d5017a92a8 (patch)
treef50d49e5f1c04248d94414891565da7bb949d5ae
parent8d113104e980179e9eb4d092df0b1ab37cdc6fa5 (diff)
downloadjquery-c5d9d88dce65b89a1d7d12b41ad254d5017a92a8.tar.gz
jquery-c5d9d88dce65b89a1d7d12b41ad254d5017a92a8.zip
Build: Move all external libraries to external directory
Closes gh-1593
-rw-r--r--.jscsrc2
-rw-r--r--.jshintignore3
-rw-r--r--Gruntfile.js26
-rw-r--r--build/ensure-sizzle.js2
-rw-r--r--build/tasks/build.js2
-rw-r--r--external/qunit/MIT-LICENSE.txt21
-rw-r--r--external/qunit/qunit.css (renamed from test/libs/qunit/qunit.css)0
-rw-r--r--external/qunit/qunit.js (renamed from test/libs/qunit/qunit.js)0
-rw-r--r--external/requirejs/require.js (renamed from test/libs/require.js)0
-rw-r--r--external/sinon/LICENSE.txt27
-rw-r--r--external/sinon/fake_timers.js (renamed from test/libs/sinon/fake_timers.js)0
-rw-r--r--external/sizzle/dist/sizzle.js (renamed from src/sizzle/dist/sizzle.js)0
-rw-r--r--external/sizzle/dist/sizzle.min.js (renamed from src/sizzle/dist/sizzle.min.js)0
-rw-r--r--external/sizzle/dist/sizzle.min.map (renamed from src/sizzle/dist/sizzle.min.map)0
-rw-r--r--test/index.html8
-rw-r--r--test/jquery.js2
16 files changed, 70 insertions, 23 deletions
diff --git a/.jscsrc b/.jscsrc
index 27f14e6e0..fa91a9d9e 100644
--- 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
index 71bddb82c..19f1b9c52 100644
--- 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
index cd9427534..372783d44 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -47,22 +47,22 @@ 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",
- "sinon/fake_timers.js": "sinon/lib/sinon/util/fake_timers.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/LICENSE.txt": "sinon/LICENSE"
}
}
},
diff --git a/build/ensure-sizzle.js b/build/ensure-sizzle.js
index 01a128efb..3686e697c 100644
--- 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
index fa164cf92..03aacf9eb 100644
--- 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
new file mode 100644
index 000000000..957f26d3e
--- /dev/null
+++ 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 b/external/qunit/qunit.css
index 93026e3ba..93026e3ba 100644
--- a/test/libs/qunit/qunit.css
+++ b/external/qunit/qunit.css
diff --git a/test/libs/qunit/qunit.js b/external/qunit/qunit.js
index 0e279fde1..0e279fde1 100644
--- a/test/libs/qunit/qunit.js
+++ b/external/qunit/qunit.js
diff --git a/test/libs/require.js b/external/requirejs/require.js
index e7bc14d36..e7bc14d36 100644
--- a/test/libs/require.js
+++ b/external/requirejs/require.js
diff --git a/external/sinon/LICENSE.txt b/external/sinon/LICENSE.txt
new file mode 100644
index 000000000..892a26a66
--- /dev/null
+++ b/external/sinon/LICENSE.txt
@@ -0,0 +1,27 @@
+(The BSD License)
+
+Copyright (c) 2010-2013, Christian Johansen, christian@cjohansen.no
+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 b/external/sinon/fake_timers.js
index dbcdb8b68..dbcdb8b68 100644
--- a/test/libs/sinon/fake_timers.js
+++ b/external/sinon/fake_timers.js
diff --git a/src/sizzle/dist/sizzle.js b/external/sizzle/dist/sizzle.js
index 20bc01735..20bc01735 100644
--- a/src/sizzle/dist/sizzle.js
+++ b/external/sizzle/dist/sizzle.js
diff --git a/src/sizzle/dist/sizzle.min.js b/external/sizzle/dist/sizzle.min.js
index 58c163b2d..58c163b2d 100644
--- a/src/sizzle/dist/sizzle.min.js
+++ b/external/sizzle/dist/sizzle.min.js
diff --git a/src/sizzle/dist/sizzle.min.map b/external/sizzle/dist/sizzle.min.map
index d72bc3baa..d72bc3baa 100644
--- a/src/sizzle/dist/sizzle.min.map
+++ b/external/sizzle/dist/sizzle.min.map
diff --git a/test/index.html b/test/index.html
index 2b48be4e1..2c80c9d01 100644
--- 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,9 +14,9 @@
-->
<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="../external/qunit/qunit.js"></script>
+ <script src="../external/requirejs/require.js"></script>
+ <script src="../external/sinon/fake_timers.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
index 462c38b97..586bd4202 100644
--- a/test/jquery.js
+++ b/test/jquery.js
@@ -19,7 +19,7 @@
require.config({
baseUrl: path,
paths: {
- sizzle: "src/sizzle/dist/sizzle"
+ sizzle: "external/sizzle/dist/sizzle"
}
});
src = "src/jquery";