You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/02/21 13:01:00 UTC
[netbeans] branch master updated: Ensure a clean license stub is
used for source config builds (#1957)
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 2b5d10b Ensure a clean license stub is used for source config builds (#1957)
2b5d10b is described below
commit 2b5d10b394b1fe72e2f6ae58f1dd02fdfbdf5892
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Fri Feb 21 14:00:34 2020 +0100
Ensure a clean license stub is used for source config builds (#1957)
* Ensure a clean license stub is used for source config builds
Before this changeset the LICENSE file from the root of the
repository/source directory was used to create the LICENSE file of the
binary build. This worked correctly for the repository because there
only the ALv2 is present, but a source config build in the LICENSE file
also the references to the license files for the embedded source files
with foreign licenses are included.
A binary build from a source config thus contains the license info of
the source config _and_ the binary build. This is not correct, as the
binary config can contains less source only files because they are only
required at build time.
To fix this, a new license-stub.txt is introduced, that only contains
the ALv2 regardless whether it comes from the repository or from a
source config build.
---
LICENSE | 5 +++++
nbbuild/build.xml | 4 ++--
LICENSE => nbbuild/license-stub.txt | 0
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/LICENSE b/LICENSE
index 6b0b127..aeb123f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,3 +201,8 @@
See the License for the specific language governing permissions and
limitations under the License.
+********************************************************************************
+Apache NetBeans repository includes a number of source files that are not
+covered by the Apache license. These files are refered to by licenseinfo.xml
+files which hold the license information.
+********************************************************************************
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 00e9742..ce6804f 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1619,7 +1619,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<delete dir="${netbeans.dest.dir}/licenses" />
<mkdir dir="${netbeans.dest.dir}/licenses" />
- <createlicensesummary licenseStub="${nb_all}/LICENSE"
+ <createlicensesummary licenseStub="license-stub.txt"
noticeStub="notice-stub.txt"
report="${nb.build.dir}/createlicensesummary.xml"
nball=".."
@@ -1678,7 +1678,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<include name="libs.antlr3.devel/external/binaries-list"/>
</manifest>
</downloadbinaries>
- <createlicensesummary licenseStub="${nb_all}/LICENSE"
+ <createlicensesummary licenseStub="license-stub.txt"
noticeStub="notice-stub.txt"
report="${nb.build.dir}/createlicensesummary.xml"
nball=".."
diff --git a/LICENSE b/nbbuild/license-stub.txt
similarity index 100%
copy from LICENSE
copy to nbbuild/license-stub.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists