Skip to content

Commit 3586cfc

Browse files
abrahamwolkabrahamwolk
authored
Merge pull request #3532 from ControlSystemStudio/CSSTUDIO-3427
CSSTUDIO-3427 Bugfix: Fix building of Phoebus for the platform `mac-aarch64`
2 parents 5e31f8d + 014e8b5 commit 3586cfc

File tree

4 files changed

+32
-44
lines changed

4 files changed

+32
-44
lines changed

‎app/display/waterfallplot/build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<project default="app-waterfall-plot">
1+
<project default="app-display-waterfallplot">
22
<import file="../../dependencies/ant_settings.xml"/>
33

4-
<target name="app-waterfall-plot" depends="compile-app">
5-
<jar destfile="${build}/app-waterfall-plot-${version}.jar">
4+
<target name="app-display-waterfallplot" depends="compile-app">
5+
<jar destfile="${build}/app-display-waterfallplot-${version}.jar">
66
<fileset dir="${classes}"/>
77
<fileset dir="${resources}"/>
88
</jar>

‎app/display/waterfallplot/pom.xml‎

Lines changed: 17 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
5-
<artifactId>app-waterfall-plot</artifactId>
62

73
<parent>
4+
<artifactId>app-display</artifactId>
85
<groupId>org.phoebus</groupId>
9-
<artifactId>app</artifactId>
106
<version>5.0.3-SNAPSHOT</version>
117
</parent>
128

9+
<modelVersion>4.0.0</modelVersion>
10+
11+
<artifactId>app-display-waterfallplot</artifactId>
12+
<name>${project.groupId}:${project.artifactId}</name>
13+
1314
<dependencies>
1415
<dependency>
1516
<groupId>org.phoebus</groupId>
1617
<artifactId>core-framework</artifactId>
1718
<version>5.0.3-SNAPSHOT</version>
1819
</dependency>
19-
<dependency>
20-
<groupId>org.phoebus</groupId>
21-
<artifactId>core-ui</artifactId>
22-
<version>5.0.3-SNAPSHOT</version>
23-
</dependency>
2420
<dependency>
2521
<groupId>org.phoebus</groupId>
2622
<artifactId>core-types</artifactId>
@@ -30,6 +26,17 @@
3026
<groupId>io.fair-acc</groupId>
3127
<artifactId>chartfx</artifactId>
3228
<version>11.3.1</version>
29+
<exclusions>
30+
<!-- Use the Phoebus versions of javafx-base and javafx-controls: -->
31+
<exclusion>
32+
<groupId>org.openjfx</groupId>
33+
<artifactId>javafx-base</artifactId>
34+
</exclusion>
35+
<exclusion>
36+
<groupId>org.openjfx</groupId>
37+
<artifactId>javafx-controls</artifactId>
38+
</exclusion>
39+
</exclusions>
3340
</dependency>
3441
<dependency>
3542
<groupId>org.slf4j</groupId>
@@ -48,12 +55,6 @@
4855
<version>5.0.3-SNAPSHOT</version>
4956
<scope>compile</scope>
5057
</dependency>
51-
<dependency>
52-
<groupId>org.phoebus</groupId>
53-
<artifactId>core-framework</artifactId>
54-
<version>5.0.3-SNAPSHOT</version>
55-
<scope>compile</scope>
56-
</dependency>
5758
<dependency>
5859
<groupId>org.phoebus</groupId>
5960
<artifactId>app-display-model</artifactId>
@@ -66,24 +67,6 @@
6667
<version>5.0.3-SNAPSHOT</version>
6768
<scope>compile</scope>
6869
</dependency>
69-
<dependency>
70-
<groupId>org.phoebus</groupId>
71-
<artifactId>app-display-representation</artifactId>
72-
<version>5.0.3-SNAPSHOT</version>
73-
<scope>compile</scope>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.phoebus</groupId>
77-
<artifactId>app-display-representation</artifactId>
78-
<version>5.0.3-SNAPSHOT</version>
79-
<scope>compile</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.phoebus</groupId>
83-
<artifactId>app-display-representation</artifactId>
84-
<version>5.0.3-SNAPSHOT</version>
85-
<scope>compile</scope>
86-
</dependency>
8770
<dependency>
8871
<groupId>org.phoebus</groupId>
8972
<artifactId>app-display-representation-javafx</artifactId>
@@ -96,11 +79,5 @@
9679
<version>5.0.3-SNAPSHOT</version>
9780
<scope>compile</scope>
9881
</dependency>
99-
<dependency>
100-
<groupId>org.phoebus</groupId>
101-
<artifactId>app-display-runtime</artifactId>
102-
<version>5.0.3-SNAPSHOT</version>
103-
<scope>compile</scope>
104-
</dependency>
10582
</dependencies>
10683
</project>

‎dependencies/phoebus-target/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,17 @@
564564
<groupId>io.fair-acc</groupId>
565565
<artifactId>chartfx</artifactId>
566566
<version>11.3.1</version>
567+
<exclusions>
568+
<!-- Use the Phoebus versions of javafx-base and javafx-controls: -->
569+
<exclusion>
570+
<groupId>org.openjfx</groupId>
571+
<artifactId>javafx-base</artifactId>
572+
</exclusion>
573+
<exclusion>
574+
<groupId>org.openjfx</groupId>
575+
<artifactId>javafx-controls</artifactId>
576+
</exclusion>
577+
</exclusions>
567578
</dependency>
568579
</dependencies>
569580

‎phoebus-product/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
</dependency>
159159
<dependency>
160160
<groupId>org.phoebus</groupId>
161-
<artifactId>app-waterfall-plot</artifactId>
161+
<artifactId>app-display-waterfallplot</artifactId>
162162
<version>5.0.3-SNAPSHOT</version>
163163
</dependency>
164164
<dependency>

0 commit comments

Comments
 (0)