| 1 | Author: Danny Milosavljevic <[email protected]>
|
| 2 | Date: 2026-03-31
|
| 3 | Subject: Disable build-time (test-time) downloaders.
|
| 4 |
|
| 5 | diff -urN orig/harness/apisupport.harness/build.xml mod/harness/apisupport.harness/build.xml
|
| 6 | |
| 7 | |
| 8 | @@ -33,19 +33,6 @@
|
| 9 | <zipfileset file="taskdefs.properties" fullpath="org/netbeans/nbbuild/taskdefs.properties"/>
|
| 10 | </nb-ext-jar>
|
| 11 |
|
| 12 | - <!-- verify that the DownloadBinaries task is properly functional -->
|
| 13 | - <taskdef name="TestDownload" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries">
|
| 14 | - <classpath>
|
| 15 | - <pathelement location="${cluster}/tasks.jar"></pathelement>
|
| 16 | - </classpath>
|
| 17 | - </taskdef>
|
| 18 | - <echo file="build/binaries-list">F0ED132A49244B042CD0E15702AB9F2CE3CC8436 org.ow2.asm:asm:9.7.1</echo>
|
| 19 | - <TestDownload>
|
| 20 | - <manifest dir="build">
|
| 21 | - <include name="binaries-list"/>
|
| 22 | - </manifest>
|
| 23 | - </TestDownload>
|
| 24 | - <delete file="build/asm-9.7.1.jar"/>
|
| 25 | </target>
|
| 26 |
|
| 27 | <target name="compile-jnlp-launcher" depends="init,compile">
|
| 28 | diff -urN orig/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java mod/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java
|
| 29 | |
| 30 | |
| 31 | @@ -467,6 +467,9 @@
|
| 32 | if (testtype == null) {
|
| 33 | throw new IOException("Must declare <name>unit</name> (e.g.) in <test-type> in " + projectxml);
|
| 34 | }
|
| 35 | + if (Boolean.parseBoolean((String) properties.get("disable." + testtype + ".tests"))) {
|
| 36 | + continue;
|
| 37 | + }
|
| 38 | List<String> compileDepsList = new ArrayList<>();
|
| 39 | for (Element dep : XMLUtil.findSubElements(depssEl)) {
|
| 40 | if (dep.getTagName().equals("test-dependency")) {
|
| 41 | diff -urN orig/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java mod/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
|
| 42 | |
| 43 | |
| 44 | @@ -1574,6 +1574,9 @@
|
| 45 | } else if (testType.equals(TestDeps.QA_FUNCTIONAL)) {
|
| 46 | existsQaFunctionalTests = true;
|
| 47 | }
|
| 48 | + if (Boolean.parseBoolean(getProject().getProperty("disable." + testType + ".tests"))) {
|
| 49 | + continue;
|
| 50 | + }
|
| 51 | TestDeps testDeps = new TestDeps(testType,testCnb,modules);
|
| 52 | testDepsList.add(testDeps);
|
| 53 | for (Element el : XMLUtil.findSubElements(depssEl)) {
|
| 54 | @@ -1619,6 +1622,9 @@
|
| 55 | if (testDeps.fullySpecified) {
|
| 56 | continue;
|
| 57 | }
|
| 58 | + if (Boolean.parseBoolean(getProject().getProperty("disable." + testDeps.testtype + ".tests"))) {
|
| 59 | + continue;
|
| 60 | + }
|
| 61 | if (new File(moduleProject, "test/" + testDeps.testtype + "/src").isDirectory()) {
|
| 62 | log("Warning: " + testCnb + " lacks a " + testDeps.testtype +
|
| 63 | " test dependency on org.netbeans.libs.junit4; using default dependencies for compatibility", Project.MSG_WARN);
|
| 64 | diff -urN orig/nbbuild/build.xml mod/nbbuild/build.xml
|
| 65 | |
| 66 | |
| 67 | @@ -101,6 +101,8 @@
|
| 68 | </path>
|
| 69 | <javac srcdir="antsrc" destdir="${build.ant.classes.dir}" deprecation="true" debug="${build.compiler.debug}" source="1.8" target="1.8">
|
| 70 | <classpath refid="bootstrap-cp"/>
|
| 71 | + <exclude name="org/netbeans/nbbuild/CheckHelpSets.java"/>
|
| 72 | + <exclude name="org/netbeans/nbbuild/CheckHelpSetsBin.java"/>
|
| 73 | <compilerarg line="-Xlint -Xlint:-serial"/>
|
| 74 | </javac>
|
| 75 | <jar jarfile="${nbantext.jar}">
|
| 76 | @@ -461,18 +463,7 @@
|
| 77 | </fixcrlf>
|
| 78 | </target>
|
| 79 |
|
| 80 | - <target name="-download-nb-windows-launchers" depends="init,-check-nb-cluster" if="has.nb.cluster">
|
| 81 | - <downloadbinaries cache="${binaries.cache}" server="${binaries.server}" repos="${binaries.repos}">
|
| 82 | - <manifest dir="${nb_all}" includes="nb/ide.launcher/external/binaries-list"/>
|
| 83 | - </downloadbinaries>
|
| 84 | -
|
| 85 | - <mkdir dir="${netbeans.dest.dir}/bin" />
|
| 86 | - <unzip src="../nb/ide.launcher/external/launcher-external-binaries-2-6c17cc6.zip" dest="${netbeans.dest.dir}/bin">
|
| 87 | - <patternset>
|
| 88 | - <include name="netbeans*.exe"/>
|
| 89 | - </patternset>
|
| 90 | - </unzip>
|
| 91 | - </target>
|
| 92 | + <target name="-download-nb-windows-launchers" depends="init,-check-nb-cluster" if="has.nb.cluster"/>
|
| 93 |
|
| 94 | <target name="finish-build-nb" depends="init,-check-nb-cluster,-download-nb-windows-launchers,-load-module-flags" if="has.nb.cluster">
|
| 95 | <loadproperties srcFile="${clusters.list.file}" />
|