You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/03/26 19:24:34 UTC
[GitHub] jlahoda closed pull request #399: [NETBEANS-317] (partial) Generate LICENSE, NOTICE and DISCLAIMER to m���
jlahoda closed pull request #399: [NETBEANS-317] (partial) Generate LICENSE, NOTICE and DISCLAIMER to m…
URL: https://github.com/apache/incubator-netbeans/pull/399
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ant.browsetask/build.xml b/ant.browsetask/build.xml
index cd07aa026..bcd800cad 100644
--- a/ant.browsetask/build.xml
+++ b/ant.browsetask/build.xml
@@ -34,9 +34,9 @@
<fileset dir="antsrc" excludes="${jar-excludes}"/>
</copy>
<mkdir dir="${cluster}/ant/nblib"/>
- <jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
+ <nb-ext-jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
<fileset dir="build/antclasses"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="netbeans-extra" depends="nblib"/>
diff --git a/apisupport.ant/build.xml b/apisupport.ant/build.xml
index cb1260701..431273730 100644
--- a/apisupport.ant/build.xml
+++ b/apisupport.ant/build.xml
@@ -34,9 +34,9 @@
<fileset dir="antsrc" excludes="${jar-excludes}"/>
</copy>
<mkdir dir="${cluster}/ant/nblib"/>
- <jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
+ <nb-ext-jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
<fileset dir="build/antclasses"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="netbeans-extra" depends="nblib"/>
diff --git a/apisupport.harness/build.xml b/apisupport.harness/build.xml
index 6fd94f4f4..45ccec305 100644
--- a/apisupport.harness/build.xml
+++ b/apisupport.harness/build.xml
@@ -49,9 +49,9 @@
<target name="jar-jnlp-launcher" depends="compile-jnlp-launcher">
<mkdir dir="${cluster}/jnlp/"/>
- <jar jarfile="${cluster}/jnlp/jnlp-launcher.jar" compress="false" manifest="jnlp-manifest.mf" >
+ <nb-ext-jar jarfile="${cluster}/jnlp/jnlp-launcher.jar" compress="false" manifest="jnlp-manifest.mf" >
<fileset dir="${build.dir}/jnlp-launcher-classes"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="netbeans-extra" depends="nbantext,jar-jnlp-launcher"/>
diff --git a/autoupdate.services/build.xml b/autoupdate.services/build.xml
index 67c672dfd..c9a0358b1 100644
--- a/autoupdate.services/build.xml
+++ b/autoupdate.services/build.xml
@@ -38,13 +38,13 @@
<target name="jar-updater" depends="init,compile-updater">
<mkdir dir="${cluster}/modules/ext" />
- <jar jarfile="${cluster}/modules/ext/updater.jar"
+ <nb-ext-jar jarfile="${cluster}/modules/ext/updater.jar"
compress="${build.package.compress}">
<manifest>
<attribute name="NetBeans-Own-Library" value="true"/>
</manifest>
<fileset dir="${build.dir}/updaterclasses"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="compile" depends="jar-updater,projectized-common.compile"/>
diff --git a/csl.api/anttask/build.xml b/csl.api/anttask/build.xml
index f1b82b853..543438e06 100644
--- a/csl.api/anttask/build.xml
+++ b/csl.api/anttask/build.xml
@@ -25,10 +25,10 @@
<target name="jars" depends="compile">
<mkdir dir="build"/>
- <jar jarfile="build/cslanttask.jar"
+ <nb-ext-jar jarfile="build/cslanttask.jar"
basedir="build/classes"
compress="false">
- </jar>
+ </nb-ext-jar>
</target>
<target name="compile">
diff --git a/db/build.xml b/db/build.xml
index 382d3673b..2e3208ad6 100644
--- a/db/build.xml
+++ b/db/build.xml
@@ -55,9 +55,9 @@
<target name="jar-lib" depends="compile-lib">
<mkdir dir="${cluster}/modules/ext" />
- <jar jarfile="${cluster}/modules/ext/ddl.jar" compress="false">
+ <nb-ext-jar jarfile="${cluster}/modules/ext/ddl.jar" compress="false">
<fileset dir="${build.dir}/lib-classes" />
- </jar>
+ </nb-ext-jar>
</target>
<target name="compile" depends="jar-lib, projectized-common.compile" />
diff --git a/debugger.jpda.ant/build.xml b/debugger.jpda.ant/build.xml
index a901e679b..22b8ae3b4 100644
--- a/debugger.jpda.ant/build.xml
+++ b/debugger.jpda.ant/build.xml
@@ -36,9 +36,9 @@
<fileset dir="antsrc" excludes="${jar-excludes}"/>
</copy>
<mkdir dir="${cluster}/ant/nblib"/>
- <jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
+ <nb-ext-jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
<fileset dir="build/antclasses"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="netbeans-extra" depends="nblib"/>
diff --git a/extbrowser/build.xml b/extbrowser/build.xml
index 170491f59..0d4c371ed 100644
--- a/extbrowser/build.xml
+++ b/extbrowser/build.xml
@@ -33,11 +33,11 @@
<property name="dir" location="${jnlp.dest.dir}/${code.name.base.dashes}"/>
<mkdir dir="${dir}"/>
<copy file="${cluster}/${module.jar}" todir="${dir}"/>
- <jar jarfile="${dir}/windows.jar">
+ <nb-ext-jar jarfile="${dir}/windows.jar">
<fileset dir="${cluster}/modules/lib">
<include name="extbrowser*.dll"/>
</fileset>
- </jar>
+ </nb-ext-jar>
<!-- XXX ought to only do this in case jnlp.sign.jars=true -->
<signjar alias="${jnlp.signjar.alias}" storepass="${jnlp.signjar.password}" keystore="${jnlp.signjar.keystore}">
<fileset dir="${dir}">
diff --git a/form/build.xml b/form/build.xml
index 1d1505429..711d37802 100644
--- a/form/build.xml
+++ b/form/build.xml
@@ -27,12 +27,12 @@
<mkdir dir="${build.dir}/absolutelayoutclasses"/>
<javac srcdir="release/sources" target="1.1" source="1.3" destdir="${build.dir}/absolutelayoutclasses"/>
<mkdir dir="${cluster}/modules/ext"/>
- <jar jarfile="${cluster}/modules/ext/AbsoluteLayout.jar">
+ <nb-ext-jar jarfile="${cluster}/modules/ext/AbsoluteLayout.jar">
<manifest>
<attribute name="NetBeans-Own-Library" value="true"/>
</manifest>
<fileset dir="${build.dir}/absolutelayoutclasses"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="compile" depends="absolute-layout,projectized-common.compile"/>
diff --git a/java.j2seembedded/build.xml b/java.j2seembedded/build.xml
index feed994f0..91d3f5fc5 100644
--- a/java.j2seembedded/build.xml
+++ b/java.j2seembedded/build.xml
@@ -27,14 +27,14 @@
<mkdir dir="build/probe/classes"/>
<javac srcdir="jreprobe" destdir="build/probe/classes" source="1.3" debug="true" deprecation="true" target="1.1"/>
<mkdir dir="${cluster}/modules/ext"/>
- <jar jarfile="${cluster}/modules/ext/org-netbeans-modules-java-j2seembedded-probe.jar">
+ <nb-ext-jar jarfile="${cluster}/modules/ext/org-netbeans-modules-java-j2seembedded-probe.jar">
<manifest>
<attribute name="NetBeans-Own-Library" value="true"/>
<attribute name="Main-Class" value="org.netbeans.modules.java.j2seembedded.wizard.JREProbe"/>
<attribute name="Profile" value="compact1"/>
</manifest>
<fileset dir="build/probe/classes"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="netbeans-extra" depends="probe"/>
diff --git a/java.j2seplatform/build.xml b/java.j2seplatform/build.xml
index 2139fe0c7..a9953355a 100644
--- a/java.j2seplatform/build.xml
+++ b/java.j2seplatform/build.xml
@@ -27,12 +27,12 @@
<mkdir dir="build/probe/classes"/>
<javac srcdir="probesrc" destdir="build/probe/classes" source="1.3" debug="true" deprecation="true" target="1.1"/>
<mkdir dir="${cluster}/modules/ext"/>
- <jar jarfile="${cluster}/modules/ext/org-netbeans-modules-java-j2seplatform-probe.jar">
+ <nb-ext-jar jarfile="${cluster}/modules/ext/org-netbeans-modules-java-j2seplatform-probe.jar">
<manifest>
<attribute name="NetBeans-Own-Library" value="true"/>
</manifest>
<fileset dir="build/probe/classes"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="netbeans-extra" depends="probe"/>
diff --git a/java.source.ant/build.xml b/java.source.ant/build.xml
index 84a937ac6..8d4f760ad 100644
--- a/java.source.ant/build.xml
+++ b/java.source.ant/build.xml
@@ -37,9 +37,9 @@
<fileset dir="antsrc" excludes="${jar-excludes}"/>
</copy>
<mkdir dir="${cluster}/ant/nblib"/>
- <jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
+ <nb-ext-jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
<fileset dir="build/antclasses"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="netbeans-extra" depends="nblib"/>
diff --git a/lib.jshell.agent/build.xml b/lib.jshell.agent/build.xml
index 270b5ab04..6410f1be4 100644
--- a/lib.jshell.agent/build.xml
+++ b/lib.jshell.agent/build.xml
@@ -41,7 +41,7 @@
<target name="modular-probe" depends="probe-init">
<mkdir dir="${cluster}/modules/ext"/>
- <jar jarfile="${cluster}/modules/ext/nb-mod-jshell-probe.jar">
+ <nb-ext-jar jarfile="${cluster}/modules/ext/nb-mod-jshell-probe.jar">
<manifest>
<attribute name="NetBeans-Own-Library" value="true"/>
<attribute name="Main-Class" value="org.netbeans.lib.jshell.agent.AgentWorker"/>
@@ -52,7 +52,7 @@
<fileset dir="build/agent/classes">
<exclude name="jdk/**"/>
</fileset>
- </jar>
+ </nb-ext-jar>
</target>
<target name="jar-probe" depends="probe-init">
@@ -71,7 +71,7 @@
</patternset>
</unjar>
<mkdir dir="${cluster}/modules/ext"/>
- <jar jarfile="${cluster}/modules/ext/nb-custom-jshell-probe.jar">
+ <nb-ext-jar jarfile="${cluster}/modules/ext/nb-custom-jshell-probe.jar">
<manifest>
<attribute name="NetBeans-Own-Library" value="true"/>
<attribute name="Main-Class" value="org.netbeans.lib.jshell.agent.AgentWorker"/>
@@ -80,7 +80,7 @@
<attribute name="Can-Retransform-Classes" value="true"/>
</manifest>
<fileset dir="build/agent/classes"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="probe" depends="modular-probe,jar-probe">
diff --git a/lib.profiler/build.xml b/lib.profiler/build.xml
index 727d235f4..10892968f 100644
--- a/lib.profiler/build.xml
+++ b/lib.profiler/build.xml
@@ -79,21 +79,21 @@
<!-- Server side -->
<mkdir dir="${cluster}/lib"/>
- <jar destfile="${cluster}/${jfluid.server.jar}"
+ <nb-ext-jar destfile="${cluster}/${jfluid.server.jar}"
basedir="${build.classes.dir}"
includes="org/netbeans/lib/profiler/server/** org/netbeans/lib/profiler/global/** org/netbeans/lib/profiler/wireprotocol/**"
compress="false">
- </jar>
- <jar destfile="${cluster}/${jfluid.server.15.jar}"
+ </nb-ext-jar>
+ <nb-ext-jar destfile="${cluster}/${jfluid.server.15.jar}"
manifest="${src15.dir}/manifest.mf"
basedir="${build15.classes.dir}"
compress="false">
- </jar>
- <jar destfile="${cluster}/${jfluid.server.cvm.jar}"
+ </nb-ext-jar>
+ <nb-ext-jar destfile="${cluster}/${jfluid.server.cvm.jar}"
manifest="${srccvm.dir}/manifest.mf"
basedir="${buildcvm.classes.dir}"
compress="false">
- </jar>
+ </nb-ext-jar>
</target>
<target name="release" depends="projectized-common.release">
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
index 41846a8fb..deee93fb8 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
@@ -205,22 +205,8 @@ void execute() throws BuildException {
}
private void evaluateLicenseInfo(final PrintWriter licenseWriter, final PrintWriter noticeWriter, Set<String> notices, Set<String> licenseNames) throws IOException {
-
- licenseWriter.println();
- licenseWriter.println("******************************************************************************************************************************************************");
- licenseWriter.println("Apache NetBeans includes a number of source files that are not covered by the apache license. The following files are part of this distribution.");
- licenseWriter.println("******************************************************************************************************************************************************");
- licenseWriter.println();
-
- licenseWriter.printf("%-100s%40s%10s\n", "Sourcefile", "LICENSE", "NOTES");
- if(licenseTargetDir != null) {
- licenseWriter.printf("%-100s%40s\n", "(path in the source)", "(text is in file in licenses directory)");
- } else {
- licenseWriter.printf("%-100s%40s\n", "(path in the source)", "(see license text reproduced below)");
- }
- licenseWriter.println("------------------------------------------------------------------------------------------------------------------------------------------------------");
-
List<String> footnotes = new ArrayList<>();
+ boolean headerPrinted = false;
for(String module : modules) {
File moduleDir = new File(nball, module);
@@ -238,7 +224,24 @@ private void evaluateLicenseInfo(final PrintWriter licenseWriter, final PrintWri
if(binary && fs.isSourceOnly()) {
continue;
}
-
+
+ if (!headerPrinted) {
+ licenseWriter.println();
+ licenseWriter.println("******************************************************************************************************************************************************");
+ licenseWriter.println("Apache NetBeans includes a number of source files that are not covered by the apache license. The following files are part of this distribution.");
+ licenseWriter.println("******************************************************************************************************************************************************");
+ licenseWriter.println();
+
+ licenseWriter.printf("%-100s%40s%10s\n", "Sourcefile", "LICENSE", "NOTES");
+ if(licenseTargetDir != null) {
+ licenseWriter.printf("%-100s%40s\n", "(path in the source)", "(text is in file in licenses directory)");
+ } else {
+ licenseWriter.printf("%-100s%40s\n", "(path in the source)", "(see license text reproduced below)");
+ }
+ licenseWriter.println("------------------------------------------------------------------------------------------------------------------------------------------------------");
+ headerPrinted = true;
+ }
+
String notes = "";
if(fs.getLicenseInfo() != null) {
int idx = footnotes.indexOf(fs.getLicenseInfo());
@@ -284,7 +287,10 @@ private void evaluateBinaries(final PrintWriter licenseWriter, final PrintWriter
Map<String, Map<String, String>> binaries2LicenseHeaders = new TreeMap<>();
StringBuilder testBinariesAreUnique = new StringBuilder();
List<String> ignoredPatterns = VerifyLibsAndLicenses.loadPatterns("ignored-binary-overlaps");
- findBinaries(build, binaries2LicenseHeaders, crc2License, new HashMap<>(), "", testBinariesAreUnique, ignoredPatterns);
+ if (build != null)
+ findBinaries(build, binaries2LicenseHeaders, crc2License, new HashMap<>(), "", testBinariesAreUnique, ignoredPatterns);
+ if (binaries2LicenseHeaders.isEmpty())
+ return ;
pseudoTests.put("testBinariesAreUnique", testBinariesAreUnique.length() > 0 ? "Some binaries are duplicated (edit nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps as needed)" + testBinariesAreUnique : null);
licenseWriter.println();
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 4995f0f8b..750c3db06 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -96,6 +96,9 @@
<exclude name="**/package.html"/>
<exclude name="package-list"/>
</fileset>
+ <zipfileset dir="${nb_all}" includes="LICENSE" fullpath="META-INF/LICENSE"/>
+ <zipfileset dir="${nb_all}/nbbuild" includes="notice-stub.txt" fullpath="META-INF/NOTICE"/>
+ <zipfileset dir="${nb_all}" includes="DISCLAIMER" fullpath="META-INF/DISCLAIMER"/>
</jar>
<taskdef name="createlicensesummary" classname="org.netbeans.nbbuild.extlibs.CreateLicenseSummary" classpath="${nbantext.jar}"/>
</target>
@@ -1596,11 +1599,11 @@ 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"
- noticeStub="notice-stub.txt"
- report="${nb.build.dir}/createlicensesummary.xml"
- nball=".."
- build="${netbeans.build.dir}"
+ <createlicensesummary licenseStub="${nb_all}/LICENSE"
+ noticeStub="notice-stub.txt"
+ report="${nb.build.dir}/createlicensesummary.xml"
+ nball=".."
+ build="${netbeans.build.dir}"
license="${nb.build.dir}/LICENSE"
licenseTargetDir="${nb.build.dir}/licenses"
notice="${nb.build.dir}/NOTICE"
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index aa26da189..a993f77a4 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -218,6 +218,13 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds=
</or>
</condition>
</fail>
+ <presetdef name="nb-ext-jar">
+ <jar>
+ <zipfileset dir="${nb_all}" includes="LICENSE" fullpath="META-INF/LICENSE"/>
+ <zipfileset dir="${nb_all}/nbbuild" includes="notice-stub.txt" fullpath="META-INF/NOTICE"/>
+ <zipfileset dir="${nb_all}" includes="DISCLAIMER" fullpath="META-INF/DISCLAIMER"/>
+ </jar>
+ </presetdef>
</target>
<target name="-define-downloadbinaries-task" unless="have-downloadbinaries-task">
@@ -365,9 +372,26 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds=
<target name="netbeans" depends="projectized-common.netbeans,check-sigtest"/>
-->
<target name="sources-zip" depends="build-init, check-sources-exist" if="sources.exist" description="Simple sources zip creation intended for use in maven repository.">
+
+ <taskdef name="createlicensesummary" classname="org.netbeans.nbbuild.extlibs.CreateLicenseSummary" classpath="${nbantext.jar}"/>
+ <property name="module.name.temp" location="." />
+ <basename property="module.name" file="${module.name.temp}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <createlicensesummary licenseStub="${nb_all}/LICENSE"
+ noticeStub="${nb_all}/nbbuild/notice-stub.txt"
+ nball="${nb_all}"
+ license="${build.dir}/LICENSE"
+ notice="${build.dir}/NOTICE"
+ binary="false"
+ modules="${module.name}"
+ />
+
<mkdir dir="${netbeans.zipped.sources.dir}"/>
- <zip zipfile="${netbeans.zipped.sources.dir}/${code.name.base.dashes}.zip"
- basedir="${src.dir}"/>
+ <zip zipfile="${netbeans.zipped.sources.dir}/${code.name.base.dashes}.zip">
+ <zipfileset dir="${src.dir}" />
+ <zipfileset dir="${build.dir}" prefix="META-INF" includes="LICENSE NOTICE" />
+ <zipfileset dir="${nb_all}" prefix="META-INF" includes="DISCLAIMER" />
+ </zip>
</target>
@@ -456,6 +480,39 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds=
</jar>
</target>
+ <target name="-prepare-mandatory-files-for-module" depends="build-init">
+ <taskdef name="createlicensesummary" classname="org.netbeans.nbbuild.extlibs.CreateLicenseSummary" classpath="${nbantext.jar}"/>
+ <property name="module.name.temp" location="." />
+ <basename property="module.name" file="${module.name.temp}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <createlicensesummary licenseStub="${nb_all}/LICENSE"
+ noticeStub="${nb_all}/nbbuild/notice-stub.txt"
+ nball="${nb_all}"
+ license="${build.classes.dir}/META-INF/LICENSE"
+ notice="${build.dir}/notice-temp"
+ binary="true"
+ modules="${module.name}"
+ />
+
+ <concat destfile="${build.classes.dir}/META-INF/NOTICE">
+ <fileset file="${build.dir}/notice-temp" />
+ <fileset dir="."
+ includes="notice.txt" />
+ <filterchain>
+ <tokenfilter>
+ <filetokenizer />
+ <replaceregex pattern="(\r?\n)(\r?\n)+"
+ replace="\1\1"
+ flags="g" />
+ </tokenfilter>
+ </filterchain>
+ </concat>
+
+ <copy file="${nb_all}/DISCLAIMER" todir="${build.classes.dir}/META-INF/" />
+ </target>
+
+ <target name="jar" depends="-prepare-mandatory-files-for-module,projectized-common.jar" />
+
<target name="jar-ml" depends="jar">
<locfiles
cluster="${cluster.dir}" locales="${locales}" src="${nb_all}/l10n/src"
diff --git a/o.apache.tools.ant.module/build.xml b/o.apache.tools.ant.module/build.xml
index 9a4bdbf2f..0093390db 100644
--- a/o.apache.tools.ant.module/build.xml
+++ b/o.apache.tools.ant.module/build.xml
@@ -48,9 +48,9 @@
<target name="jar-bridge" depends="compile-bridge">
<mkdir dir="${cluster}/ant/nblib"/>
- <jar jarfile="${cluster}/ant/nblib/bridge.jar" compress="false">
+ <nb-ext-jar jarfile="${cluster}/ant/nblib/bridge.jar" compress="false">
<fileset dir="build/bridge-classes"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="netbeans-extra" depends="jar-bridge">
diff --git a/profiler.nbimpl/build.xml b/profiler.nbimpl/build.xml
index acbb0c126..711dada55 100644
--- a/profiler.nbimpl/build.xml
+++ b/profiler.nbimpl/build.xml
@@ -34,9 +34,9 @@
<fileset dir="antsrc" excludes="${jar-excludes}"/>
</copy>
<mkdir dir="${cluster}/ant/nblib"/>
- <jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
+ <nb-ext-jar jarfile="${cluster}/ant/nblib/${code.name.base.dashes}.jar" compress="false">
<fileset dir="build/antclasses"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="netbeans-extra" depends="nblib"/>
diff --git a/project.ant/build.xml b/project.ant/build.xml
index 84c3fd66b..a6a81d0c4 100644
--- a/project.ant/build.xml
+++ b/project.ant/build.xml
@@ -33,9 +33,9 @@
<copy todir="build/antclasses">
<fileset dir="antsrc" excludes="${jar-excludes}"/>
</copy>
- <jar jarfile="build/tasks.jar">
+ <nb-ext-jar jarfile="build/tasks.jar">
<fileset dir="build/antclasses"/>
- </jar>
+ </nb-ext-jar>
</target>
</project>
diff --git a/xml.tax/build.xml b/xml.tax/build.xml
index d0d92fff0..28cbfccb0 100644
--- a/xml.tax/build.xml
+++ b/xml.tax/build.xml
@@ -37,9 +37,9 @@
</target>
<target name="lib-jar" depends="lib-compile">
- <jar jarfile="${netbeans.dest.dir}/ide/modules/ext/org-netbeans-tax.jar" index="${build.package.index}" compress="${build.package.compress}">
+ <nb-ext-jar jarfile="${netbeans.dest.dir}/ide/modules/ext/org-netbeans-tax.jar" index="${build.package.index}" compress="${build.package.compress}">
<fileset dir="${build.dir}/libclasses"/>
- </jar>
+ </nb-ext-jar>
</target>
<target name="compile" depends="lib-jar,projectized-common.compile"/>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists