Skip to content

Commit 72e6192

Browse files
scottgonzaleztimmywil
scottgonzalez
authored and
timmywil
committed
Build: Move all external libraries to external directory
Closes gh-1593 Conflicts: Gruntfile.js test/index.html
1 parent 62f7f7b commit 72e6192

File tree

17 files changed

+71
-55
lines changed

17 files changed

+71
-55
lines changed

‎.jscsrc‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 2 deletions
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‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@ module.exports = function( grunt ) {
4545
}
4646
},
4747
bowercopy: {
48-
options: {
49-
clean: true
50-
},
51-
src: {
52-
files: {
53-
"src/sizzle/dist": "sizzle/dist"
54-
}
55-
},
56-
tests: {
48+
all: {
5749
options: {
58-
destPrefix: "test/libs"
50+
clean: true,
51+
destPrefix: "external"
5952
},
6053
files: {
61-
"qunit": "qunit/qunit",
62-
"require.js": "requirejs/require.js",
54+
"sizzle/dist": "sizzle/dist",
55+
56+
"qunit/qunit.js": "qunit/qunit/qunit.js",
57+
"qunit/qunit.css": "qunit/qunit/qunit.css",
58+
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
59+
60+
"requirejs/require.js": "requirejs/require.js",
61+
6362
"sinon/fake_timers.js": "sinon/lib/sinon/util/fake_timers.js",
64-
"sinon/timers_ie.js": "sinon/lib/sinon/util/timers_ie.js"
63+
"sinon/timers_ie.js": "sinon/lib/sinon/util/timers_ie.js",
64+
"sinon/LICENSE.txt": "sinon/LICENSE"
6565
}
6666
}
6767
},

‎build/ensure-sizzle.js‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 21 additions & 0 deletions
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.

test/libs/qunit/qunit.css renamed to external/qunit/qunit.css

File renamed without changes.

test/libs/qunit/qunit.js renamed to external/qunit/qunit.js

File renamed without changes.

test/libs/require.js renamed to external/requirejs/require.js

File renamed without changes.

‎external/sinon/LICENSE.txt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
(The BSD License)
2+
3+
Copyright (c) 2010-2013, Christian Johansen, christian@cjohansen.no
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.

0 commit comments

Comments
 (0)