As per Bertrand's request, added comments to compile-time deps explai…

…ning their need; fixing a few closely related problems.
iblader · Nov 17, 2017 · 7f19de5 · 7f19de5
1 parent 5d0b08c
commit 7f19de5
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 429 deletions.
diff --git a/api.annotations.common/external/jsr305-2.0.0-license.txt b/api.annotations.common/external/jsr305-2.0.0-license.txt
@@ -11,6 +11,7 @@ Comment: under the terms of the New BSD license:
 Comment: https://opensource.org/licenses/BSD-3-Clause
 Comment: See the JSR-305 home page for more information:
 Comment: http://code.google.com/p/jsr-305/
+Comment: Allows NetBeans' @NonNull/@NullAllowed/etc. annotations to be annotated with the JSR-205 meta-annotations, so they are recognizable by FindBugs.
 
 
 Copyright (c) __YEAR__, __OWNER__

diff --git a/applemenu/external/applemenu-external-desktop-classes-8.2-license.txt b/applemenu/external/applemenu-external-desktop-classes-8.2-license.txt
diff --git a/applemenu/external/orange-extensions-1.3.1-license.txt b/applemenu/external/orange-extensions-1.3.1-license.txt
@@ -4,6 +4,7 @@ License: BSD-Masory
 Description: com.apple classes for cross-compilation.
 Origin: Yuvi Masory
 Type: compile-time
+Comment: Allows to build code leveraging Apple-specficic classes on other platforms.
 
 This jar was created by decompiling AppleJavaExtensions.jar (completely consistent
 with its BSD-like license), and adding the new Java 5 methods.

diff --git a/javahelp/external/jhall-2.0_05-license.txt b/javahelp/external/jhall-2.0_05-license.txt
@@ -6,6 +6,7 @@ Description: Standard Java help browser system.
 Origin: Oracle
 URL: http://download.java.net/javadesktop/javahelp/javahelp2_0_05.zip
 Type: compile-time
+Comment: Allows to index JavaHelp data.
 
 The GNU General Public License (GPL)
 Version 2, June 1991

diff --git a/libs.javafx/external/openjfx-master-rt-8-license.txt b/libs.javafx/external/openjfx-master-rt-8-license.txt
@@ -6,6 +6,7 @@ Source: file://openjfx-master-rt-8.zip
 Origin: OpenJDK
 URL: http://hg.openjdk.java.net/openjfx/8/master/rt/
 Type: compile-time
+Comment: Allows to build code leveraging OpenJavaFX on JDKs that don't contain OpenJavaFX.
 
 The GNU General Public License (GPL)
 Version 2, June 1991

diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateDependencies.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateDependencies.java
@@ -100,6 +100,9 @@ public void setSourceDependencies(boolean sourceDependencies) {
                     String licName = licenseNames.getProperty(licCode);
                     String licDesc = licName != null ? licName : licCode;
                     text.append("\nLicense: " + licDesc);
+                    if (headers.containsKey("Comment")) {
+                        text.append("\nComment: " + headers.get("Comment"));
+                    }
                     origin2Texts.computeIfAbsent(origin, o -> new TreeSet<>()).add(text.toString());
                 }
 

diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
@@ -307,6 +307,9 @@ private void testLicenses() throws IOException {
                         if (license.contains("GPL-2-CP") &&
                             headers.getOrDefault("Type", "").contains("compile-time")) {
                             //OK to include GPLv2+CPE as a compile-time/runtime optional dependency
+                            if (!headers.containsKey("Comment")) {
+                                msg.append("\n" + path + " has a GPL-family license but does not have a Comment.");
+                            }
                         } else {
                             msg.append("\n" + path + " has a GPL-family license but is either not covered by the Classpath Exception, or is not compile-time/optional only.");
                         }

diff --git a/nbbuild/build.xml b/nbbuild/build.xml
@@ -1520,8 +1520,11 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
     <resolve name="harness-modules" value="nb.cluster.harness"/>
 
     <mkdir dir="${nb.build.dir}"/>
+    <condition property="build.source.config.add.ide" else="" value=",ide">
+        <isset property="has.nb.cluster" />
+    </condition>
     <dirset id="source.dirset" dir="${nb_all}"
-            includes="${allmodules},${harness-modules},nbbuild,ide,nbi,libs.antlr3.devel,libs.junit4"
+            includes="${allmodules},${harness-modules},nbbuild${build.source.config.add.ide},nbi,libs.antlr3.devel,libs.junit4"
             excludes="nbi/engine/lib,nbi/infra/build/jvm,nbi/infra/sandbox,nbi/infra/server,nbi/infra/utils"
     />
     <pathconvert property="source.dirs" pathsep="," refid="source.dirset">

diff --git a/nbbuild/external/apitest-license.txt b/nbbuild/external/apitest-license.txt
@@ -5,6 +5,7 @@ Source: http://hg.netbeans.org/apitest/
 Description: Signature test modified for NetBeans
 Origin: OpenJDK (modified by NetBeans)
 Type: compile-time
+Comment: Used to generate and check API signatures.
 
 The GNU General Public License (GPL)
 Version 2, June 1991