Skip to content

Commit 0d5da74

Browse files
shroffkshroffk
authored
Merge pull request #2439 from ControlSystemStudio/build
Update ant and Eclipse build files
2 parents a743cb1 + 9b6c927 commit 0d5da74

File tree

5 files changed

+84
-19
lines changed

5 files changed

+84
-19
lines changed

‎app/display/thumbwheel/.classpath‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
5+
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
6+
<classpathentry kind="src" path="src/main/resources"/>
7+
<classpathentry combineaccessrules="false" kind="src" path="/phoebus-target"/>
8+
<classpathentry combineaccessrules="false" kind="src" path="/core-framework"/>
9+
<classpathentry combineaccessrules="false" kind="src" path="/core-util"/>
10+
<classpathentry combineaccessrules="false" kind="src" path="/core-pv"/>
11+
<classpathentry combineaccessrules="false" kind="src" path="/core-ui"/>
12+
<classpathentry combineaccessrules="false" kind="src" path="/core-security"/>
13+
<classpathentry combineaccessrules="false" kind="src" path="/core-types"/>
14+
<classpathentry combineaccessrules="false" kind="src" path="/app-display-model"/>
15+
<classpathentry combineaccessrules="false" kind="src" path="/app-display-representation"/>
16+
<classpathentry combineaccessrules="false" kind="src" path="/app-display-representation-javafx"/>
17+
<classpathentry kind="output" path="target/classes"/>
18+
</classpath>

‎app/display/thumbwheel/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>app-display-thumbwheel</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.jdt.core.javanature</nature>
16+
</natures>
17+
</projectDescription>

‎app/display/thumbwheel/build.xml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<project default="app-display-thumbwheel">
22
<import file="../../../dependencies/ant_settings.xml"/>
33

4-
<target name="app-display-model">
4+
<target name="app-display-thumbwheel">
55
<mkdir dir="${classes}"/>
66
<javac destdir="${classes}" debug="${debug}">
77
<src path="${src}"/>
8-
<src path="${test}"/>
98
<classpath>
109
<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"/>
1113
</classpath>
1214
</javac>
1315

@@ -16,18 +18,5 @@
1618
<fileset dir="${resources}"/>
1719
</jar>
1820
</target>
19-
20-
<target name="test-display-thumbwheel" depends="app-display-thumbwheel">
21-
<junit printsummary="withOutAndErr" haltonfailure="yes">
22-
<classpath>
23-
<path refid="app-classpath"/>
24-
<pathelement path="${build}/app-display-thumbwheel-${version}.jar"/>
25-
</classpath>
26-
<batchtest>
27-
<zipfileset src="${build}/app-display-thumbwheel-${version}.jar" includes="**/*Test.class"/>
28-
</batchtest>
29-
<formatter type="plain" usefile="false"/>
30-
</junit>
31-
</target>
3221

3322
</project>

‎build.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<ant target="clean" dir="app/display/convert-medm"/>
4646
<ant target="clean" dir="app/display/convert-edm"/>
4747
<ant target="clean" dir="app/display/adapters"/>
48+
<ant target="clean" dir="app/display/thumbwheel"/>
4849
<ant target="clean" dir="app/scan/model"/>
4950
<ant target="clean" dir="app/scan/client"/>
5051
<ant target="clean" dir="app/scan/ui"/>
@@ -123,6 +124,7 @@
123124
<ant dir="app/display/convert-medm"/>
124125
<ant dir="app/display/convert-edm"/>
125126
<ant dir="app/display/adapters"/>
127+
<ant dir="app/display/thumbwheel"/>
126128
<ant dir="app/scan/model"/>
127129
<ant dir="app/scan/client"/>
128130
<ant dir="app/scan/ui"/>

‎dependencies/phoebus-target/.classpath‎

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3+
4+
<classpathentry exported="true" kind="lib" path="target/lib/FastInfoset-1.2.13.jar"/>
5+
<classpathentry exported="true" kind="lib" path="target/lib/HikariCP-java7-2.4.13.jar"/>
6+
<classpathentry exported="true" kind="lib" path="target/lib/JTangoClientLang-9.7.0.jar"/>
7+
<classpathentry exported="true" kind="lib" path="target/lib/JTangoCommons-9.7.0.jar"/>
8+
<classpathentry exported="true" kind="lib" path="target/lib/JTangoServer-9.7.0.jar"/>
9+
<classpathentry exported="true" kind="lib" path="target/lib/JavaEWAH-1.1.6.jar"/>
10+
<classpathentry exported="true" kind="lib" path="target/lib/TangORB-9.7.0.jar"/>
311
<classpathentry exported="true" kind="lib" path="target/lib/accessors-smart-1.2.jar"/>
412
<classpathentry exported="true" kind="lib" path="target/lib/activation-1.1.jar"/>
513
<classpathentry exported="true" kind="lib" path="target/lib/batik-anim-1.14.jar"/>
@@ -19,8 +27,12 @@
1927
<classpathentry exported="true" kind="lib" path="target/lib/batik-transcoder-1.14.jar"/>
2028
<classpathentry exported="true" kind="lib" path="target/lib/batik-util-1.14.jar"/>
2129
<classpathentry exported="true" kind="lib" path="target/lib/batik-xml-1.14.jar"/>
30+
<classpathentry exported="true" kind="lib" path="target/lib/bsh-2.0b5.jar"/>
2231
<classpathentry exported="true" kind="lib" path="target/lib/byte-buddy-1.9.3.jar"/>
2332
<classpathentry exported="true" kind="lib" path="target/lib/byte-buddy-agent-1.9.3.jar"/>
33+
<classpathentry exported="true" kind="lib" path="target/lib/c3p0-0.9.5.4.jar"/>
34+
<classpathentry exported="true" kind="lib" path="target/lib/cal10n-api-0.8.1.jar"/>
35+
<classpathentry exported="true" kind="lib" path="target/lib/cglib-full-2.0.jar"/>
2436
<classpathentry exported="true" kind="lib" path="target/lib/checker-qual-3.12.0.jar"/>
2537
<classpathentry exported="true" kind="lib" path="target/lib/classmate-1.3.4.jar"/>
2638
<classpathentry exported="true" kind="lib" path="target/lib/commonj.sdo-2.1.1.jar"/>
@@ -30,15 +42,17 @@
3042
<classpathentry exported="true" kind="lib" path="target/lib/commons-codec-1.14.jar"/>
3143
<classpathentry exported="true" kind="lib" path="target/lib/commons-compress-1.21.jar"/>
3244
<classpathentry exported="true" kind="lib" path="target/lib/commons-io-1.3.1.jar"/>
45+
<classpathentry exported="true" kind="lib" path="target/lib/commons-lang3-3.5.jar"/>
3346
<classpathentry exported="true" kind="lib" path="target/lib/commons-logging-1.1.3.jar"/>
3447
<classpathentry exported="true" kind="lib" path="target/lib/commons-math3-3.6.1.jar"/>
3548
<classpathentry exported="true" kind="lib" path="target/lib/connect-api-2.0.0.jar"/>
3649
<classpathentry exported="true" kind="lib" path="target/lib/connect-json-2.0.0.jar"/>
3750
<classpathentry exported="true" kind="lib" path="target/lib/controlsfx-11.0.3.jar"/>
3851
<classpathentry exported="true" kind="lib" path="target/lib/derby-10.16.1.1.jar"/>
39-
<classpathentry exported="true" kind="lib" path="target/lib/derbytools-10.16.1.1.jar"/>
4052
<classpathentry exported="true" kind="lib" path="target/lib/derbyshared-10.16.1.1.jar"/>
53+
<classpathentry exported="true" kind="lib" path="target/lib/derbytools-10.16.1.1.jar"/>
4154
<classpathentry exported="true" kind="lib" path="target/lib/eclipselink-2.7.0.jar"/>
55+
<classpathentry exported="true" kind="lib" path="target/lib/ehcache-core-2.3.0.jar"/>
4256
<classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-java-8.2.0.jar"/>
4357
<classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-rest-client-8.2.0.jar"/>
4458
<classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-rest-client-sniffer-8.2.0.jar"/>
@@ -48,8 +62,8 @@
4862
<classpathentry exported="true" kind="lib" path="target/lib/epics-util-1.0.5.jar"/>
4963
<classpathentry exported="true" kind="lib" path="target/lib/error_prone_annotations-2.7.1.jar"/>
5064
<classpathentry exported="true" kind="lib" path="target/lib/failureaccess-1.0.1.jar"/>
51-
<classpathentry exported="true" kind="lib" path="target/lib/FastInfoset-1.2.13.jar"/>
5265
<classpathentry exported="true" kind="lib" path="target/lib/freetts-1.2.2.jar"/>
66+
<classpathentry exported="true" kind="lib" path="target/lib/geronimo-spec-ejb-2.1-rc2.jar"/>
5367
<classpathentry exported="true" kind="lib" path="target/lib/guava-31.0.1-jre.jar"/>
5468
<classpathentry exported="true" kind="lib" path="target/lib/hamcrest-all-1.3.jar"/>
5569
<classpathentry exported="true" kind="lib" path="target/lib/hamcrest-core-1.3.jar"/>
@@ -67,8 +81,12 @@
6781
<classpathentry exported="true" kind="lib" path="target/lib/jackson-datatype-jdk8-2.9.8.jar"/>
6882
<classpathentry exported="true" kind="lib" path="target/lib/jackson-datatype-jsr310-2.12.3.jar"/>
6983
<classpathentry exported="true" kind="lib" path="target/lib/jackson-module-parameter-names-2.9.8.jar"/>
84+
<classpathentry exported="true" kind="lib" path="target/lib/jacorb-3.9.jar"/>
85+
<classpathentry exported="true" kind="lib" path="target/lib/jacorb-idl-compiler-3.8.jar"/>
86+
<classpathentry exported="true" kind="lib" path="target/lib/jacorb-omgapi-3.8.jar"/>
87+
<classpathentry exported="true" kind="lib" path="target/lib/jacorb-services-3.9.jar"/>
7088
<classpathentry exported="true" kind="lib" path="target/lib/jakarta.json-api-2.0.1.jar"/>
71-
<classpathentry exported="true" kind="lib" path="target/lib/JavaEWAH-1.1.6.jar"/>
89+
<classpathentry exported="true" kind="lib" path="target/lib/java_cup-0.9e.jar"/>
7290
<classpathentry exported="true" kind="lib" path="target/lib/javax.activation-1.2.0.jar"/>
7391
<classpathentry exported="true" kind="lib" path="target/lib/javax.annotation-api-1.3.2.jar"/>
7492
<classpathentry exported="true" kind="lib" path="target/lib/javax.json-1.0.4.jar"/>
@@ -82,6 +100,7 @@
82100
<classpathentry exported="true" kind="lib" path="target/lib/jaxb-runtime-2.3.0.jar"/>
83101
<classpathentry exported="true" kind="lib" path="target/lib/jboss-logging-3.3.2.Final.jar"/>
84102
<classpathentry exported="true" kind="lib" path="target/lib/jca-2.4.7.jar"/>
103+
<classpathentry exported="true" kind="lib" path="target/lib/jeromq-0.5.1.jar"/>
85104
<classpathentry exported="true" kind="lib" path="target/lib/jersey-client-1.19.jar"/>
86105
<classpathentry exported="true" kind="lib" path="target/lib/jersey-core-1.19.jar"/>
87106
<classpathentry exported="true" kind="lib" path="target/lib/jersey-multipart-1.19.jar"/>
@@ -97,10 +116,13 @@
97116
<classpathentry exported="true" kind="lib" path="target/lib/jfxtras-controls-9.0-r1.jar"/>
98117
<classpathentry exported="true" kind="lib" path="target/lib/jfxtras-fxml-9.0-r1.jar"/>
99118
<classpathentry exported="true" kind="lib" path="target/lib/jmatio-1.2.jar"/>
119+
<classpathentry exported="true" kind="lib" path="target/lib/jmock-1.0.1.jar"/>
120+
<classpathentry exported="true" kind="lib" path="target/lib/jmock-cglib-1.0.1.jar"/>
121+
<classpathentry exported="true" kind="lib" path="target/lib/jnacl-1.0.0.jar"/>
100122
<classpathentry exported="true" kind="lib" path="target/lib/jsch-0.1.54.jar"/>
101-
<classpathentry exported="true" kind="lib" path="target/lib/jsonassert-1.5.0.jar"/>
102123
<classpathentry exported="true" kind="lib" path="target/lib/json-path-2.4.0.jar"/>
103124
<classpathentry exported="true" kind="lib" path="target/lib/json-smart-2.3.jar"/>
125+
<classpathentry exported="true" kind="lib" path="target/lib/jsonassert-1.5.0.jar"/>
104126
<classpathentry exported="true" kind="lib" path="target/lib/jsr305-3.0.2.jar"/>
105127
<classpathentry exported="true" kind="lib" path="target/lib/jsr311-api-1.1.1.jar"/>
106128
<classpathentry exported="true" kind="lib" path="target/lib/junit-4.13.1.jar"/>
@@ -112,24 +134,36 @@
112134
<classpathentry exported="true" kind="lib" path="target/lib/log4j-api-2.17.1.jar"/>
113135
<classpathentry exported="true" kind="lib" path="target/lib/log4j-to-slf4j-2.17.1.jar"/>
114136
<classpathentry exported="true" kind="lib" path="target/lib/lz4-java-1.4.1.jar"/>
137+
<classpathentry exported="true" kind="lib" path="target/lib/mchange-commons-java-0.2.15.jar"/>
115138
<classpathentry exported="true" kind="lib" path="target/lib/mimepull-1.9.3.jar"/>
116139
<classpathentry exported="true" kind="lib" path="target/lib/mockito-core-2.23.4.jar"/>
140+
<classpathentry exported="true" kind="lib" path="target/lib/mx4j-3.0.1.jar"/>
141+
<classpathentry exported="true" kind="lib" path="target/lib/mx4j-impl-2.1.1.jar"/>
142+
<classpathentry exported="true" kind="lib" path="target/lib/mx4j-jmx-2.1.1.jar"/>
117143
<classpathentry exported="true" kind="lib" path="target/lib/mysql-connector-java-8.0.30.jar"/>
144+
<classpathentry exported="true" kind="lib" path="target/lib/nanocontainer-remoting-1.0-RC-1.jar"/>
118145
<classpathentry exported="true" kind="lib" path="target/lib/objenesis-2.6.jar"/>
119146
<classpathentry exported="true" kind="lib" path="target/lib/ojdbc8-12.2.0.1.jar"/>
120147
<classpathentry exported="true" kind="lib" path="target/lib/org.eclipse.jgit-5.0.3.201809091024-r.jar"/>
121148
<classpathentry exported="true" kind="lib" path="target/lib/org.eclipse.paho.client.mqttv3-1.2.2.jar"/>
122149
<classpathentry exported="true" kind="lib" path="target/lib/parsson-1.0.0.jar"/>
123150
<classpathentry exported="true" kind="lib" path="target/lib/pbrawclient-0.0.8.jar"/>
151+
<classpathentry exported="true" kind="lib" path="target/lib/picocontainer-1.2.jar"/>
124152
<classpathentry exported="true" kind="lib" path="target/lib/postgresql-42.2.9.jar"/>
125153
<classpathentry exported="true" kind="lib" path="target/lib/protobuf-java-2.4.1.jar"/>
154+
<classpathentry exported="true" kind="lib" path="target/lib/proxytoys-0.1.jar"/>
126155
<classpathentry exported="true" kind="lib" path="target/lib/py4j-0.10.2.1.jar"/>
156+
<classpathentry exported="true" kind="lib" path="target/lib/quartz-2.3.2.jar"/>
127157
<classpathentry exported="true" kind="lib" path="target/lib/reactive-streams-1.0.3.jar"/>
128158
<classpathentry exported="true" kind="lib" path="target/lib/rhino-1.7.12.jar"/>
129159
<classpathentry exported="true" kind="lib" path="target/lib/rocksdbjni-5.7.3.jar"/>
130160
<classpathentry exported="true" kind="lib" path="target/lib/rxjava-3.0.9.jar"/>
131161
<classpathentry exported="true" kind="lib" path="target/lib/serializer-2.7.2.jar"/>
132162
<classpathentry exported="true" kind="lib" path="target/lib/slf4j-api-1.7.25.jar"/>
163+
<classpathentry exported="true" kind="lib" path="target/lib/slf4j-ext-1.7.6.jar"/>
164+
<classpathentry exported="true" kind="lib" path="target/lib/slf4j-jdk14-1.7.28.jar"/>
165+
<classpathentry exported="true" kind="lib" path="target/lib/snakeyaml-1.23.jar"/>
166+
<classpathentry exported="true" kind="lib" path="target/lib/snappy-java-1.1.7.1.jar"/>
133167
<classpathentry exported="true" kind="lib" path="target/lib/spring-aop-5.1.7.RELEASE.jar"/>
134168
<classpathentry exported="true" kind="lib" path="target/lib/spring-beans-5.1.7.RELEASE.jar"/>
135169
<classpathentry exported="true" kind="lib" path="target/lib/spring-boot-2.1.5.RELEASE.jar"/>
@@ -148,11 +182,16 @@
148182
<classpathentry exported="true" kind="lib" path="target/lib/spring-test-5.1.7.RELEASE.jar"/>
149183
<classpathentry exported="true" kind="lib" path="target/lib/spring-web-5.1.7.RELEASE.jar"/>
150184
<classpathentry exported="true" kind="lib" path="target/lib/spring-webmvc-5.1.7.RELEASE.jar"/>
185+
<classpathentry exported="true" kind="lib" path="target/lib/stax-ex-1.7.8.jar"/>
186+
<classpathentry exported="true" kind="lib" path="target/lib/tango-idl-java-5.jar"/>
151187
<classpathentry exported="true" kind="lib" path="target/lib/testfx-core-4.0.13-alpha.jar"/>
152188
<classpathentry exported="true" kind="lib" path="target/lib/testfx-junit-4.0.13-alpha.jar"/>
189+
<classpathentry exported="true" kind="lib" path="target/lib/transmorph-3.1.3.jar"/>
190+
<classpathentry exported="true" kind="lib" path="target/lib/txw2-2.3.0.jar"/>
153191
<classpathentry exported="true" kind="lib" path="target/lib/validation-api-2.0.1.Final.jar"/>
154192
<classpathentry exported="true" kind="lib" path="target/lib/vtype-1.0.5.jar"/>
155193
<classpathentry exported="true" kind="lib" path="target/lib/vtype-json-1.0.5.jar"/>
194+
<classpathentry exported="true" kind="lib" path="target/lib/wrapper-3.1.0.jar"/>
156195
<classpathentry exported="true" kind="lib" path="target/lib/xalan-2.7.2.jar"/>
157196
<classpathentry exported="true" kind="lib" path="target/lib/xmlgraphics-commons-2.4.jar"/>
158197
<classpathentry exported="true" kind="lib" path="target/lib/xmlunit-core-2.6.2.jar"/>

0 commit comments

Comments
 (0)