Skip to content

Commit c5d9d88

Browse files
scottgonzaleztimmywil
authored andcommitted
Build: Move all external libraries to external directory
Closes jquerygh-1593
1 parent 8d11310 commit c5d9d88

16 files changed

+70
-23
lines changed

.jscsrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"preset": "jquery",
33

4-
"excludeFiles": [ "src/intro.js", "src/outro.js", "src/sizzle/**/*" ]
4+
"excludeFiles": [ "external", "src/intro.js", "src/outro.js" ]
55
}

.jshintignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
external
12
src/intro.js
23
src/outro.js
3-
src/sizzle/**/*
4-
test/libs/**/*
54
test/data/jquery-1.9.1.js
65
test/data/badcall.js
76
test/data/badjson.js

Gruntfile.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ module.exports = function( grunt ) {
4747
}
4848
},
4949
bowercopy: {
50-
options: {
51-
clean: true
52-
},
53-
src: {
54-
files: {
55-
"src/sizzle/dist": "sizzle/dist"
56-
}
57-
},
58-
tests: {
50+
all: {
5951
options: {
60-
destPrefix: "test/libs"
52+
clean: true,
53+
destPrefix: "external"
6154
},
6255
files: {
63-
"qunit": "qunit/qunit",
64-
"require.js": "requirejs/require.js",
65-
"sinon/fake_timers.js": "sinon/lib/sinon/util/fake_timers.js"
56+
"sizzle/dist": "sizzle/dist",
57+
58+
"qunit/qunit.js": "qunit/qunit/qunit.js",
59+
"qunit/qunit.css": "qunit/qunit/qunit.css",
60+
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
61+
62+
"requirejs/require.js": "requirejs/require.js",
63+
64+
"sinon/fake_timers.js": "sinon/lib/sinon/util/fake_timers.js",
65+
"sinon/LICENSE.txt": "sinon/LICENSE"
6666
}
6767
}
6868
},

build/ensure-sizzle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var fs = require( "fs" ),
22
bower = require( "grunt-bowercopy/node_modules/bower" ),
3-
sizzleLoc = __dirname + "/../src/sizzle/dist/sizzle.js",
3+
sizzleLoc = __dirname + "/../external/sizzle/dist/sizzle.js",
44
rversion = /Engine v(\d+\.\d+\.\d+(?:-\w+)?)/;
55

66
/**

build/tasks/build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = function( grunt ) {
2626
endFile: "src/outro.js"
2727
},
2828
paths: {
29-
sizzle: "sizzle/dist/sizzle"
29+
sizzle: "../external/sizzle/dist/sizzle"
3030
},
3131
rawText: {},
3232
onBuildWrite: convert

external/qunit/MIT-LICENSE.txt

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Copyright 2013 jQuery Foundation and other contributors
2+
http://jquery.com/
3+
4+
Permission is hereby granted, free of charge, to any person obtaining
5+
a copy of this software and associated documentation files (the
6+
"Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish,
8+
distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so, subject to
10+
the following conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
19+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
20+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
File renamed without changes.
File renamed without changes.
File renamed without changes.

external/sinon/LICENSE.txt

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
(The BSD License)
2+
3+
Copyright (c) 2010-2013, Christian Johansen, [email protected]
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without modification,
7+
are permitted provided that the following conditions are met:
8+
9+
* Redistributions of source code must retain the above copyright notice,
10+
this list of conditions and the following disclaimer.
11+
* Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
* Neither the name of Christian Johansen nor the names of his contributors
15+
may be used to endorse or promote products derived from this software
16+
without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27+
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
66
<title>jQuery Test Suite</title>
7-
<link rel="Stylesheet" media="screen" href="libs/qunit/qunit.css" />
7+
<link rel="Stylesheet" media="screen" href="../external/qunit/qunit.css" />
88
<link rel="Stylesheet" media="screen" href="data/testsuite.css" />
99
<!-- Includes -->
1010

@@ -14,9 +14,9 @@
1414
-->
1515
<script src="data/jquery-1.9.1.js"></script>
1616

17-
<script src="libs/qunit/qunit.js"></script>
18-
<script src="libs/require.js"></script>
19-
<script src="libs/sinon/fake_timers.js"></script>
17+
<script src="../external/qunit/qunit.js"></script>
18+
<script src="../external/requirejs/require.js"></script>
19+
<script src="../external/sinon/fake_timers.js"></script>
2020
<!-- See testinit for the list of tests -->
2121
<script src="data/testinit.js"></script>
2222

test/jquery.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
require.config({
2020
baseUrl: path,
2121
paths: {
22-
sizzle: "src/sizzle/dist/sizzle"
22+
sizzle: "external/sizzle/dist/sizzle"
2323
}
2424
});
2525
src = "src/jquery";

0 commit comments

Comments
 (0)