Skip to content

Commit

Permalink
Many things
Browse files Browse the repository at this point in the history
  • Loading branch information
@cool00geek
cool00geek committed Jun 17, 2017
1 parent 6885e7f commit 26d4cf1
Show file tree
Hide file tree
Showing 8 changed files with 4,066 additions and 23 deletions.
2 changes: 1 addition & 1 deletion nbproject/UPDATED.TXT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Project CPscoreboard build script updated
Project build script file jfx-impl.xml in nbproject sub-directory has not been recognized
as compliant with this version of NetBeans JavaFX support module. To ensure correct
and complete functionality within this NetBeans installation the script file has been
backed up to jfx-impl_backup_10.xml and then updated to the currently supported state.
backed up to jfx-impl_backup_11.xml and then updated to the currently supported state.

FX Project build script auto-update may be triggered on project open either after
NetBeans installation update or by manual changes in jfx-impl.xml. Please note that
Expand Down
49 changes: 45 additions & 4 deletions nbproject/jfx-impl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,26 +327,48 @@
<property name="ant-javafx.jar.location" value="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
</target>
<target name="-check-ant-javafx-in-probjdk-lib" unless="ant-javafx.jar.location">
<condition property="do.set.ant-javafx.in.probjdk.lib.has_jre">
<available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
</condition>
<condition property="do.set.ant-javafx.in.probjdk.lib.no_jre">
<available file="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
</condition>
<condition property="do.set.ant-javafx.in.probjdk.lib">
<and>
<not><isset property="ant-javafx.jar.location"/></not>
<available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
<or>
<isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
<isset property="do.set.ant-javafx.in.probjdk.lib.no_jre"/>
</or>
</and>
</condition>
</target>
<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">
<property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
<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">
<isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
</condition>
</target>
<target name="-check-ant-javafx-in-probjdk-tools" unless="ant-javafx.jar.location">
<condition property="do.set.ant-javafx.in.probjdk.tools.has_jre">
<available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
</condition>
<condition property="do.set.ant-javafx.in.probjdk.tools.no_jre">
<available file="${java.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
</condition>
<condition property="do.set.ant-javafx.in.probjdk.tools">
<and>
<not><isset property="ant-javafx.jar.location"/></not>
<available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
<or>
<isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
<isset property="do.set.ant-javafx.in.probjdk.tools.no_jre"/>
</or>
</and>
</condition>
</target>
<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">
<property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
<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">
<isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
</condition>
</target>
<target name="-check-ant-javafx-in-macjdk-lib" unless="ant-javafx.jar.location">
<condition property="do.set.ant-javafx.in.macjdk.lib">
Expand Down Expand Up @@ -1825,6 +1847,25 @@
// manifest
var man = jar.createManifest();
var userManifestPath = project.getProperty("manifest.file");
if (userManifestPath) {
var userManifestFile = project.resolveFile(userManifestPath);
if (userManifestFile.isFile()) {
var manifestEncoding = project.getProperty("manifest.encoding");
var userManifestReader = manifestEncoding ?
new java.io.InputStreamReader(
new java.io.FileInputStream(userManifestFile),
manifestEncoding) :
new java.io.InputStreamReader(
new java.io.FileInputStream(userManifestFile));
try {
var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader);
man.merge(userManifest);
} finally {
userManifestReader.close();
}
}
}
var a1val = new String(project.getProperty("application.vendor"));
var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
a1.setName("Implementation-Vendor");
Expand Down
Loading

0 comments on commit 26d4cf1

Please sign in to comment.