Skip to content

Commit 3136826

Browse files
authored
Merge pull request ControlSystemStudio#3552 from ControlSystemStudio/waterfall_ant
Include waterfall in ant build
2 parents 9006177 + 5be9953 commit 3136826

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed
Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
11
<project default="app-display-waterfallplot">
2-
<import file="../../dependencies/ant_settings.xml"/>
2+
<import file="../../../dependencies/ant_settings.xml"/>
3+
4+
<target name="app-display-waterfallplot">
5+
<mkdir dir="${classes}"/>
6+
<javac destdir="${classes}" debug="${debug}">
7+
<src path="${src}"/>
8+
<classpath>
9+
<path refid="app-classpath"/>
10+
<pathelement path="../model/${build}/app-display-model-${version}.jar"/>
11+
<pathelement path="../representation/${build}/app-display-representation-${version}.jar"/>
12+
<pathelement path="../representation-javafx/${build}/app-display-representation-javafx-${version}.jar"/>
13+
<pathelement path="../runtime/${build}/app-display-runtime-${version}.jar"/>
14+
<pathelement path="../../databrowser/${build}/app-databrowser-${version}.jar"/>
15+
<pathelement path="../../rtplot/${build}/app-rtplot-${version}.jar"/>
16+
</classpath>
17+
</javac>
318

4-
<target name="app-display-waterfallplot" depends="compile-app">
519
<jar destfile="${build}/app-display-waterfallplot-${version}.jar">
620
<fileset dir="${classes}"/>
721
<fileset dir="${resources}"/>
822
</jar>
923
</target>
24+
1025
</project>

build.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<ant target="clean" dir="app/display/convert-edm"/>
5353
<ant target="clean" dir="app/display/adapters"/>
5454
<ant target="clean" dir="app/display/thumbwheel"/>
55+
<ant target="clean" dir="app/display/waterfallplot"/>
5556
<ant target="clean" dir="app/scan/model"/>
5657
<ant target="clean" dir="app/scan/client"/>
5758
<ant target="clean" dir="app/scan/ui"/>
@@ -138,6 +139,7 @@
138139
<ant dir="app/display/convert-edm"/>
139140
<ant dir="app/display/adapters"/>
140141
<ant dir="app/display/thumbwheel"/>
142+
<ant dir="app/display/waterfallplot"/>
141143
<ant dir="app/scan/model"/>
142144
<ant dir="app/scan/client"/>
143145
<ant dir="app/scan/ui"/>

0 commit comments

Comments
 (0)