Skip to content

Commit 4b22162

Browse files
authored
Merge pull request #289 from sid-srini/remove_unneeded_jars
Remove unneeded jar from netbeans modules
2 parents 423c481 + 6853bb5 commit 4b22162

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ netbeans-l10n/
55
.idea/
66
*.iml
77
/nbcode/l10n/locale_ja/release/
8-
/nbcode/l10n/locale_zh_CN/release/
8+
/nbcode/l10n/locale_zh_CN/release/
9+
/nbcode/l10n/locale_ja/nbproject/private/
10+
/nbcode/l10n/locale_zh_CN/nbproject/private/

build.xml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,18 @@
126126
<delete dir="${lsp.build.dir}" />
127127
<delete dir="vscode/node_modules" />
128128
<delete dir="vscode/out" />
129-
<ant dir="nbcode" target="clean" inheritall="false" inheritrefs="false"/>
129+
<ant dir="nbcode" target="clean" inheritall="false" inheritrefs="false">
130+
<property name="nbplatform.default.netbeans.dest.dir" location="${nbplatform.default.netbeans.dest.dir}" />
131+
<property name="nbplatform.default.harness.dir" location="${nbplatform.default.harness.dir}" />
132+
<property name="nbantext.jar" location="${nbantext.jar}" />
133+
</ant>
130134
</target>
131135

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

136-
<target name="build-l10n-ant-ext-jar">
140+
<target name="build-l10n-ant-ext-jar" unless="disable.netbeans.l10n">
137141
<ant dir="${netbeans.l10n.dir}/l10nantext" inheritall="false" inheritrefs="false">
138142
<property name="file.reference.ant.jar" value="${ant.home}/lib/ant.jar"/>
139143
</ant>
@@ -160,7 +164,7 @@
160164
</fileset>
161165
</delete>
162166
</target>
163-
<target name="clean-l10n-bundles">
167+
<target name="clean-l10n-bundles" unless="disable.netbeans.l10n">
164168
<delete dir="${netbeans.l10n.dir}/l10nantext/build"/>
165169
<delete dir="${netbeans.l10n.dir}/l10nantext/dist"/>
166170
<ant target="clean-l10n">
@@ -174,7 +178,7 @@
174178
<property name="disable.netbeans.l10n" value="true"/>
175179
</target>
176180
<target name="build-l10n-bundles" depends="clean-l10n-bundles,build-l10n-ant-ext-jar" description="builds l10n language bundles for vs code extension"
177-
unless="${disable.netbeans.l10n}">
181+
unless="disable.netbeans.l10n">
178182
<ant target="build-l10n">
179183
<property name="locale" value="ja" description="japanese"/>
180184
</ant>
@@ -298,7 +302,9 @@
298302
<condition value="true" property="should-apply">
299303
<and>
300304
<istrue value="${has-l10n-patches}"/>
301-
<isfalse value="${disable.netbeans.l10n}"/>
305+
<not>
306+
<istrue value="${disable.netbeans.l10n}"/>
307+
</not>
302308
</and>
303309
</condition>
304310
<ant target="git-patch">
@@ -347,7 +353,9 @@
347353
<condition value="true" property="should-apply">
348354
<and>
349355
<istrue value="${has-l10n-patches}"/>
350-
<isfalse value="${disable.netbeans.l10n}"/>
356+
<not>
357+
<istrue value="${disable.netbeans.l10n}"/>
358+
</not>
351359
</and>
352360
</condition>
353361
<ant target="git-un-patch">

nbcode/nbproject/platform.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ disabled.modules=\
363363
org.openide.options,\
364364
org.openidex.util,\
365365
org.netbeans.api.web.webmodule,\
366+
org.netbeans.lib.chrome_devtools_protocol,\
366367
org.netbeans.libs.amazon,\
367368
org.netbeans.libs.commons_fileupload,\
368369
org.netbeans.libs.elimpl,\

0 commit comments

Comments
 (0)