From b45cfe003bfa42d739b7b038b5b40675386f8963 Mon Sep 17 00:00:00 2001
From: git <tdnorbra@nps.edu>
Date: Sat, 24 Aug 2024 12:26:23 -0700
Subject: [PATCH] [Terry N.] more path surgery, better nuke.dot.viskit process
---
build.properties | 4 +++-
build.xml | 5 ++++-
viskit/configuration/c_gui.xml | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/build.properties b/build.properties
index f99adae0e7..f5fe7694d6 100644
--- a/build.properties
+++ b/build.properties
@@ -27,5 +27,7 @@ run.arg2=-Dapple.awt.graphics.UseQuartz=true \
--add-exports java.desktop/com.apple.eawt=ALL-UNNAMED
mac.run.args=${common.run.args} ${run.arg2}
-# property used to identify Viskit config files
+# property used to identify Viskit config files
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
diff --git a/build.xml b/build.xml
index ec0f66995f..a8fb2c3d61 100644
--- a/build.xml
+++ b/build.xml
@@ -276,6 +276,7 @@ POSSIBILITY OF SUCH DAMAGE.
<fileset dir="${viskit.lib.dir}">
<include name="**/*.jar"/>
</fileset>
+ <pathelement path="${extra.classpath}"/>
</path>
<echo message="runtime.classpath=${toString:runtime.classpath}"/>
</target>
@@ -285,7 +286,6 @@ POSSIBILITY OF SUCH DAMAGE.
classpathref="runtime.classpath"
dir="${viskit.dir}"
fork="true">
- <classpath path="${extra.classpath}"/>
<jvmarg line="${run.args}"/>
<arg value="${assy.file}"/>
</java>
@@ -298,6 +298,9 @@ POSSIBILITY OF SUCH DAMAGE.
<target name="nuke.dot.viskit" description="Abolish an out of synch configuration and metadata directory - only when necessary">
<delete includeemptydirs="yes" dir="${dot.viskit.dir}"/>
+ <mkdir dir="${dot.viskit.dir}"/>
+ <copy todir="${dot.viskit.dir}" file="${c_app.xml}"/>
+ <copy todir="${dot.viskit.dir}" file="${c_gui.xml}"/>
</target>
</project>
\ No newline at end of file
diff --git a/viskit/configuration/c_gui.xml b/viskit/configuration/c_gui.xml
index 618bfc8785..b163193718 100644
--- a/viskit/configuration/c_gui.xml
+++ b/viskit/configuration/c_gui.xml
@@ -27,7 +27,7 @@
</projectgeneration>
</button>
<projecttitle>
- <name value="DefaultProject"/>
+ <name value="ViskitOpenDis7Examples"/>
</projecttitle>
<lookandfeel>platform</lookandfeel>
</gui>
--
GitLab