From aff8ace25be602aa71fdeef9fb3b433316ddf8e3 Mon Sep 17 00:00:00 2001
From: kasemir <ky9@ornl.gov>
Date: Fri, 9 Feb 2024 09:43:48 -0500
Subject: [PATCH] ant: core-vtype now needs core-pva

---
 build.xml            | 4 ++--
 core/vtype/build.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 51ef79d42d..2ee89e1c67 100644
--- a/build.xml
+++ b/build.xml
@@ -6,12 +6,12 @@
 <project name="Phoebus" default="services">
 
   <target name="clean" description="Remove all artifacts">
+    <ant target="clean" dir="core/pva"/>
     <ant target="clean" dir="core/vtype"/>
     <ant target="clean" dir="core/formula"/>
     <ant target="clean" dir="core/framework"/>
     <ant target="clean" dir="core/util"/>
     <ant target="clean" dir="core/email"/>
-    <ant target="clean" dir="core/pva"/>
     <ant target="clean" dir="core/pv"/>
     <ant target="clean" dir="core/security"/>
     <ant target="clean" dir="core/types"/>
@@ -82,12 +82,12 @@
     <!--
     <echo message="App classpath: ${toString:app-classpath}"/>
     -->
+    <ant dir="core/pva"/>
     <ant dir="core/vtype"/>
     <ant dir="core/formula"/>
     <ant dir="core/framework"/>
     <ant dir="core/util"/>
     <ant dir="core/email"/>
-    <ant dir="core/pva"/>
     <ant dir="core/pv"/>
     <ant dir="core/security"/>
     <ant dir="core/types"/>
diff --git a/core/vtype/build.xml b/core/vtype/build.xml
index 6bdd14810e..bd58ba1af5 100644
--- a/core/vtype/build.xml
+++ b/core/vtype/build.xml
@@ -8,10 +8,11 @@
         <fileset dir="${dependencies}/phoebus-target/target/lib">
           <include name="*.jar"/>
         </fileset>
+        <pathelement path="../pva/${build}/core-pva-${version}.jar"/>
       </classpath>
     </javac>
   	<jar destfile="${build}/core-vtype-${version}.jar">
       <fileset dir="${classes}"/>
     </jar>
   </target>
-</project>
\ No newline at end of file
+</project>