VSCode: Allow for adding extra modules when building extension vsix p…

…ackage. (#5865)
apache · Apr 25, 2023 · 01e4bb2 · 01e4bb2
1 parent a56df8c
commit 01e4bb2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/java/java.lsp.server/build.xml b/java/java.lsp.server/build.xml
@@ -43,10 +43,21 @@
         <chmod file="${lsp.build.dir}/java/maven/bin/mvn" perm="u+x" />
 
         <property name="3rdparty.modules" value=".*externalcodeformatter.*"/>
-        <autoupdate todir="${lsp.build.dir}/extra" updatecenter="https://netbeans.apache.org/nb/plugins/14/catalog.xml.gz">
+        <autoupdate todir="${lsp.build.dir}/extra" updatecenter="https://netbeans.apache.org/nb/plugins/17/catalog.xml.gz">
             <modules includes="${3rdparty.modules}"/>
         </autoupdate>
     </target>
+    <target name="add-extra-modules" depends="build-lsp-server" if="extra.modules">
+        <ant dir="../../nbbuild" target="build-nbms" inheritall="false" inheritrefs="false">
+            <property name="cluster.config" value="basic"/>
+        </ant>
+        <ant dir="../../nbbuild" target="generate-uc-catalog" inheritall="false" inheritrefs="false"/>
+        <makeurl file="../../nbbuild/nbms/updates.xml.gz" property="update.center.url"/>
+        <autoupdate installdir="${lsp.build.dir}" updatecenter="${update.center.url}">
+            <modules includes="${extra.modules}"/>
+        </autoupdate>
+        <delete file="../../nbbuild/nbms/tasks.jar"/>
+    </target>
     <target name="-set-use-jdk-javac">
         <property name="test.use.jdk.javac" value="true" />
     </target>
@@ -56,7 +67,7 @@
         <delete dir="vscode/out" />
         <ant dir="nbcode" target="clean" inheritall="false" inheritrefs="false"/>
     </target>
-    <target name="build-vscode-ext" depends="build-lsp-server" description="Build the Visual Studio Code extension.">
+    <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}" />
         <gitbranchhash file="." branchproperty="metabuild.branch" hashproperty="metabuild.hash" />
         <condition property="metabuild.hash" value="master" >

diff --git a/java/java.lsp.server/script/etc/nbcode.clusters b/java/java.lsp.server/script/etc/nbcode.clusters
@@ -6,5 +6,6 @@ java
 groovy
 cpplite
 extra
+apisupport
 enterprise
 nbcode
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,5 +6,6 @@ java @@
     groovy
     cpplite
     extra
+    apisupport
     enterprise
     nbcode