diff --git a/build.properties b/build.properties index 9758be32e7c04e4d2adb7d4bcb96f8dfd4528517..401b692d7ddf7a3e39105df0dbb812841263aeee 100644 --- a/build.properties +++ b/build.properties @@ -31,5 +31,6 @@ mac.run.args=${common.run.args} \ dot.viskit.dir=${user.home}/.${product.shortname} c_app.xml=${viskit.dir}/configuration/c_app.xml c_gui.xml=${viskit.dir}/configuration/c_gui.xml +proj.xml=${viskit.dir}/configuration/viskitProject.xml splash.image=${viskit.dir}/configuration/ViskitSplash2.png diff --git a/build.xml b/build.xml index 6223df117e8f940eb31b536f90dfa0daab754ec1..52600ba1db0af2eb4f507158ca66538eae12ac22 100644 --- a/build.xml +++ b/build.xml @@ -327,6 +327,7 @@ POSSIBILITY OF SUCH DAMAGE. <!-- ${c_app.xml} and ${c_gui.xml} are properties in the build.properties definitions --> <copy todir="${dot.viskit.dir}" file="${c_app.xml}" verbose="true"/> <copy todir="${dot.viskit.dir}" file="${c_gui.xml}" verbose="true"/> + <copy todir="examples/src/ViskitOpenDis7Examples" file="${proj.xml}" overwrite="true"/> </target> </project> \ No newline at end of file diff --git a/examples/src/ViskitOpenDis7Examples/viskitProject.xml b/examples/src/ViskitOpenDis7Examples/viskitProject.xml index 1d20dbac80274c45b7e83d70c0852ed95ea99f27..48c4dcd7bbab1d2c2553fe19a879c2c25f5294e6 100644 --- a/examples/src/ViskitOpenDis7Examples/viskitProject.xml +++ b/examples/src/ViskitOpenDis7Examples/viskitProject.xml @@ -9,8 +9,4 @@ </BuildDirectory> <DistDirectory name="dist" /> <LibDirectory name="lib" /> - <Cached></Cached> - <extraClassPaths> - </extraClassPaths> </ViskitProject> - diff --git a/viskit/MyViskitProjects/DefaultProject/viskitProject.xml b/viskit/MyViskitProjects/DefaultProject/viskitProject.xml index 1a7a1fb34bf2bcba5b570b67f0793a7e0b6c9c27..9473b41173aa29e476a14ae8e3fef4af80439c9a 100644 --- a/viskit/MyViskitProjects/DefaultProject/viskitProject.xml +++ b/viskit/MyViskitProjects/DefaultProject/viskitProject.xml @@ -11,5 +11,7 @@ <LibDirectory name="lib" /> <Cached> </Cached> + <extraClassPaths> + </extraClassPaths> </ViskitProject> diff --git a/viskit/configuration/viskitProject.xml b/viskit/configuration/viskitProject.xml index 91c9a9e3e6ee9ec708e59c9cf3bedc2f97236e45..48c4dcd7bbab1d2c2553fe19a879c2c25f5294e6 100644 --- a/viskit/configuration/viskitProject.xml +++ b/viskit/configuration/viskitProject.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<ViskitProject name="DefaultProject"> +<ViskitProject name="ViskitOpenDis7Examples"> <AnalystReports name="AnalystReports" /> <AssembliesDirectory name="Assemblies" /> <EventGraphsDirectory name="EventGraphs" /> diff --git a/viskit/lib/viskit.jar b/viskit/lib/viskit.jar index 2cc557c93000b6ac9fde515e021b58c639abdf3f..267750428ee0734fb55e17ab61fe590d0f9a599b 100644 Binary files a/viskit/lib/viskit.jar and b/viskit/lib/viskit.jar differ