From ddb2e43a0d8b33048d470e79c44b9f4d97ef7130 Mon Sep 17 00:00:00 2001
From: Don Brutzman <brutzman@nps.edu>
Date: Sun, 14 Jun 2020 20:50:30 -0700
Subject: [PATCH] improved javac, javadoc invocations
---
build.xml | 264 +++++++++++++++++++++++++++---------------------------
1 file changed, 134 insertions(+), 130 deletions(-)
diff --git a/build.xml b/build.xml
index eadb05570c..156e53ae64 100644
--- a/build.xml
+++ b/build.xml
@@ -2699,6 +2699,7 @@ ignoreSetupDownloadErrors=true
<arg value="--predef"/>
<arg value="${sceneScriptFieldGlobals}"/> <!-- defined in sceneScriptFieldGlobals.properties -->
<arg value="@{file.path.name}"/>
+ <exclude name="javadoc/**/*.js"/>
</java>
<!-- clean up -->
<var name="sceneScriptFieldGlobals" unset="true"/>
@@ -4161,7 +4162,8 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
expand="on"/>
<!-- expand:on since DTD defaults needed -->
<!-- <echo message="... compiling ${name.short}.java"/> -->
- <javac srcdir ="${relative.path1}/${relative.path2}/"
+ <javac srcdir="${relative.path1}/${relative.path2}/"
+ includes="${name.short}.java"
classpath="${x3djsail.stylesheets.dir}/${jsai.full.archive.jar.name}"
destdir="${java.classes.dir}"
debug="on"
@@ -4170,68 +4172,69 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
verbose="${javac.verbose}"
failonerror="false"
includeantruntime="false">
- <include name="${name.short}.java"/>
- <exclude name="newX3dScript.java"/>
- <exclude name="**/CircleLines.*"/>
- <exclude name="**/bounce2.*"/>
- <exclude name="**/javasrc/**/*"/>
- <exclude name="**/originals/**/*"/>
- <!-- X3dForWebAuthors -->
- <exclude name="KelpForestExhibit/FishSchoolCode/*"/>
- <!-- Basic -->
- <exclude name="course\ExtrusionXj3dGoldberg1999.*"/>
- <exclude name="development/TestRegularExpressionChecks.*"/>
- <exclude name="development/TestSchematronDiagnostics.*"/>
- <exclude name="development/QuadTreeExamples.*"/>
- <exclude name="development/SpinGroupInternalSubsetDeclaration.*"/>
- <exclude name="DistributedInteractiveSimulation/EntityProcessor*"/>
- <exclude name="DistributedInteractiveSimulation/BaseballBackspin/*"/>
- <exclude name="DistributedInteractiveSimulation/CannonProject/*"/>
- <exclude name="DistributedInteractiveSimulation/EntityProcessor.*"/>
- <exclude name="ExperimentalBinaryCompression/isenburg/**/*"/>
- <exclude name="ExternalAuthoringInterface/BoxEai.*"/>
- <exclude name="ExternalAuthoringInterface/CreateSphereEai.*"/>
- <exclude name="ExternalAuthoringInterface/HelixEai.*"/>
- <exclude name="ExternalAuthoringInterface/SwitcherEai.*"/>
- <exclude name="ExternalAuthoringInterface/ViewSwitchEai.*"/>
- <exclude name="ExternalAuthoringInterface/code/**/*"/>
- <exclude name="ExternalAuthoringInterface/GraphicalLogAnalyzer*"/>
- <exclude name="Geospatial/GeoVrmlSiteExamples/**/*"/>
- <exclude name="HumanoidAnimation/ClientNetListener.*"/>
- <exclude name="HumanoidAnimation/VoiceActivated/*"/>
- <exclude name="LatticeXvl/XvlShell.*"/>
- <exclude name="Networking/ConnectionScript.*"/>
- <exclude name="Networking/NetworkSensorScript.*"/>
- <exclude name="NURBS/NurbsCurve.*"/>
- <exclude name="NURBS/NurbsPatchSurface.*"/>
- <exclude name="NURBS/NurbsPositionInterpolator.*"/>
- <exclude name="ScriptConformance/originalExamples/*"/>
- <exclude name="ScriptConformance/SAIExample*.*"/>
- <exclude name="ScriptConformance/ScriptNodeEventOutControl.*"/>
- <exclude name="ScriptConformance/ScriptNodeFieldControl.*"/>
- <exclude name="ScriptConformance/vrml/**/*"/>
- <exclude name="ScriptConformance/originalExamples/*"/>
- <exclude name="StudentProjects/DeadReckoningComparisons/*"/>
- <exclude name="StudentProjects/melon/*"/>
- <exclude name="StudentProjects/Race20/**/*"/>
- <exclude name="X3dSpecifications/SAIExample*.*"/>
- <!-- ConformanceNist -->
- <exclude name="Miscellaneous/Script/**/*"/>
- <!-- Savage -->
- <exclude name="services/WebServices/**/*"/>
- <exclude name="CommunicationsAndSensors/Sonobuoys/rra/**/*"/>
- <exclude name="CommunicationsAndSensors/Sonobuoys/rra-orig/**/*"/>
- <exclude name="CommunicationsAndSensors/TSSR/CommPduGenerator.*"/>
- <exclude name="Scenarios/PiracyIncidents/java/**/*"/>
- <exclude name="Scenarios/TankManeuver/SRTG.*"/>
- <exclude name="Tools/Slider/FloatScaler.*"/>
- <exclude name="Tools/Slider/ScaledSFFloatScript.*"/>
- <exclude name="Tools/Slider/SingleTypeConversionScript.*"/>
- <exclude name="Tools/Slider/SliderScript.*"/>
- <exclude name="Tools/Slider/widget/**/*"/>
- <exclude name="Tools/Terrain/GeoManager.*"/>
- <!-- SavageDefense -->
- <exclude name="qrcode/**/*.*"/>
+ <!-- the following exclude statements are duplicated in processScenes.java and processScenes.javadoc since fileset is not allowed here -->
+ <exclude name="newX3dScript.java"/>
+ <exclude name="**/CircleLines.*"/>
+ <exclude name="**/bounce2.*"/>
+ <exclude name="**/javasrc/**/*"/>
+ <exclude name="**/originals/**/*"/>
+ <!-- X3dForWebAuthors -->
+ <exclude name="KelpForestExhibit/FishSchoolCode/*"/>
+ <!-- Basic -->
+ <exclude name="course\ExtrusionXj3dGoldberg1999.*"/>
+ <exclude name="development/TestRegularExpressionChecks.*"/>
+ <exclude name="development/TestSchematronDiagnostics.*"/>
+ <exclude name="development/QuadTreeExamples.*"/>
+ <exclude name="development/SpinGroupInternalSubsetDeclaration.*"/>
+ <exclude name="DistributedInteractiveSimulation/EntityProcessor*"/>
+ <exclude name="DistributedInteractiveSimulation/BaseballBackspin/*"/>
+ <exclude name="DistributedInteractiveSimulation/CannonProject/*"/>
+ <exclude name="DistributedInteractiveSimulation/EntityProcessor.*"/>
+ <exclude name="ExperimentalBinaryCompression/isenburg/**/*"/>
+ <exclude name="ExternalAuthoringInterface/BoxEai.*"/>
+ <exclude name="ExternalAuthoringInterface/CreateSphereEai.*"/>
+ <exclude name="ExternalAuthoringInterface/HelixEai.*"/>
+ <exclude name="ExternalAuthoringInterface/SwitcherEai.*"/>
+ <exclude name="ExternalAuthoringInterface/ViewSwitchEai.*"/>
+ <exclude name="ExternalAuthoringInterface/code/**/*"/>
+ <exclude name="ExternalAuthoringInterface/GraphicalLogAnalyzer*"/>
+ <exclude name="Geospatial/GeoVrmlSiteExamples/**/*"/>
+ <exclude name="HumanoidAnimation/ClientNetListener.*"/>
+ <exclude name="HumanoidAnimation/VoiceActivated/*"/>
+ <exclude name="LatticeXvl/XvlShell.*"/>
+ <exclude name="Networking/ConnectionScript.*"/>
+ <exclude name="Networking/NetworkSensorScript.*"/>
+ <exclude name="NURBS/NurbsCurve.*"/>
+ <exclude name="NURBS/NurbsPatchSurface.*"/>
+ <exclude name="NURBS/NurbsPositionInterpolator.*"/>
+ <exclude name="ScriptConformance/originalExamples/*"/>
+ <exclude name="ScriptConformance/SAIExample*.*"/>
+ <exclude name="ScriptConformance/ScriptNodeEventOutControl.*"/>
+ <exclude name="ScriptConformance/ScriptNodeFieldControl.*"/>
+ <exclude name="ScriptConformance/vrml/**/*"/>
+ <exclude name="ScriptConformance/originalExamples/*"/>
+ <exclude name="StudentProjects/DeadReckoningComparisons/*"/>
+ <exclude name="StudentProjects/melon/*"/>
+ <exclude name="StudentProjects/Race20/**/*"/>
+ <exclude name="X3dSpecifications/SAIExample*.*"/>
+ <!-- ConformanceNist -->
+ <exclude name="Miscellaneous/Script/**/*"/>
+ <!-- Savage -->
+ <exclude name="services/WebServices/**/*"/>
+ <exclude name="CommunicationsAndSensors/Sonobuoys/rra/**/*"/>
+ <exclude name="CommunicationsAndSensors/Sonobuoys/rra-orig/**/*"/>
+ <exclude name="CommunicationsAndSensors/TSSR/CommPduGenerator.*"/>
+ <exclude name="Scenarios/PiracyIncidents/java/**/*"/>
+ <exclude name="Scenarios/TankManeuver/SRTG.*"/>
+ <exclude name="Tools/Slider/FloatScaler.*"/>
+ <exclude name="Tools/Slider/ScaledSFFloatScript.*"/>
+ <exclude name="Tools/Slider/SingleTypeConversionScript.*"/>
+ <exclude name="Tools/Slider/SliderScript.*"/>
+ <exclude name="Tools/Slider/widget/**/*"/>
+ <exclude name="Tools/Terrain/GeoManager.*"/>
+ <!-- SavageDefense -->
+ <exclude name="qrcode/**/*.*"/>
+
<!-- https://ant.apache.org/manual/Tasks/javac.html#bootstrap -->
<!-- https://stackoverflow.com/questions/4134803/ant-passing-compilerarg-into-javac -->
<!-- https://stackoverflow.com/questions/20174355/how-class-loading-is-done-by-using-xbootclasspath-ppath -->
@@ -4375,7 +4378,6 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
</for>
<antcall target="echo.timestamp"/>
<echo>processScenes.python complete.</echo>
- <!-- <antcall target="processScenes.javadoc"/> -->
<echo message="==============================================================="/>
</target>
@@ -4522,72 +4524,74 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
<exclude name="**/*.html"/>
</packageset>
-->
- <fileset dir="." defaultexcludes="yes">
- <include name="*.java"/>
- <include name="**/*.java"/>
- <exclude name="**/*.html"/>
- <exclude name="newX3dScript.java"/>
- <exclude name="**/CircleLines.*"/>
- <exclude name="**/bounce2.*"/>
- <exclude name="**/javasrc/**/*"/>
- <exclude name="**/originals/**/*"/>
- <!-- X3dForWebAuthors -->
- <exclude name="KelpForestExhibit/FishSchoolCode/*"/>
- <!-- Basic -->
- <exclude name="course\ExtrusionXj3dGoldberg1999.*"/>
- <exclude name="development/TestRegularExpressionChecks.*"/>
- <exclude name="development/TestSchematronDiagnostics.*"/>
- <exclude name="development/QuadTreeExamples.*"/>
- <exclude name="development/SpinGroupInternalSubsetDeclaration.*"/>
- <exclude name="DistributedInteractiveSimulation/EntityProcessor*"/>
- <exclude name="DistributedInteractiveSimulation/BaseballBackspin/*"/>
- <exclude name="DistributedInteractiveSimulation/CannonProject/*"/>
- <exclude name="DistributedInteractiveSimulation/EntityProcessor.*"/>
- <exclude name="ExperimentalBinaryCompression/isenburg/**/*"/>
- <exclude name="ExternalAuthoringInterface/BoxEai.*"/>
- <exclude name="ExternalAuthoringInterface/CreateSphereEai.*"/>
- <exclude name="ExternalAuthoringInterface/HelixEai.*"/>
- <exclude name="ExternalAuthoringInterface/SwitcherEai.*"/>
- <exclude name="ExternalAuthoringInterface/ViewSwitchEai.*"/>
- <exclude name="ExternalAuthoringInterface/code/**/*"/>
- <exclude name="ExternalAuthoringInterface/GraphicalLogAnalyzer*"/>
- <exclude name="Geospatial/GeoVrmlSiteExamples/**/*"/>
- <exclude name="HumanoidAnimation/ClientNetListener.*"/>
- <exclude name="HumanoidAnimation/VoiceActivated/*"/>
- <exclude name="LatticeXvl/XvlShell.*"/>
- <exclude name="Networking/ConnectionScript.*"/>
- <exclude name="Networking/NetworkSensorScript.*"/>
- <exclude name="NURBS/NurbsCurve.*"/>
- <exclude name="NURBS/NurbsPatchSurface.*"/>
- <exclude name="NURBS/NurbsPositionInterpolator.*"/>
- <exclude name="ScriptConformance/originalExamples/*"/>
- <exclude name="ScriptConformance/SAIExample*.*"/>
- <exclude name="ScriptConformance/ScriptNodeEventOutControl.*"/>
- <exclude name="ScriptConformance/ScriptNodeFieldControl.*"/>
- <exclude name="ScriptConformance/vrml/**/*"/>
- <exclude name="ScriptConformance/originalExamples/*"/>
- <exclude name="StudentProjects/DeadReckoningComparisons/*"/>
- <exclude name="StudentProjects/melon/*"/>
- <exclude name="StudentProjects/Race20/**/*"/>
- <exclude name="X3dSpecifications/SAIExample*.*"/>
- <!-- ConformanceNist -->
- <exclude name="Miscellaneous/Script/**/*"/>
- <!-- Savage -->
- <exclude name="services/WebServices/**/*"/>
- <exclude name="CommunicationAndSensors/Sonobuoys/rra*/**/*"/>
- <exclude name="CommunicationAndSensors/TSSR/CommPduGenerator.*"/>
- <exclude name="Scenarios/PiracyIncidents/java/**/*"/>
- <exclude name="Savage/Tools/Authoring/PixelTextureGenerator.java"/>
- <exclude name="Scenarios/TankManeuver/SRTG.*"/>
- <exclude name="Tools/Slider/FloatScaler.*"/>
- <exclude name="Tools/Slider/ScaledSFFloatScript.*"/>
- <exclude name="Tools/Slider/SingleTypeConversionScript.*"/>
- <exclude name="Tools/Slider/SliderScript.*"/>
- <exclude name="Tools/Slider/widget/**/*"/>
- <exclude name="Tools/Terrain/GeoManager.*"/>
- <!-- SavageDefense -->
- <exclude name="qrcode/**/*.*"/>
- </fileset>
+ <fileset dir="." defaultexcludes="yes">
+ <include name="*.java"/>
+ <include name="*/*.java"/>
+ <include name="*/*/*.java"/>
+
+ <!-- the following exclude statements are duplicated in processScenes.java and processScenes.javadoc since fileset is not allowed here -->
+ <exclude name="newX3dScript.java"/>
+ <exclude name="**/CircleLines.*"/>
+ <exclude name="**/bounce2.*"/>
+ <exclude name="**/javasrc/**/*"/>
+ <exclude name="**/originals/**/*"/>
+ <!-- X3dForWebAuthors -->
+ <exclude name="KelpForestExhibit/FishSchoolCode/*"/>
+ <!-- Basic -->
+ <exclude name="course\ExtrusionXj3dGoldberg1999.*"/>
+ <exclude name="development/TestRegularExpressionChecks.*"/>
+ <exclude name="development/TestSchematronDiagnostics.*"/>
+ <exclude name="development/QuadTreeExamples.*"/>
+ <exclude name="development/SpinGroupInternalSubsetDeclaration.*"/>
+ <exclude name="DistributedInteractiveSimulation/EntityProcessor*"/>
+ <exclude name="DistributedInteractiveSimulation/BaseballBackspin/*"/>
+ <exclude name="DistributedInteractiveSimulation/CannonProject/*"/>
+ <exclude name="DistributedInteractiveSimulation/EntityProcessor.*"/>
+ <exclude name="ExperimentalBinaryCompression/isenburg/**/*"/>
+ <exclude name="ExternalAuthoringInterface/BoxEai.*"/>
+ <exclude name="ExternalAuthoringInterface/CreateSphereEai.*"/>
+ <exclude name="ExternalAuthoringInterface/HelixEai.*"/>
+ <exclude name="ExternalAuthoringInterface/SwitcherEai.*"/>
+ <exclude name="ExternalAuthoringInterface/ViewSwitchEai.*"/>
+ <exclude name="ExternalAuthoringInterface/code/**/*"/>
+ <exclude name="ExternalAuthoringInterface/GraphicalLogAnalyzer*"/>
+ <exclude name="Geospatial/GeoVrmlSiteExamples/**/*"/>
+ <exclude name="HumanoidAnimation/ClientNetListener.*"/>
+ <exclude name="HumanoidAnimation/VoiceActivated/*"/>
+ <exclude name="LatticeXvl/XvlShell.*"/>
+ <exclude name="Networking/ConnectionScript.*"/>
+ <exclude name="Networking/NetworkSensorScript.*"/>
+ <exclude name="NURBS/NurbsCurve.*"/>
+ <exclude name="NURBS/NurbsPatchSurface.*"/>
+ <exclude name="NURBS/NurbsPositionInterpolator.*"/>
+ <exclude name="ScriptConformance/originalExamples/*"/>
+ <exclude name="ScriptConformance/SAIExample*.*"/>
+ <exclude name="ScriptConformance/ScriptNodeEventOutControl.*"/>
+ <exclude name="ScriptConformance/ScriptNodeFieldControl.*"/>
+ <exclude name="ScriptConformance/vrml/**/*"/>
+ <exclude name="ScriptConformance/originalExamples/*"/>
+ <exclude name="StudentProjects/DeadReckoningComparisons/*"/>
+ <exclude name="StudentProjects/melon/*"/>
+ <exclude name="StudentProjects/Race20/**/*"/>
+ <exclude name="X3dSpecifications/SAIExample*.*"/>
+ <!-- ConformanceNist -->
+ <exclude name="Miscellaneous/Script/**/*"/>
+ <!-- Savage -->
+ <exclude name="services/WebServices/**/*"/>
+ <exclude name="CommunicationsAndSensors/Sonobuoys/rra/**/*"/>
+ <exclude name="CommunicationsAndSensors/Sonobuoys/rra-orig/**/*"/>
+ <exclude name="CommunicationsAndSensors/TSSR/CommPduGenerator.*"/>
+ <exclude name="Scenarios/PiracyIncidents/java/**/*"/>
+ <exclude name="Scenarios/TankManeuver/SRTG.*"/>
+ <exclude name="Tools/Slider/FloatScaler.*"/>
+ <exclude name="Tools/Slider/ScaledSFFloatScript.*"/>
+ <exclude name="Tools/Slider/SingleTypeConversionScript.*"/>
+ <exclude name="Tools/Slider/SliderScript.*"/>
+ <exclude name="Tools/Slider/widget/**/*"/>
+ <exclude name="Tools/Terrain/GeoManager.*"/>
+ <!-- SavageDefense -->
+ <exclude name="qrcode/**/*.*"/>
+ </fileset>
</javadoc>
</target>
--
GitLab