Skip to content

Remove unneeded jar from netbeans modules #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Remove unneeded jar from netbeans modules #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ netbeans-l10n/
.idea/
*.iml
/nbcode/l10n/locale_ja/release/
/nbcode/l10n/locale_zh_CN/release/
/nbcode/l10n/locale_zh_CN/release/
/nbcode/l10n/locale_ja/nbproject/private/
/nbcode/l10n/locale_zh_CN/nbproject/private/
20 changes: 14 additions & 6 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,18 @@
<delete dir="${lsp.build.dir}" />
<delete dir="vscode/node_modules" />
<delete dir="vscode/out" />
<ant dir="nbcode" target="clean" inheritall="false" inheritrefs="false"/>
<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>
</target>

<property name="netbeans.l10n.dir" location="netbeans-l10n"/>
<property name="nbcode.l10n.dir" location="nbcode/l10n"/>
<property name="vscode.nbcode.extra.dir" location="vscode/nbcode/extra"/>

<target name="build-l10n-ant-ext-jar">
<target name="build-l10n-ant-ext-jar" unless="disable.netbeans.l10n">
<ant dir="${netbeans.l10n.dir}/l10nantext" inheritall="false" inheritrefs="false">
<property name="file.reference.ant.jar" value="${ant.home}/lib/ant.jar"/>
</ant>
Expand All @@ -160,7 +164,7 @@
</fileset>
</delete>
</target>
<target name="clean-l10n-bundles">
<target name="clean-l10n-bundles" unless="disable.netbeans.l10n">
<delete dir="${netbeans.l10n.dir}/l10nantext/build"/>
<delete dir="${netbeans.l10n.dir}/l10nantext/dist"/>
<ant target="clean-l10n">
Expand All @@ -174,7 +178,7 @@
<property name="disable.netbeans.l10n" value="true"/>
</target>
<target name="build-l10n-bundles" depends="clean-l10n-bundles,build-l10n-ant-ext-jar" description="builds l10n language bundles for vs code extension"
unless="${disable.netbeans.l10n}">
unless="disable.netbeans.l10n">
<ant target="build-l10n">
<property name="locale" value="ja" description="japanese"/>
</ant>
Expand Down Expand Up @@ -298,7 +302,9 @@
<condition value="true" property="should-apply">
<and>
<istrue value="${has-l10n-patches}"/>
<isfalse value="${disable.netbeans.l10n}"/>
<not>
<istrue value="${disable.netbeans.l10n}"/>
</not>
</and>
</condition>
<ant target="git-patch">
Expand Down Expand Up @@ -347,7 +353,9 @@
<condition value="true" property="should-apply">
<and>
<istrue value="${has-l10n-patches}"/>
<isfalse value="${disable.netbeans.l10n}"/>
<not>
<istrue value="${disable.netbeans.l10n}"/>
</not>
</and>
</condition>
<ant target="git-un-patch">
Expand Down
1 change: 1 addition & 0 deletions nbcode/nbproject/platform.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ disabled.modules=\
org.openide.options,\
org.openidex.util,\
org.netbeans.api.web.webmodule,\
org.netbeans.lib.chrome_devtools_protocol,\
org.netbeans.libs.amazon,\
org.netbeans.libs.commons_fileupload,\
org.netbeans.libs.elimpl,\
Expand Down