Skip to content

Commit f5f0064

Browse files
chrisdutzchrisdutz
committed
fix: Tried getting the build back to work.
1 parent 4286a89 commit f5f0064

5 files changed

Lines changed: 96 additions & 98 deletions

File tree

‎code-generation/language/c/src/test/resources/integration-test/generated-sources/test/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
under the License.
1818
]]
1919

20-
include_directories("include" "../../../../../../../plc4c/spi/include" "../../../../../../../plc4c/api/include")
20+
include_directories("include" "../../../../../../../../plc4c/spi/include" "../../../../../../../../plc4c/api/include")
2121

2222
# Add the sources
2323
file(GLOB sources "src/*.c")
24-
file(GLOB spi_sources "../../../../../../../../plc4c/spi/src/*.c")
25-
file(GLOB spi_utils_sources "../../../../../../../../plc4c/spi/src/utils/*.c")
24+
file(GLOB spi_sources "../../../../../../../../../plc4c/spi/src/*.c")
25+
file(GLOB spi_utils_sources "../../../../../../../../../plc4c/spi/src/utils/*.c")
2626

2727

2828
add_library(plc4c-driver-test ${sources} ${spi_sources} ${spi_utils_sources})

‎code-generation/language/c/src/test/resources/integration-test/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,11 @@
195195
<sourcePath>${project.basedir}</sourcePath>
196196
<!--
197197
Path to where the build configuration is generated
198-
(This directory is then used in the compile step to actually perform the build)
198+
(This directory is then used in the compile-step to actually perform the build)
199199
-->
200200
<targetPath>${project.build.directory}/build</targetPath>
201201
<!--
202-
Name of the generator the compile step will be executing.
202+
Name of the generator the compile-step will be executing.
203203
-->
204204
<generator>${cmake.generator}</generator>
205205
<!-- The directory where the "generate" step generated the build configuration -->

‎code-generation/language/go/src/test/resources/plc4go/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<resources>
5454
<resource>
5555
<targetPath>.</targetPath>
56-
<directory>../../../../../plc4go/pkg</directory>
56+
<directory>../../../../../../plc4go/pkg</directory>
5757
<filtering>false</filtering>
5858
</resource>
5959
</resources>
@@ -71,7 +71,7 @@
7171
<resources>
7272
<resource>
7373
<targetPath>.</targetPath>
74-
<directory>../../../../../plc4go/spi</directory>
74+
<directory>../../../../../../plc4go/spi</directory>
7575
<excludes>
7676
<exclude>testutils/**</exclude>
7777
</excludes>

‎code-generation/language/python/src/test/resources/plc4py/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<resources>
5252
<resource>
5353
<targetPath>.</targetPath>
54-
<directory>${project.basedir}/../../../../../plc4py/</directory>
54+
<directory>${project.basedir}/../../../../../../plc4py/</directory>
5555
<includes>
5656
<include>pyproject.toml</include>
5757
</includes>
@@ -72,7 +72,7 @@
7272
<resources>
7373
<resource>
7474
<targetPath>.</targetPath>
75-
<directory>${project.basedir}/../../../../../plc4py/plc4py</directory>
75+
<directory>${project.basedir}/../../../../../../plc4py/plc4py</directory>
7676
<filtering>false</filtering>
7777
</resource>
7878
</resources>

‎plc4py/pom.xml‎

Lines changed: 87 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -40,95 +40,6 @@
4040
<option.with-proxies>OFF</option.with-proxies>
4141
</properties>
4242

43-
<profiles>
44-
<profile>
45-
<id>update-generated-code</id>
46-
<build>
47-
<plugins>
48-
<plugin>
49-
<groupId>org.apache.plc4x.plugins</groupId>
50-
<artifactId>plc4x-maven-plugin</artifactId>
51-
<executions>
52-
<execution>
53-
<id>generate-modbus-driver</id>
54-
<phase>generate-sources</phase>
55-
<goals>
56-
<goal>generate-driver</goal>
57-
</goals>
58-
<configuration>
59-
<protocolName>modbus</protocolName>
60-
<languageName>python</languageName>
61-
<outputFlavor>read-write</outputFlavor>
62-
<outputDir>${project.basedir}/plc4py/protocols</outputDir>
63-
</configuration>
64-
</execution>
65-
<execution>
66-
<id>generate-simulated-driver</id>
67-
<phase>generate-sources</phase>
68-
<goals>
69-
<goal>generate-driver</goal>
70-
</goals>
71-
<configuration>
72-
<protocolName>simulated</protocolName>
73-
<languageName>python</languageName>
74-
<outputFlavor>read-write</outputFlavor>
75-
<outputDir>${project.basedir}/plc4py/protocols</outputDir>
76-
</configuration>
77-
</execution>
78-
<execution>
79-
<id>generate-umas-driver</id>
80-
<phase>generate-sources</phase>
81-
<goals>
82-
<goal>generate-driver</goal>
83-
</goals>
84-
<configuration>
85-
<protocolName>umas</protocolName>
86-
<languageName>python</languageName>
87-
<outputFlavor>read-write</outputFlavor>
88-
<outputDir>${project.basedir}/plc4py/protocols</outputDir>
89-
</configuration>
90-
</execution>
91-
</executions>
92-
</plugin>
93-
</plugins>
94-
</build>
95-
96-
<dependencies>
97-
<dependency>
98-
<groupId>org.apache.plc4x</groupId>
99-
<artifactId>plc4x-code-generation-language-python</artifactId>
100-
<version>0.14.0-SNAPSHOT</version>
101-
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
102-
<scope>provided</scope>
103-
</dependency>
104-
105-
<dependency>
106-
<groupId>org.apache.plc4x</groupId>
107-
<artifactId>plc4x-protocols-modbus</artifactId>
108-
<version>0.14.0-SNAPSHOT</version>
109-
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
110-
<scope>provided</scope>
111-
</dependency>
112-
113-
<dependency>
114-
<groupId>org.apache.plc4x</groupId>
115-
<artifactId>plc4x-protocols-simulated</artifactId>
116-
<version>0.14.0-SNAPSHOT</version>
117-
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
118-
<scope>provided</scope>
119-
</dependency>
120-
121-
<dependency>
122-
<groupId>org.apache.plc4x</groupId>
123-
<artifactId>plc4x-protocols-umas</artifactId>
124-
<version>0.14.0-SNAPSHOT</version>
125-
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
126-
<scope>provided</scope>
127-
</dependency>
128-
</dependencies>
129-
</profile>
130-
</profiles>
131-
13243
<build>
13344
<sourceDirectory>src/main/python</sourceDirectory>
13445
<testSourceDirectory>src/test/python</testSourceDirectory>
@@ -332,6 +243,93 @@
332243
</plugins>
333244
</build>
334245

246+
<profiles>
247+
<profile>
248+
<id>update-generated-code</id>
249+
<build>
250+
<plugins>
251+
<plugin>
252+
<groupId>org.apache.plc4x.plugins</groupId>
253+
<artifactId>plc4x-maven-plugin</artifactId>
254+
<executions>
255+
<execution>
256+
<id>generate-modbus-driver</id>
257+
<phase>generate-sources</phase>
258+
<goals>
259+
<goal>generate-driver</goal>
260+
</goals>
261+
<configuration>
262+
<protocolName>modbus</protocolName>
263+
<languageName>python</languageName>
264+
<outputFlavor>read-write</outputFlavor>
265+
<outputDir>${project.basedir}/plc4py/protocols</outputDir>
266+
</configuration>
267+
</execution>
268+
<execution>
269+
<id>generate-simulated-driver</id>
270+
<phase>generate-sources</phase>
271+
<goals>
272+
<goal>generate-driver</goal>
273+
</goals>
274+
<configuration>
275+
<protocolName>simulated</protocolName>
276+
<languageName>python</languageName>
277+
<outputFlavor>read-write</outputFlavor>
278+
<outputDir>${project.basedir}/plc4py/protocols</outputDir>
279+
</configuration>
280+
</execution>
281+
<execution>
282+
<id>generate-umas-driver</id>
283+
<phase>generate-sources</phase>
284+
<goals>
285+
<goal>generate-driver</goal>
286+
</goals>
287+
<configuration>
288+
<protocolName>umas</protocolName>
289+
<languageName>python</languageName>
290+
<outputFlavor>read-write</outputFlavor>
291+
<outputDir>${project.basedir}/plc4py/protocols</outputDir>
292+
</configuration>
293+
</execution>
294+
</executions>
295+
</plugin>
296+
</plugins>
297+
</build>
298+
299+
<dependencies>
300+
<dependency>
301+
<groupId>org.apache.plc4x</groupId>
302+
<artifactId>plc4x-code-generation-language-python</artifactId>
303+
<version>0.14.0-SNAPSHOT</version>
304+
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
305+
<scope>provided</scope>
306+
</dependency>
307+
308+
<dependency>
309+
<groupId>org.apache.plc4x</groupId>
310+
<artifactId>plc4x-protocols-modbus</artifactId>
311+
<version>0.14.0-SNAPSHOT</version>
312+
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
313+
<scope>provided</scope>
314+
</dependency>
315+
316+
<dependency>
317+
<groupId>org.apache.plc4x</groupId>
318+
<artifactId>plc4x-protocols-simulated</artifactId>
319+
<version>0.14.0-SNAPSHOT</version>
320+
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
321+
<scope>provided</scope>
322+
</dependency>
335323

324+
<dependency>
325+
<groupId>org.apache.plc4x</groupId>
326+
<artifactId>plc4x-protocols-umas</artifactId>
327+
<version>0.14.0-SNAPSHOT</version>
328+
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
329+
<scope>provided</scope>
330+
</dependency>
331+
</dependencies>
332+
</profile>
333+
</profiles>
336334

337335
</project>

0 commit comments

Comments
 (0)