Skip to content

Commit 1ab2972

Browse files
fornwallfornwall
committed
Use same license file structure as cargo
1 parent e51963d commit 1ab2972

11 files changed

+29
-116
lines changed

‎LICENSE ‎LICENSE-APACHE

+2-38
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
1-
Copyright ⓒ 2015, 2016 cargo-script contributors.
2-
3-
Licensed under either of:
4-
5-
* MIT license, or
6-
* Apache License, Version 2.0
7-
8-
at your option.
9-
10-
Unless you explicitly state otherwise, any contribution intentionally
11-
submitted for inclusion in the work by you shall be dual licensed as
12-
above, without any additional terms or conditions.
13-
14-
# MIT License
15-
16-
Permission is hereby granted, free of charge, to any person obtaining
17-
a copy of this software and associated documentation files (the
18-
"Software"), to deal in the Software without restriction, including
19-
without limitation the rights to use, copy, modify, merge, publish,
20-
distribute, sublicense, and/or sell copies of the Software, and to
21-
permit persons to whom the Software is furnished to do so, subject
22-
to the following conditions:
23-
24-
The above copyright notice and this permission notice shall be included
25-
in all copies or substantial portions of the Software.
26-
27-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
28-
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
29-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
30-
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
31-
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
32-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
33-
OTHER DEALINGS IN THE SOFTWARE.
34-
35-
# Apache License, Version 2.0
36-
371
Apache License
382
Version 2.0, January 2004
39-
http://www.apache.org/licenses/
3+
https://www.apache.org/licenses/LICENSE-2.0
404

415
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
426

@@ -228,7 +192,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
228192
you may not use this file except in compliance with the License.
229193
You may obtain a copy of the License at
230194

231-
http://www.apache.org/licenses/LICENSE-2.0
195+
https://www.apache.org/licenses/LICENSE-2.0
232196

233197
Unless required by applicable law or agreed to in writing, software
234198
distributed under the License is distributed on an "AS IS" BASIS,

‎LICENSE-MIT

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

‎README.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -248,17 +248,15 @@ In addition, there are three built-in templates: `expr`, `loop`, and `loop-count
248248
<a name="troubleshooting"></a>
249249
### Troubleshooting
250250

251-
Run with the `RUST_LOG=rust_script=debug` environment variable set to see debug log output.
251+
Run with the `RUST_LOG=rust_script=trace` environment variable set to see debug log output.
252252

253253
<a name="license"></a>
254254
## License
255255

256-
Licensed under either of
256+
`rust-script` is primarily distributed under the terms of both the MIT license
257+
and the Apache License (Version 2.0).
257258

258-
* MIT license (see [LICENSE](LICENSE) or <http://opensource.org/licenses/MIT>)
259-
* Apache License, Version 2.0 (see [LICENSE](LICENSE) or <http://www.apache.org/licenses/LICENSE-2.0>)
260-
261-
at your option.
259+
See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) for details.
262260

263261
<a name="contribution"></a>
264262
### Contribution

‎src/consts.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/*
2-
Copyright ⓒ 2015-2017 cargo-script contributors.
3-
4-
Licensed under the MIT license (see LICENSE or <http://opensource.org
5-
/licenses/MIT>) or the Apache License, Version 2.0 (see LICENSE of
6-
<http://www.apache.org/licenses/LICENSE-2.0>), at your option. All
7-
files in the project carrying such notice may not be copied, modified,
8-
or distributed except according to those terms.
9-
*/
101
/*!
112
This module just contains any big string literals I don't want cluttering up the rest of the code.
123
*/

‎src/error.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/*
2-
Copyright ⓒ 2015-2017 cargo-script contributors.
3-
4-
Licensed under the MIT license (see LICENSE or <http://opensource.org
5-
/licenses/MIT>) or the Apache License, Version 2.0 (see LICENSE of
6-
<http://www.apache.org/licenses/LICENSE-2.0>), at your option. All
7-
files in the project carrying such notice may not be copied, modified,
8-
or distributed except according to those terms.
9-
*/
101
/*!
112
This module contains the definition of the program's main error type.
123
*/

‎src/file_assoc.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/*
2-
Copyright ⓒ 2017 cargo-script contributors.
3-
4-
Licensed under the MIT license (see LICENSE or <http://opensource.org
5-
/licenses/MIT>) or the Apache License, Version 2.0 (see LICENSE of
6-
<http://www.apache.org/licenses/LICENSE-2.0>), at your option. All
7-
files in the project carrying such notice may not be copied, modified,
8-
or distributed except according to those terms.
9-
*/
101
/*!
112
This module deals with setting up file associations.
123

‎src/main.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/*
2-
Copyright ⓒ 2015-2017 cargo-script contributors.
3-
4-
Licensed under the MIT license (see LICENSE or <http://opensource.org
5-
/licenses/MIT>) or the Apache License, Version 2.0 (see LICENSE of
6-
<http://www.apache.org/licenses/LICENSE-2.0>), at your option. All
7-
files in the project carrying such notice may not be copied, modified,
8-
or distributed except according to those terms.
9-
*/
101
/*!
112
`cargo-script` is a Cargo subcommand designed to let people quickly and easily run Rust "scripts" which can make use of Cargo's package ecosystem.
123

‎src/manifest.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/*
2-
Copyright ⓒ 2015-2017 cargo-script contributors.
3-
4-
Licensed under the MIT license (see LICENSE or <http://opensource.org
5-
/licenses/MIT>) or the Apache License, Version 2.0 (see LICENSE of
6-
<http://www.apache.org/licenses/LICENSE-2.0>), at your option. All
7-
files in the project carrying such notice may not be copied, modified,
8-
or distributed except according to those terms.
9-
*/
101
/*!
112
This module is concerned with how `cargo-script` extracts the manfiest from a script file.
123
*/

‎src/platform.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/*
2-
Copyright ⓒ 2015-2017 cargo-script contributors.
3-
4-
Licensed under the MIT license (see LICENSE or <http://opensource.org
5-
/licenses/MIT>) or the Apache License, Version 2.0 (see LICENSE of
6-
<http://www.apache.org/licenses/LICENSE-2.0>), at your option. All
7-
files in the project carrying such notice may not be copied, modified,
8-
or distributed except according to those terms.
9-
*/
101
/*!
112
This module is for platform-specific stuff.
123
*/

‎src/templates.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/*
2-
Copyright ⓒ 2017 cargo-script contributors.
3-
4-
Licensed under the MIT license (see LICENSE or <http://opensource.org
5-
/licenses/MIT>) or the Apache License, Version 2.0 (see LICENSE of
6-
<http://www.apache.org/licenses/LICENSE-2.0>), at your option. All
7-
files in the project carrying such notice may not be copied, modified,
8-
or distributed except according to those terms.
9-
*/
101
/*!
112
This module contains code related to template support.
123
*/

‎src/util.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/*
2-
Copyright ⓒ 2015-2017 cargo-script contributors.
3-
4-
Licensed under the MIT license (see LICENSE or <http://opensource.org
5-
/licenses/MIT>) or the Apache License, Version 2.0 (see LICENSE of
6-
<http://www.apache.org/licenses/LICENSE-2.0>), at your option. All
7-
files in the project carrying such notice may not be copied, modified,
8-
or distributed except according to those terms.
9-
*/
101
/*!
112
This module just contains other random implementation stuff.
123
*/

0 commit comments

Comments
 (0)