This is an automated email from the ASF dual-hosted git repository. thurka pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-vscode.git
commit 180595c8468be11701c29e527d585ccf612b0883 Author: Tomas Hurka <[email protected]> AuthorDate: Thu Aug 7 15:48:26 2025 +0200 netbeans.dest.dir fixed for nbcode app --- build.xml | 20 +++----------------- nbcode/nbproject/platform.properties | 4 ++-- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/build.xml b/build.xml index d4e58de..0ecdfd7 100644 --- a/build.xml +++ b/build.xml @@ -25,8 +25,6 @@ <property name="vsc.build.dir" location="build" /> <property name="nb_all" location="netbeans" /> <property name="nb_all.build.dir" location="${nb_all}/nbbuild" /> - <property name="nbplatform.default.netbeans.dest.dir" location="${nb_all.build.dir}/netbeans" /> - <property name="nbplatform.default.harness.dir" location="${nbplatform.default.netbeans.dest.dir}/harness" /> <property name="nbantext.jar" location="${nb_all.build.dir}/build/nbantext.jar" /> <import file="${nb_all.build.dir}/default.xml"/> <condition property="cmd.suffix" value=".cmd" else=""> @@ -39,11 +37,7 @@ <setproxy proxyhost="${proxyHost}" proxyPort="${proxyPort}"/> </target> <target name="build-lsp-server" depends="-set-use-jdk-javac,proxy-setup" description="Prepares NetBeans bits for VS Code extension"> - <ant dir="nbcode" target="build-zip" inheritall="false" inheritrefs="false"> - <property name="nbplatform.default.netbeans.dest.dir" location="${nbplatform.default.netbeans.dest.dir}" /> - <property name="nbplatform.default.harness.dir" location="${nbplatform.default.harness.dir}" /> - <property name="nbantext.jar" location="${nbantext.jar}" /> - </ant> + <ant dir="nbcode" target="build-zip" inheritall="false" inheritrefs="false" /> <unzip src="nbcode/dist/nbcode.zip" dest="${lsp.build.dir}/../"> <globmapper from="nbcode/nb/*" to="nbcode/nbcode/*"/> </unzip> @@ -81,11 +75,7 @@ <delete dir="${lsp.build.dir}" /> <delete dir="vscode/node_modules" /> <delete dir="vscode/out" /> - <ant dir="nbcode" target="clean" inheritall="false" inheritrefs="false"> - <property name="nbplatform.default.netbeans.dest.dir" location="${nbplatform.default.netbeans.dest.dir}" /> - <property name="nbplatform.default.harness.dir" location="${nbplatform.default.harness.dir}" /> - <property name="nbantext.jar" location="${nbantext.jar}" /> - </ant> + <ant dir="nbcode" target="clean" inheritall="false" inheritrefs="false" /> </target> <target name="build-vscode-ext" depends="add-extra-modules" description="Build the Visual Studio Code extension."> <taskdef name="gitbranchhash" classname="org.netbeans.nbbuild.GitBranchHash" classpath="${nbantext.jar}" /> @@ -170,11 +160,7 @@ <zip destfile="${vsc.build.dir}/apache-netbeans-java-${vsix.version}.vsix" basedir="${vsc.build.dir}/vscode-mandatory/" update="true" /> </target> <target name="test-lsp-server" description="Tests the LSP server behavior"> - <ant dir="nbcode" target="test" inheritall="false" inheritrefs="false"> - <property name="nbplatform.default.netbeans.dest.dir" location="${nbplatform.default.netbeans.dest.dir}" /> - <property name="nbplatform.default.harness.dir" location="${nbplatform.default.harness.dir}" /> - <property name="nbantext.jar" location="${nbantext.jar}" /> - </ant> + <ant dir="nbcode" target="test" inheritall="false" inheritrefs="false" /> </target> <target name="int-default" description="Bootstrap netbeans"> diff --git a/nbcode/nbproject/platform.properties b/nbcode/nbproject/platform.properties index 9d31175..4cf7a93 100644 --- a/nbcode/nbproject/platform.properties +++ b/nbcode/nbproject/platform.properties @@ -417,7 +417,7 @@ disabled.modules=\ org.netbeans.modules.groovy.kit,\ org.netbeans.modules.groovy.refactoring,\ org.netbeans.modules.groovy.samples -nbplatform.active=default +nbplatform.active=nball suite.dir=${basedir} -nbplatform.nball.netbeans.dest.dir=${suite.dir}/../../../nbbuild/netbeans +nbplatform.nball.netbeans.dest.dir=${suite.dir}/../netbeans/nbbuild/netbeans nbplatform.nball.harness.dir=${nbplatform.nball.netbeans.dest.dir}/harness --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
