Skip to content

Commit e279490

Browse files
yarlyarl
committed
chore: netbeans project files update
1 parent 665f2b2 commit e279490

File tree

5 files changed

+76
-70
lines changed

5 files changed

+76
-70
lines changed

‎nbproject/build-impl.xml

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ is divided into following sections:
4747
<property file="${user.properties.file}"/>
4848
<!-- The two properties below are usually overridden -->
4949
<!-- by the active platform. Just a fallback. -->
50-
<property name="default.javac.source" value="1.4"/>
51-
<property name="default.javac.target" value="1.4"/>
50+
<property name="default.javac.source" value="1.6"/>
51+
<property name="default.javac.target" value="1.6"/>
5252
</target>
5353
<target depends="-pre-init,-init-private,-init-user" name="-init-project">
5454
<property file="nbproject/configs/${config}.properties"/>
@@ -77,7 +77,7 @@ is divided into following sections:
7777
<and>
7878
<isset property="javac.profile"/>
7979
<length length="0" string="${javac.profile}" when="greater"/>
80-
<matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
80+
<matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
8181
</and>
8282
</condition>
8383
<condition property="do.archive">
@@ -122,9 +122,7 @@ is divided into following sections:
122122
</and>
123123
</condition>
124124
<condition property="have.tests">
125-
<or>
126-
<available file="${test.src.dir}"/>
127-
</or>
125+
<or/>
128126
</condition>
129127
<condition property="have.sources">
130128
<or>
@@ -157,6 +155,7 @@ is divided into following sections:
157155
<property name="application.args" value=""/>
158156
<property name="source.encoding" value="${file.encoding}"/>
159157
<property name="runtime.encoding" value="${source.encoding}"/>
158+
<property name="manifest.encoding" value="${source.encoding}"/>
160159
<condition property="javadoc.encoding.used" value="${javadoc.encoding}">
161160
<and>
162161
<isset property="javadoc.encoding"/>
@@ -231,7 +230,6 @@ is divided into following sections:
231230
</target>
232231
<target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
233232
<fail unless="src.dir">Must set src.dir</fail>
234-
<fail unless="test.src.dir">Must set test.src.dir</fail>
235233
<fail unless="build.dir">Must set build.dir</fail>
236234
<fail unless="dist.dir">Must set dist.dir</fail>
237235
<fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -413,9 +411,6 @@ is divided into following sections:
413411
<property name="junit.forkmode" value="perTest"/>
414412
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
415413
<batchtest todir="${build.test.results.dir}">
416-
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
417-
<filename name="@{testincludes}"/>
418-
</fileset>
419414
<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
420415
<filename name="${test.binarytestincludes}"/>
421416
</fileset>
@@ -444,11 +439,7 @@ is divided into following sections:
444439
<condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
445440
<isset property="test.method"/>
446441
</condition>
447-
<union id="test.set">
448-
<fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
449-
<filename name="@{testincludes}"/>
450-
</fileset>
451-
</union>
442+
<union id="test.set"/>
452443
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
453444
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="pattypan" testname="TestNG tests" workingDir="${work.dir}">
454445
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
@@ -557,9 +548,6 @@ is divided into following sections:
557548
<property name="junit.forkmode" value="perTest"/>
558549
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
559550
<batchtest todir="${build.test.results.dir}">
560-
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
561-
<filename name="@{testincludes}"/>
562-
</fileset>
563551
<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
564552
<filename name="${test.binarytestincludes}"/>
565553
</fileset>
@@ -841,7 +829,7 @@ is divided into following sections:
841829
</chainedmapper>
842830
</pathconvert>
843831
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
844-
<copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
832+
<copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
845833
<fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
846834
<manifest>
847835
<attribute name="Class-Path" value="${jar.classpath}"/>
@@ -853,7 +841,7 @@ is divided into following sections:
853841
</target>
854842
<target name="-init-presetdef-jar">
855843
<presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
856-
<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
844+
<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
857845
<j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
858846
</jar>
859847
</presetdef>
@@ -976,23 +964,23 @@ is divided into following sections:
976964
</target>
977965
<target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
978966
<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
979-
<copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
967+
<copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
980968
</target>
981969
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
982-
<manifest file="${tmp.manifest.file}" mode="update">
970+
<manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
983971
<attribute name="Main-Class" value="${main.class}"/>
984972
</manifest>
985973
</target>
986974
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
987-
<manifest file="${tmp.manifest.file}" mode="update">
975+
<manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
988976
<attribute name="Profile" value="${javac.profile}"/>
989977
</manifest>
990978
</target>
991979
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
992980
<basename file="${application.splash}" property="splashscreen.basename"/>
993981
<mkdir dir="${build.classes.dir}/META-INF"/>
994982
<copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
995-
<manifest file="${tmp.manifest.file}" mode="update">
983+
<manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
996984
<attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
997985
</manifest>
998986
</target>
@@ -1187,7 +1175,7 @@ is divided into following sections:
11871175
<target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
11881176
<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
11891177
<startprofiler/>
1190-
<antcal target="run-test-with-main"/>
1178+
<antcall target="run-test-with-main"/>
11911179
</target>
11921180
<target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
11931181
<fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
@@ -1251,13 +1239,11 @@ is divided into following sections:
12511239
<!-- You can override this target in the ../build.xml file. -->
12521240
</target>
12531241
<target if="do.depend.true" name="-compile-test-depend">
1254-
<j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1242+
<j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/>
12551243
</target>
12561244
<target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
1257-
<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
1258-
<copy todir="${build.test.classes.dir}">
1259-
<fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1260-
</copy>
1245+
<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir=""/>
1246+
<copy todir="${build.test.classes.dir}"/>
12611247
</target>
12621248
<target name="-post-compile-test">
12631249
<!-- Empty placeholder for easier customization. -->
@@ -1271,10 +1257,8 @@ is divided into following sections:
12711257
<target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
12721258
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
12731259
<j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
1274-
<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
1275-
<copy todir="${build.test.classes.dir}">
1276-
<fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1277-
</copy>
1260+
<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="" srcdir=""/>
1261+
<copy todir="${build.test.classes.dir}"/>
12781262
</target>
12791263
<target name="-post-compile-test-single">
12801264
<!-- Empty placeholder for easier customization. -->
@@ -1390,8 +1374,6 @@ is divided into following sections:
13901374
</propertyfile>
13911375
</target>
13921376
<target depends="init" name="-do-clean">
1393-
<property name="store.dir" value="store"/>
1394-
<delete dir="${store.dir}"/>
13951377
<delete dir="${build.dir}"/>
13961378
<delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
13971379
</target>

‎nbproject/genfiles.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
build.xml.data.CRC32=565cf59b
1+
build.xml.data.CRC32=a1c9267a
22
build.xml.script.CRC32=280de569
3-
build.xml.stylesheet.CRC32=8064a381@1.79.1.48
3+
build.xml.stylesheet.CRC32=8064a381@1.80.1.48
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=055efa72
7-
nbproject/build-impl.xml.script.CRC32=6649ca2a
8-
nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
6+
nbproject/build-impl.xml.data.CRC32=38fa065d
7+
nbproject/build-impl.xml.script.CRC32=d7c5f806
8+
nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

‎nbproject/jfx-impl.xml

Lines changed: 45 additions & 4 deletions
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");

0 commit comments

Comments
 (0)