Skip to content

Commit cbe63b6

Browse files
authored
Doc: Update License Notice (#4171)
- We do not need to cover year ranges (just the starting range). - Update to exact wording of current notice texts.
1 parent 5313c5d commit cbe63b6

File tree

3 files changed

+5
-18
lines changed

3 files changed

+5
-18
lines changed

LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
WarpX v23.08 Copyright (c) 2018-2023, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
1+
WarpX Copyright (c) 2018, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
22

33

44
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ To contact the developers, feel free to open an issue on this repo, or visit our
4646

4747
Our workflow is described in [CONTRIBUTING.rst](CONTRIBUTING.rst).
4848

49-
## License
49+
## Copyright Notice
5050

51-
WarpX Copyright (c) 2018-2023, The Regents of the University of California,
51+
WarpX Copyright (c) 2018, The Regents of the University of California,
5252
through Lawrence Berkeley National Laboratory (subject to receipt of any
5353
required approvals from the U.S. Dept. of Energy). All rights reserved.
5454

@@ -64,4 +64,5 @@ Software to reproduce, distribute copies to the public, prepare derivative
6464
works, and perform publicly and display publicly, and to permit other to do
6565
so.
6666

67-
License for WarpX can be found at [LICENSE.txt](LICENSE.txt).
67+
Please see the full license agreement in [LICENSE.txt](LICENSE.txt).
68+
The SPDX license identifier is `BSD-3-Clause-LBNL`.

Tools/Release/newVersion.sh

-14
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,6 @@ sed -i "s/"\
125125
"release = u'${VERSION_STR}'/g" \
126126
${REPO_DIR}/Docs/source/conf.py
127127

128-
# LICENSE
129-
# LICENSE.txt: WarpX vYY.MM Copyright (c) 20YY, The Regents of ...
130-
sed -i -E "s/"\
131-
"(WarpX v)(.*)([[:blank:]]+Copyright \(c\) 2018-)(.*)(, The Regents of.*)/"\
132-
"\1${VERSION_STR_NOSUFFIX}\3$(date +%Y)\5/g" \
133-
${REPO_DIR}/LICENSE.txt
134-
135-
# README.md
136-
# README.md: WarpX Copyright (c) 2018-2021, The Regents of ...
137-
sed -i -E "s/"\
138-
"(WarpX Copyright \(c\) 2018-)(.*)(, The Regents of.*)/"\
139-
"\1$(date +%Y)\3/g" \
140-
${REPO_DIR}/README.md
141-
142128

143129
# Epilog ######################################################################
144130

0 commit comments

Comments
 (0)