Skip to content

Commit 92df4c7

Browse files
calebepbcalebepb
committed
Modificações na estrutura do projeto para a versão 7.2.1 do Netbeans.
1 parent 681aa15 commit 92df4c7

File tree

4 files changed

+77
-84
lines changed

4 files changed

+77
-84
lines changed

‎Source Code Inspection/nbproject/build-impl.xml‎

Lines changed: 60 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ is divided into following sections:
5454
<property file="nbproject/project.properties"/>
5555
</target>
5656
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
57-
<property name="platform.java" value="${java.home}/bin/java"/>
5857
<available file="${manifest.file}" property="manifest.available"/>
5958
<condition property="splashscreen.available">
6059
<and>
@@ -72,11 +71,10 @@ is divided into following sections:
7271
</not>
7372
</and>
7473
</condition>
75-
<condition property="profile.available">
74+
<condition property="manifest.available+main.class">
7675
<and>
77-
<isset property="javac.profile"/>
78-
<length length="0" string="${javac.profile}" when="greater"/>
79-
<matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
76+
<isset property="manifest.available"/>
77+
<isset property="main.class.available"/>
8078
</and>
8179
</condition>
8280
<condition property="do.archive">
@@ -93,6 +91,12 @@ is divided into following sections:
9391
</not>
9492
</and>
9593
</condition>
94+
<condition property="manifest.available+main.class+mkdist.available">
95+
<and>
96+
<istrue value="${manifest.available+main.class}"/>
97+
<isset property="do.mkdist"/>
98+
</and>
99+
</condition>
96100
<condition property="do.archive+manifest.available">
97101
<and>
98102
<isset property="manifest.available"/>
@@ -111,12 +115,24 @@ is divided into following sections:
111115
<istrue value="${do.archive}"/>
112116
</and>
113117
</condition>
114-
<condition property="do.archive+profile.available">
118+
<condition property="do.archive+manifest.available+main.class">
115119
<and>
116-
<isset property="profile.available"/>
120+
<istrue value="${manifest.available+main.class}"/>
117121
<istrue value="${do.archive}"/>
118122
</and>
119123
</condition>
124+
<condition property="manifest.available-mkdist.available">
125+
<or>
126+
<istrue value="${manifest.available}"/>
127+
<isset property="do.mkdist"/>
128+
</or>
129+
</condition>
130+
<condition property="manifest.available+main.class-mkdist.available">
131+
<or>
132+
<istrue value="${manifest.available+main.class}"/>
133+
<isset property="do.mkdist"/>
134+
</or>
135+
</condition>
120136
<condition property="have.tests">
121137
<or>
122138
<available file="${test.src.dir}"/>
@@ -170,15 +186,7 @@ is divided into following sections:
170186
</condition>
171187
<path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
172188
<condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
173-
<and>
174-
<isset property="endorsed.classpath"/>
175-
<not>
176-
<equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
177-
</not>
178-
</and>
179-
</condition>
180-
<condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
181-
<isset property="profile.available"/>
189+
<length length="0" string="${endorsed.classpath}" when="greater"/>
182190
</condition>
183191
<condition else="false" property="jdkBug6558476">
184192
<and>
@@ -267,7 +275,6 @@ is divided into following sections:
267275
<path path="@{classpath}"/>
268276
</classpath>
269277
<compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
270-
<compilerarg line="${javac.profile.cmd.line.arg}"/>
271278
<compilerarg line="${javac.compilerargs}"/>
272279
<compilerarg value="-processorpath"/>
273280
<compilerarg path="@{processorpath}:${empty.dir}"/>
@@ -307,7 +314,6 @@ is divided into following sections:
307314
<path path="@{classpath}"/>
308315
</classpath>
309316
<compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
310-
<compilerarg line="${javac.profile.cmd.line.arg}"/>
311317
<compilerarg line="${javac.compilerargs}"/>
312318
<customize/>
313319
</javac>
@@ -364,11 +370,6 @@ is divided into following sections:
364370
</and>
365371
</condition>
366372
</target>
367-
<target name="-init-test-properties">
368-
<property name="test.binaryincludes" value="&lt;nothing&gt;"/>
369-
<property name="test.binarytestincludes" value=""/>
370-
<property name="test.binaryexcludes" value=""/>
371-
</target>
372373
<target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
373374
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
374375
<attribute default="${includes}" name="includes"/>
@@ -392,7 +393,7 @@ is divided into following sections:
392393
</sequential>
393394
</macrodef>
394395
</target>
395-
<target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
396+
<target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
396397
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
397398
<attribute default="${includes}" name="includes"/>
398399
<attribute default="${excludes}" name="excludes"/>
@@ -406,9 +407,6 @@ is divided into following sections:
406407
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
407408
<filename name="@{testincludes}"/>
408409
</fileset>
409-
<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
410-
<filename name="${test.binarytestincludes}"/>
411-
</fileset>
412410
</batchtest>
413411
<syspropertyset>
414412
<propertyref prefix="test-sys-prop."/>
@@ -440,7 +438,7 @@ is divided into following sections:
440438
</fileset>
441439
</union>
442440
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
443-
<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="Source_Code_Inspection" testname="TestNG tests" workingDir="${work.dir}">
441+
<testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Source_Code_Inspection" testname="TestNG tests" workingDir="${work.dir}">
444442
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
445443
<propertyset>
446444
<propertyref prefix="test-sys-prop."/>
@@ -536,7 +534,7 @@ is divided into following sections:
536534
</sequential>
537535
</macrodef>
538536
</target>
539-
<target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
537+
<target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
540538
<macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
541539
<attribute default="${includes}" name="includes"/>
542540
<attribute default="${excludes}" name="excludes"/>
@@ -550,9 +548,6 @@ is divided into following sections:
550548
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
551549
<filename name="@{testincludes}"/>
552550
</fileset>
553-
<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
554-
<filename name="${test.binarytestincludes}"/>
555-
</fileset>
556551
</batchtest>
557552
<syspropertyset>
558553
<propertyref prefix="test-sys-prop."/>
@@ -831,8 +826,8 @@ is divided into following sections:
831826
</chainedmapper>
832827
</pathconvert>
833828
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
834-
<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}">
835-
<fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
829+
<copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
830+
<fileset dir="${build.classes.dir}"/>
836831
<manifest>
837832
<attribute name="Class-Path" value="${jar.classpath}"/>
838833
<customize/>
@@ -844,7 +839,7 @@ is divided into following sections:
844839
<target name="-init-presetdef-jar">
845840
<presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
846841
<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
847-
<j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
842+
<j2seproject1:fileset dir="${build.classes.dir}"/>
848843
</jar>
849844
</presetdef>
850845
</target>
@@ -925,7 +920,7 @@ is divided into following sections:
925920
<target if="has.persistence.xml" name="-copy-persistence-xml">
926921
<mkdir dir="${build.classes.dir}/META-INF"/>
927922
<copy todir="${build.classes.dir}/META-INF">
928-
<fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
923+
<fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
929924
</copy>
930925
</target>
931926
<target name="-post-compile">
@@ -960,67 +955,65 @@ is divided into following sections:
960955
<!-- Empty placeholder for easier customization. -->
961956
<!-- You can override this target in the ../build.xml file. -->
962957
</target>
963-
<target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
958+
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
959+
<j2seproject1:jar/>
960+
</target>
961+
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
962+
<j2seproject1:jar manifest="${manifest.file}"/>
963+
</target>
964+
<target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
965+
<j2seproject1:jar manifest="${manifest.file}">
966+
<j2seproject1:manifest>
967+
<j2seproject1:attribute name="Main-Class" value="${main.class}"/>
968+
</j2seproject1:manifest>
969+
</j2seproject1:jar>
970+
<echo level="info">To run this application from the command line without Ant, try:</echo>
971+
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
972+
<property location="${dist.jar}" name="dist.jar.resolved"/>
973+
<pathconvert property="run.classpath.with.dist.jar">
974+
<path path="${run.classpath}"/>
975+
<map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
976+
</pathconvert>
977+
<echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
978+
</target>
979+
<target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
964980
<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
965981
<touch file="${tmp.manifest.file}" verbose="false"/>
966982
</target>
967-
<target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
983+
<target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
968984
<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
969985
<copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
970986
</target>
971-
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
987+
<target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
972988
<manifest file="${tmp.manifest.file}" mode="update">
973989
<attribute name="Main-Class" value="${main.class}"/>
974990
</manifest>
975991
</target>
976-
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
977-
<manifest file="${tmp.manifest.file}" mode="update">
978-
<attribute name="Profile" value="${javac.profile}"/>
979-
</manifest>
980-
</target>
981-
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
992+
<target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
982993
<basename file="${application.splash}" property="splashscreen.basename"/>
983994
<mkdir dir="${build.classes.dir}/META-INF"/>
984995
<copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
985996
<manifest file="${tmp.manifest.file}" mode="update">
986997
<attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
987998
</manifest>
988999
</target>
989-
<target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
1000+
<target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
9901001
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
9911002
<echo level="info">To run this application from the command line without Ant, try:</echo>
9921003
<property location="${dist.jar}" name="dist.jar.resolved"/>
9931004
<echo level="info">java -jar "${dist.jar.resolved}"</echo>
9941005
</target>
995-
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
996-
<j2seproject1:jar manifest="${tmp.manifest.file}"/>
997-
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
998-
<property location="${dist.jar}" name="dist.jar.resolved"/>
999-
<pathconvert property="run.classpath.with.dist.jar">
1000-
<path path="${run.classpath}"/>
1001-
<map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1002-
</pathconvert>
1003-
<condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
1004-
<isset property="main.class.available"/>
1005-
</condition>
1006-
<condition else="debug" property="jar.usage.level" value="info">
1007-
<isset property="main.class.available"/>
1008-
</condition>
1009-
<echo level="${jar.usage.level}" message="${jar.usage.message}"/>
1010-
</target>
1011-
<target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
1006+
<target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
10121007
<delete>
10131008
<fileset file="${tmp.manifest.file}"/>
10141009
</delete>
10151010
</target>
1016-
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
1017-
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
1011+
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
10181012
<target name="-post-jar">
10191013
<!-- Empty placeholder for easier customization. -->
10201014
<!-- You can override this target in the ../build.xml file. -->
10211015
</target>
1022-
<target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
1023-
<target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
1016+
<target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
10241017
<!--
10251018
=================
10261019
EXECUTION SECTION

‎Source Code Inspection/nbproject/genfiles.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
build.xml.data.CRC32=35e2c666
2-
build.xml.script.CRC32=14b8e58d
3-
build.xml.stylesheet.CRC32=8064a381@1.68.1.46
2+
build.xml.script.CRC32=03bb7497
3+
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
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=35e2c666
7-
nbproject/build-impl.xml.script.CRC32=6d760cec
8-
nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
6+
nbproject/build-impl.xml.data.CRC32=5804ec04
7+
nbproject/build-impl.xml.script.CRC32=8eb5d78a
8+
nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46

0 commit comments

Comments
 (0)