Skip to content

Commit 6f83593

Browse files
authored
Merge pull request #3241 from ControlSystemStudio/form_build
ant and eclipse settings
2 parents dfc123a + 5475b43 commit 6f83593

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<target name="clean" description="Remove all artifacts">
99
<ant target="clean" dir="core/pva"/>
1010
<ant target="clean" dir="core/vtype"/>
11+
<ant target="clean" dir="core/util"/>
1112
<ant target="clean" dir="core/formula"/>
1213
<ant target="clean" dir="core/framework"/>
13-
<ant target="clean" dir="core/util"/>
1414
<ant target="clean" dir="core/email"/>
1515
<ant target="clean" dir="core/pv"/>
1616
<ant target="clean" dir="core/pv-ca"/>
@@ -91,9 +91,9 @@
9191
-->
9292
<ant dir="core/pva"/>
9393
<ant dir="core/vtype"/>
94+
<ant dir="core/util"/>
9495
<ant dir="core/formula"/>
9596
<ant dir="core/framework"/>
96-
<ant dir="core/util"/>
9797
<ant dir="core/email"/>
9898
<ant dir="core/pv"/>
9999
<ant dir="core/pv-ca"/>

core/formula/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<classpathentry kind="src" path="src/test/java"/>
77
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
88
<classpathentry combineaccessrules="false" kind="src" path="/core-vtype"/>
9+
<classpathentry combineaccessrules="false" kind="src" path="/core-util"/>
910
<classpathentry combineaccessrules="false" kind="src" path="/phoebus-target"/>
1011
<classpathentry kind="output" path="target/classes"/>
1112
</classpath>

core/formula/build.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
</fileset>
1313
<pathelement path="../framework/${build}/core-framework-${version}.jar"/>
1414
<pathelement path="../vtype/${build}/core-vtype-${version}.jar"/>
15+
<pathelement path="../util/${build}/core-util-${version}.jar"/>
1516
</classpath>
1617
</javac>
1718
<jar destfile="${build}/core-formula-${version}.jar">

0 commit comments

Comments
 (0)