Skip to content

Commit 04cd63f

Browse files
committed
Remove rat and fix some licenses and build tools.
1 parent f98eb21 commit 04cd63f

15 files changed

+52
-396
lines changed

.rat-excludes renamed to .headerignore

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
# Only support regexp, testing against each relative file path
22
# based on the echart base directory. And the pattern should
33
# match the relative path completely.
4-
# Do not use wildcard. Although Apache Rat v0.12 implemented
5-
# it, it probably does not do it right, where patterns are
6-
# parsed as Regex firstly but do not catch the exception.
74

85
node_modules
96
.*\.git
107
.*\.github
118
.*\.editorconfig
129
.*\.gitignore
13-
.*\.jshintrc$
10+
.*\.jshintrc
1411
.*\.jshintrc-dist
1512
.*\.npmignore
16-
.*\.rat-excludes
13+
.*\.ratignore
14+
.*\.headerignore
1715
.*\.DS_Store
1816
.*\.idea
1917
.*rat\.iml
@@ -24,6 +22,7 @@ DISCLAIMER
2422
NOTICE
2523
KEYS
2624
LICENSE
25+
LICENSE-.+
2726
licenses
2827
map/js
2928
map/json
@@ -36,8 +35,6 @@ test/lib/countup\.js
3635
.*jquery\.min\.js
3736
.*rollup\.browser\.js
3837
.*configure
39-
.*IAxisPointer
40-
.*ICoordinateSystem
4138
.+\.json
4239
.+\.map
4340
.+\.gexf

build/addHeader.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,16 @@
1717
* under the License.
1818
*/
1919

20-
/**
21-
* For consistency, we use `.rat-excludes` for both Apache Rat and this tool.
22-
* In the `.rat-excludes`, each line is a pattern in RegExp.
23-
* all relative path (based on the echarts base directory) is tected.
24-
* The pattern should match the relative path completely.
25-
*/
2620

2721
const fs = require('fs');
2822
const preamble = require('./preamble');
2923
const pathTool = require('path');
3024
const {color} = require('zrender/build/helper');
31-
const excludesPath = pathTool.join(__dirname, '../.rat-excludes');
25+
26+
// In the `.headerignore`, each line is a pattern in RegExp.
27+
// all relative path (based on the echarts base directory) is tested.
28+
// The pattern should match the relative path completely.
29+
const excludesPath = pathTool.join(__dirname, '../.headerignore');
3230
const ecBasePath = pathTool.join(__dirname, '../');
3331

3432
const isVerbose = process.argv[2] === '--verbose';

build/preamble.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ const licenseReg = [
160160
{name: 'LGPL', reg: /LGPL/},
161161
{name: 'GPL', reg: /GPL/},
162162
{name: 'Mozilla', reg: /mozilla public/i},
163-
{name: 'MIT', reg: /mit license/i}
163+
{name: 'MIT', reg: /mit license/i},
164+
{name: 'BSD-d3', reg: /Copyright\s+\(c\)\s+2010-2015,\s+Michael\s+Bostock/i}
164165
];
165166

166167
function extractLicense(fileStr, fileExt) {

build/rat/apache-rat-0.12.jar

-1.52 MB
Binary file not shown.

build/rat/build-run-rat.sh

-25
This file was deleted.

build/rat/javassist.jar

-741 KB
Binary file not shown.

build/rat/rat.sh

-63
This file was deleted.

build/rat/runrat.jar

-2.5 KB
Binary file not shown.

build/rat/src/MANIFEST.txt

-2
This file was deleted.

build/rat/src/RunRat.class

-3.82 KB
Binary file not shown.

build/rat/src/RunRat.java

-184
This file was deleted.

0 commit comments

Comments
 (0)