Skip to content

Commit 88e17a0

Browse files
sowmensowmen
committed
2 parents de0d644 + 476d503 commit 88e17a0

File tree

7 files changed

+4118
-46
lines changed

7 files changed

+4118
-46
lines changed

‎nbproject/UPDATED.TXT

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Project FXSimulator build script updated
55
Project build script file jfx-impl.xml in nbproject sub-directory has not been recognized
66
as compliant with this version of NetBeans JavaFX support module. To ensure correct
77
and complete functionality within this NetBeans installation the script file has been
8-
backed up to jfx-impl_backup_3.xml and then updated to the currently supported state.
8+
backed up to jfx-impl_backup_4.xml and then updated to the currently supported state.
99

1010
FX Project build script auto-update may be triggered on project open either after
1111
NetBeans installation update or by manual changes in jfx-impl.xml. Please note that

‎nbproject/jfx-impl.xml

+47-5
Original file line numberDiff line numberDiff line change
@@ -327,26 +327,48 @@
327327
<property name="ant-javafx.jar.location" value="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
328328
</target>
329329
<target name="-check-ant-javafx-in-probjdk-lib" unless="ant-javafx.jar.location">
330+
<condition property="do.set.ant-javafx.in.probjdk.lib.has_jre">
331+
<available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
332+
</condition>
333+
<condition property="do.set.ant-javafx.in.probjdk.lib.no_jre">
334+
<available file="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
335+
</condition>
330336
<condition property="do.set.ant-javafx.in.probjdk.lib">
331337
<and>
332338
<not><isset property="ant-javafx.jar.location"/></not>
333-
<available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
339+
<or>
340+
<isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
341+
<isset property="do.set.ant-javafx.in.probjdk.lib.no_jre"/>
342+
</or>
334343
</and>
335344
</condition>
336345
</target>
337346
<target name="-set-ant-javafx-in-probjdk-lib" depends="-set-ant-javafx-in-platform-home-tools,-check-ant-javafx-in-probjdk-lib" if="do.set.ant-javafx.in.probjdk.lib">
338-
<property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
347+
<condition property="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar" else="${java.home}${file.separator}lib${file.separator}ant-javafx.jar">
348+
<isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
349+
</condition>
339350
</target>
340351
<target name="-check-ant-javafx-in-probjdk-tools" unless="ant-javafx.jar.location">
352+
<condition property="do.set.ant-javafx.in.probjdk.tools.has_jre">
353+
<available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
354+
</condition>
355+
<condition property="do.set.ant-javafx.in.probjdk.tools.no_jre">
356+
<available file="${java.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
357+
</condition>
341358
<condition property="do.set.ant-javafx.in.probjdk.tools">
342359
<and>
343360
<not><isset property="ant-javafx.jar.location"/></not>
344-
<available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
361+
<or>
362+
<isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
363+
<isset property="do.set.ant-javafx.in.probjdk.tools.no_jre"/>
364+
</or>
345365
</and>
346366
</condition>
347367
</target>
348368
<target name="-set-ant-javafx-in-probjdk-tools" depends="-set-ant-javafx-in-probjdk-lib,-check-ant-javafx-in-probjdk-tools" if="do.set.ant-javafx.in.probjdk.tools">
349-
<property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
369+
<condition property="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar" else="${java.home}${file.separator}tools${file.separator}ant-javafx.jar">
370+
<isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
371+
</condition>
350372
</target>
351373
<target name="-check-ant-javafx-in-macjdk-lib" unless="ant-javafx.jar.location">
352374
<condition property="do.set.ant-javafx.in.macjdk.lib">
@@ -1825,6 +1847,25 @@
18251847
18261848
// manifest
18271849
var man = jar.createManifest();
1850+
var userManifestPath = project.getProperty("manifest.file");
1851+
if (userManifestPath) {
1852+
var userManifestFile = project.resolveFile(userManifestPath);
1853+
if (userManifestFile.isFile()) {
1854+
var manifestEncoding = project.getProperty("manifest.encoding");
1855+
var userManifestReader = manifestEncoding ?
1856+
new java.io.InputStreamReader(
1857+
new java.io.FileInputStream(userManifestFile),
1858+
manifestEncoding) :
1859+
new java.io.InputStreamReader(
1860+
new java.io.FileInputStream(userManifestFile));
1861+
try {
1862+
var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader);
1863+
man.merge(userManifest);
1864+
} finally {
1865+
userManifestReader.close();
1866+
}
1867+
}
1868+
}
18281869
var a1val = new String(project.getProperty("application.vendor"));
18291870
var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
18301871
a1.setName("Implementation-Vendor");
@@ -3678,6 +3719,7 @@
36783719
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
36793720
<jvmarg line="${debug-args-line}"/>
36803721
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
3722+
<jvmarg value="-Dglass.disableGrab=true"/>
36813723
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
36823724
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
36833725
<jvmarg line="${run.jvmargs}"/>
@@ -3816,7 +3858,7 @@
38163858
<target name="-debug-javaws-debuggee" depends="-init-debug-args">
38173859
<echo message="Executing ${jfx.deployment.jnlp} in debug mode using ${active.webstart.executable}"/>
38183860
<exec executable="${active.webstart.executable}">
3819-
<env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
3861+
<env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address} -Dglass.disableGrab=true"/>
38203862
<arg value="-wait"/>
38213863
<arg file="${jfx.deployment.jnlp}"/>
38223864
</exec>

0 commit comments

Comments
 (0)