Merge pull request #3064 from ControlSystemStudio/ant

Ant & Eclipse update for archive-reader reorg
ControlSystemStudio · Jun 28, 2024 · 2b0a7e2 · 2b0a7e2
2 parents cf899a5 + e4db60b
commit 2b0a7e2
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 7 deletions.
diff --git a/app/databrowser-timescale/.classpath b/app/databrowser-timescale/.classpath
@@ -10,5 +10,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/core-pv"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/core-util"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/app-databrowser"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/app-trends-archive-reader"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/app/databrowser-timescale/build.xml b/app/databrowser-timescale/build.xml
@@ -8,6 +8,7 @@
       <classpath>
         <path refid="app-classpath"/>
         <pathelement path="../databrowser/${build}/app-databrowser-${version}.jar"/>
+        <pathelement path="../trends/archive-reader/${build}/app-trends-archive-reader-${version}.jar"/>
       </classpath>
     </javac>
 

diff --git a/app/databrowser/.classpath b/app/databrowser/.classpath
@@ -13,6 +13,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/core-vtype"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/core-util"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/app-rtplot"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/app-trends-archive-reader"/>
 	<classpathentry kind="src" path="/app-email-ui"/>
 	<classpathentry kind="src" path="/app-logbook-ui"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/app/databrowser/build.xml b/app/databrowser/build.xml
@@ -8,6 +8,7 @@
       <src path="${test}"/>
       <classpath>
         <path refid="app-classpath"/>
+        <pathelement path="../trends/archive-reader/${build}/app-trends-archive-reader-${version}.jar"/>
         <pathelement path="../rtplot/${build}/app-rtplot-${version}.jar"/>
       </classpath>
     </javac>

diff --git a/app/display/representation-javafx/.classpath b/app/display/representation-javafx/.classpath
@@ -10,6 +10,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/core-framework"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/core-ui"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/core-util"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core-types"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/core-vtype"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/app-rtplot"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/app-display-model"/>

diff --git a/app/trends/archive-reader/.classpath b/app/trends/archive-reader/.classpath
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/phoebus-target"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core-framework"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core-types"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core-vtype"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core-pv"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core-util"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core-ui"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/app/trends/archive-reader/.project b/app/trends/archive-reader/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app-trends-archive-reader</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/app/trends/archive-reader/build.xml b/app/trends/archive-reader/build.xml
@@ -1,4 +1,4 @@
-<project default="app-trends-rich-adapters">
+<project default="app-trends-archive-reader">
   <import file="../../../dependencies/ant_settings.xml"/>
 
   <target name="app-trends-archive-reader">

diff --git a/build.xml b/build.xml
@@ -33,6 +33,7 @@
     <ant target="clean" dir="app/pvtree"/>
     <ant target="clean" dir="app/pvtable"/>
     <ant target="clean" dir="app/rtplot"/>
+    <ant target="clean" dir="app/trends/archive-reader"/>
     <ant target="clean" dir="app/databrowser"/>
     <ant target="clean" dir="app/databrowser-timescale"/>
     <ant target="clean" dir="app/trends/rich-adapters"/>
@@ -117,6 +118,7 @@
     <ant dir="app/pvtree"/>
     <ant dir="app/pvtable"/>
     <ant dir="app/rtplot"/>
+    <ant dir="app/trends/archive-reader"/>
     <ant dir="app/databrowser"/>
     <ant dir="app/databrowser-timescale"/>
     <ant dir="app/trends/rich-adapters"/>

diff --git a/dependencies/phoebus-target/.classpath b/dependencies/phoebus-target/.classpath
@@ -42,11 +42,11 @@
     <classpathentry exported="true" kind="lib" path="target/lib/epics-pvaccess-5.1.9.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/epics-pvdata-6.1.9.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/epics-util-1.0.7.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/error_prone_annotations-2.26.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/failureaccess-1.0.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/error_prone_annotations-2.3.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/failureaccess-1.0.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/freetts-1.2.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/geronimo-spec-ejb-2.1-rc2.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/guava-33.2.0-jre.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/guava-29.0-jre.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/hamcrest-2.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/hamcrest-all-1.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/hamcrest-core-1.3.jar"/>
@@ -56,7 +56,7 @@
     <classpathentry exported="true" kind="lib" path="target/lib/httpcore-nio-4.4.12.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/install-jars-4.7.4-SNAPSHOT.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/istack-commons-runtime-3.0.5.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/j2objc-annotations-3.0.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/j2objc-annotations-1.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/jackson-annotations-2.12.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/jackson-core-2.12.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/jackson-databind-2.12.3.jar"/>
@@ -125,7 +125,7 @@
     <classpathentry exported="true" kind="lib" path="target/lib/mx4j-3.0.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/mx4j-impl-2.1.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/mx4j-jmx-2.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/mysql-connector-java-8.0.30.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/mysql-connector-j-8.4.0.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/nanocontainer-remoting-1.0-RC-1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/objenesis-2.6.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/ojdbc8-12.2.0.1.jar"/>
@@ -135,7 +135,7 @@
     <classpathentry exported="true" kind="lib" path="target/lib/parsson-1.0.0.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/pbrawclient-0.0.10.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/picocontainer-1.2.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/postgresql-42.6.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/postgresql-42.6.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/protobuf-java-3.21.9.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/proxytoys-0.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/py4j-0.10.2.1.jar"/>

diff --git a/phoebus-product/.classpath b/phoebus-product/.classpath
@@ -43,6 +43,7 @@
     <classpathentry combineaccessrules="false" kind="src" path="/app-display-adapters"/>
     <classpathentry combineaccessrules="false" kind="src" path="/app-databrowser"/>
     <classpathentry combineaccessrules="false" kind="src" path="/app-trends-rich-adapters"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/app-trends-archive-reader"/>
     <classpathentry combineaccessrules="false" kind="src" path="/app-rtplot"/>
     <classpathentry combineaccessrules="false" kind="src" path="/app-pvtable"/>
     <classpathentry combineaccessrules="false" kind="src" path="/app-email-ui"/>