327
327
<property name="ant-javafx.jar.location" value="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
329
329
<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"/>
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"/>
330
336
<condition property="do.set.ant-javafx.in.probjdk.lib">
332
338
<not><isset property="ant-javafx.jar.location"/></not>
333
<available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
340
<isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
341
<isset property="do.set.ant-javafx.in.probjdk.lib.no_jre"/>
337
346
<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"/>
340
351
<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"/>
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"/>
341
358
<condition property="do.set.ant-javafx.in.probjdk.tools">
343
360
<not><isset property="ant-javafx.jar.location"/></not>
344
<available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
362
<isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
363
<isset property="do.set.ant-javafx.in.probjdk.tools.no_jre"/>
348
368
<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"/>
351
373
<target name="-check-ant-javafx-in-macjdk-lib" unless="ant-javafx.jar.location">
352
374
<condition property="do.set.ant-javafx.in.macjdk.lib">
1827
1849
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),
1859
new java.io.InputStreamReader(
1860
new java.io.FileInputStream(userManifestFile));
1862
var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader);
1863
man.merge(userManifest);
1865
userManifestReader.close();
1828
1869
var a1val = new String(project.getProperty("application.vendor"));
1829
1870
var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
1830
1871
a1.setName("Implementation-Vendor");